From 9486eb2fde3914d43630a8ac2c2d14c1e13755aa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 18:48:42 -0400
Subject: [PATCH 001/879] Docs: Updated for 2.5.2

---
 ChangeLog |  2 ++
 NEWS      | 41 ++++++++++++++---------------------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc2164ccb..c3b07431c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.5.2 (?) ?
+
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
 - TD-104  Unrecognized taskwarrior file format
diff --git a/NEWS b/NEWS
index 3aaa93582..288e649e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,38 +1,25 @@
 
-New Features in Taskwarrior 2.5.1
-
-  - As a bug-fix, code cleanup and performance release, new features are
-    limited to only small tweaks.
-  - The 'help' command now takes a 'usage' argument, which displays only the
-    command usage.
-
-New Commands in Taskwarrior 2.5.1
-
-  - None.
-
-New Configuration Options in Taskwarrior 2.5.1
-
-  - New 'relative' column format for 'date' type columns does what 'remaining'
-    and 'countdown' do, but in one format.
-
-Newly Deprecated Features in Taskwarrior 2.5.1
+New Features in Taskwarrior 2.5.2
 
   -
 
-Removed Features in 2.5.1
+New Commands in Taskwarrior 2.5.2
+
+  -
+
+New Configuration Options in Taskwarrior 2.5.2
+
+  -
+
+Newly Deprecated Features in Taskwarrior 2.5.2
+
+  -
+
+Removed Features in 2.5.2
 
-  - There is no longer a 16-color default configuration for some platforms,
-    making all platforms 256-color.
-  - The configuration setting 'burndown.bias' is no longer used.
-  - The algorithm used to estimate completion on the 'burndown' reports has
-    been replaced by something less icky. Estimates are now based on the net
-    completion rate after the peak number of pending tasks.
-  - The unused 'dom' and 'shell.prompt' configuration settings were removed.
 
 Known Issues
 
-  - https://bug.tasktools.org/
-
 Taskwarrior has been built and tested on the following configurations:
 
   * OS X

From 2d77ad8aabd035e41c1b7102ceda45ebf0904577 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 18:55:24 -0400
Subject: [PATCH 002/879] Build: Bumped version to 2.5.2

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e96e0a64b..a8c580d8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ include (CheckStructHasMember)
 set (HAVE_CMAKE true)
 
 project (task)
-set (PROJECT_VERSION "2.5.1")
+set (PROJECT_VERSION "2.5.2")
 
 OPTION (ENABLE_SYNC "Enable 'task sync' support" ON)
 

From a12fb177e22a6754975b3b9f71b7b2df04f8c723 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 18:58:27 -0400
Subject: [PATCH 003/879] Bumped ref page to 2.5.2

---
 doc/ref/task-ref.pages | Bin 292624 -> 279390 bytes
 doc/ref/task-ref.pdf   | Bin 131250 -> 126218 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/ref/task-ref.pages b/doc/ref/task-ref.pages
index 249c66b92977cff936474acdae17b6d10b446e2c..6607a8614f8e94f45eac7f123e1e9220048406f4 100644
GIT binary patch
delta 189935
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
HVQ>F0jFq;s

delta 203003
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%0Dh
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
z%0D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
B-)#T@

diff --git a/doc/ref/task-ref.pdf b/doc/ref/task-ref.pdf
index 95152a96607be1530d14b018a34e50c0d6c2f396..ee3cab6d541b644b0e90533698516cb6203abeb1 100644
GIT binary patch
delta 76808
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
JC6%Rc{~yO|mL>oI

delta 76604
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%0ApY9JS|H^
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
F{|_X)5uE@4


From aa0db81300641573cd09e06b07e022113bae32e5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 19:01:45 -0400
Subject: [PATCH 004/879] Cleanup: Removed deprecated alias._query setting

---
 ChangeLog      | 12 +++++++++---
 DEVELOPER      |  8 ++++----
 NEWS           |  1 +
 src/legacy.cpp |  8 ++++----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3b07431c..32916e3a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2.5.2 (?) ?
+2.5.2 () -
+
+- Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
@@ -110,8 +112,14 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
+<<<<<<< HEAD
 ------ current release ---------------------------
 
+||||||| parent of 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
+=======
+------ old releases ------------------------------
+
+>>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
@@ -325,8 +333,6 @@
   added.
 - When GC is turned off, disable the query shortcuts, which no longer apply.
 
------- old releases ------------------------------
-
 2.4.4 (2015-05-10) df49aaba126484b668c41d3ff9301f8d8ec49987
 
 - TW-69   wait dates relative to due date (thanks to John Florian).
diff --git a/DEVELOPER b/DEVELOPER
index 6af9d9631..8eb0b44cc 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -10,7 +10,7 @@ How to Build Taskwarrior
   Obtain and build code:
     $ git clone https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
-    $ git checkout 2.5.0                 # Latest dev branch
+    $ git checkout 2.6.0                 # Latest dev branch
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
     $ make VERBOSE=1                     # Shows details
 
@@ -158,11 +158,11 @@ Work in Progress
 Current Codebase Condition
 
   'master' branch:
-    - 2.4.4 Current release, locked.
+    - 2.5.1 Current release, locked.
 
-  '2.5.0' branch:
+  '2.6.0' branch:
     - Current development branch no plans yet.
 
 ---
 
-2015-09-07 Updated for 2.5.0
+2016-02-24 Updated for 2.6.0
diff --git a/NEWS b/NEWS
index 288e649e2..01a955d27 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Newly Deprecated Features in Taskwarrior 2.5.2
 
 Removed Features in 2.5.2
 
+  - Removed 'alias._query' default configuration.
 
 Known Issues
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 6139505fd..be4039cf0 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -96,22 +96,21 @@ std::string legacyCheckForDeprecatedVariables ()
   for (auto& it : context.config)
   {
     // 2014-07-04: report.*.limit removed.
+    // 2016-02-24: alias._query removed.
 
+    // Deprecated in 2.5.0.
     // report.*.annotations
     if (it.first.length () > 19 &&
         it.first.substr (0, 7) == "report." &&
         it.first.substr (it.first.length () - 12) == ".annotations")
       deprecated.push_back (it.first);
 
+    // Deprecated in 2.5.0.
     if (it.first == "next"              ||
         it.first == "annotations"       ||
         it.first == "export.ical.class")
       deprecated.push_back (it.first);
 
-    // Deprecated іn 2.4.0.
-    if (it.first == "alias._query")
-      deprecated.push_back (it.first);
-
     // Deprecated in 2.5.0.
     if (it.first == "urgency.inherit.coefficient")
         deprecated.push_back (it.first);
@@ -140,6 +139,7 @@ std::string legacyCheckForDeprecatedColumns ()
   {
     if (it.first.find ("report") == 0)
     {
+      // Deprecated in 2.0.0
       std::string value = context.config.get (it.first);
       if (value.find ("entry_time") != std::string::npos ||
           value.find ("start_time") != std::string::npos ||

From 88bd2fc9e2121a252780f336e6c596a64b5c9f13 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Feb 2016 23:26:39 -0500
Subject: [PATCH 005/879] Context: Combined interactive.cpp and Context.cpp

---
 src/CMakeLists.txt  |   1 -
 src/Context.cpp     |  72 ++++++++++++++++++++++++++++++
 src/interactive.cpp | 105 --------------------------------------------
 3 files changed, 72 insertions(+), 106 deletions(-)
 delete mode 100644 src/interactive.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35c182b56..fde10cd3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,6 @@ set (task_SRCS CLI2.cpp CLI2.h
                dependency.cpp
                feedback.cpp
                i18n.h
-               interactive.cpp
                legacy.cpp
                recur.cpp
                rules.cpp
diff --git a/src/Context.cpp b/src/Context.cpp
index c1195be8c..98edcd635 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -42,10 +42,18 @@
 #include <util.h>
 #include <main.h>
 #include <i18n.h>
+
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
 
+#include <stdio.h>
+#include <sys/ioctl.h>
+
+#ifdef SOLARIS
+#include <sys/termios.h>
+#endif
+
 // Supported modifiers, synonyms on the same line.
 static const char* modifierNames[] =
 {
@@ -469,6 +477,70 @@ int Context::dispatch (std::string &out)
   return commands["help"]->execute (out);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int Context::getWidth ()
+{
+  // Determine window size.
+  int width = config.getInteger ("defaultwidth");
+
+  // A zero width value means 'infinity', which is approximated here by 2^16.
+  if (width == 0)
+    return 65536;
+
+  if (config.getBoolean ("detection"))
+  {
+    if (terminal_width == 0 &&
+        terminal_height == 0)
+    {
+      unsigned short buff[4];
+      if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &buff) != -1)
+      {
+        terminal_height = buff[0];
+        terminal_width = buff[1];
+      }
+    }
+
+    width = terminal_width;
+
+    // Ncurses does this, and perhaps we need to as well, to avoid a problem on
+    // Cygwin where the display goes right up to the terminal width, and causes
+    // an odd color wrapping problem.
+    if (config.getBoolean ("avoidlastcolumn"))
+      --width;
+  }
+
+  return width;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int Context::getHeight ()
+{
+  // Determine window size.
+  int height = config.getInteger ("defaultheight");
+
+  // A zero height value means 'infinity', which is approximated here by 2^16.
+  if (height == 0)
+    return 65536;
+
+  if (config.getBoolean ("detection"))
+  {
+    if (terminal_width == 0 &&
+        terminal_height == 0)
+    {
+      unsigned short buff[4];
+      if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &buff) != -1)
+      {
+        terminal_height = buff[0];
+        terminal_width = buff[1];
+      }
+    }
+
+    height = terminal_height;
+  }
+
+  return height;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool Context::color ()
 {
diff --git a/src/interactive.cpp b/src/interactive.cpp
deleted file mode 100644
index 1b1dc54ba..000000000
--- a/src/interactive.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <sstream>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <Context.h>
-#include <main.h>
-#include <text.h>
-#include <i18n.h>
-
-#ifdef SOLARIS
-#include <sys/termios.h>
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-int Context::getWidth ()
-{
-  // Determine window size.
-  int width = config.getInteger ("defaultwidth");
-
-  // A zero width value means 'infinity', which is approximated here by 2^16.
-  if (width == 0)
-    return 65536;
-
-  if (config.getBoolean ("detection"))
-  {
-    if (terminal_width == 0 &&
-        terminal_height == 0)
-    {
-      unsigned short buff[4];
-      if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &buff) != -1)
-      {
-        terminal_height = buff[0];
-        terminal_width = buff[1];
-      }
-    }
-
-    width = terminal_width;
-
-    // Ncurses does this, and perhaps we need to as well, to avoid a problem on
-    // Cygwin where the display goes right up to the terminal width, and causes
-    // an odd color wrapping problem.
-    if (config.getBoolean ("avoidlastcolumn"))
-      --width;
-  }
-
-  return width;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Context::getHeight ()
-{
-  // Determine window size.
-  int height = config.getInteger ("defaultheight");
-
-  // A zero height value means 'infinity', which is approximated here by 2^16.
-  if (height == 0)
-    return 65536;
-
-  if (config.getBoolean ("detection"))
-  {
-    if (terminal_width == 0 &&
-        terminal_height == 0)
-    {
-      unsigned short buff[4];
-      if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &buff) != -1)
-      {
-        terminal_height = buff[0];
-        terminal_width = buff[1];
-      }
-    }
-
-    height = terminal_height;
-  }
-
-  return height;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From abefdd506c8315746e26a10c4940e93785cbe00d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Feb 2016 23:43:23 -0500
Subject: [PATCH 006/879] Cleanup: Removed redundant processing of OS name

---
 src/DOM.cpp                     | 31 ++++---------------------------
 src/commands/CmdDiagnostics.cpp | 26 +-------------------------
 src/util.cpp                    | 27 +++++++++++++++++++++++++++
 src/util.h                      |  2 ++
 4 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 4d49cf352..f938412c2 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -34,6 +34,7 @@
 #include <Nibbler.h>
 #include <ISO8601.h>
 #include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
@@ -58,14 +59,14 @@ bool getDOM (const std::string& name, Variant& value)
   if (name == "")
     return false;
 
-  int len = name.length ();
+  auto len = name.length ();
   Nibbler n (name);
 
   // rc. --> context.config
   if (len > 3 &&
       ! name.compare (0, 3, "rc.", 3))
   {
-    std::string key = name.substr (3);
+    auto key = name.substr (3);
     auto c = context.config.find (key);
     if (c != context.config.end ())
     {
@@ -117,8 +118,6 @@ bool getDOM (const std::string& name, Variant& value)
       throw format (STRING_DOM_UNREC, name);
   }
 
-  // TODO stats.<name>
-
   // system. --> Implement locally.
   if (len > 7 &&
       ! name.compare (0, 7, "system.", 7))
@@ -133,29 +132,7 @@ bool getDOM (const std::string& name, Variant& value)
     // OS type.
     else if (name == "system.os")
     {
-#if defined (DARWIN)
-      value = Variant ("Darwin");
-#elif defined (SOLARIS)
-      value = Variant ("Solaris");
-#elif defined (CYGWIN)
-      value = Variant ("Cygwin");
-#elif defined (HAIKU)
-      value = Variant ("Haiku");
-#elif defined (OPENBSD)
-      value = Variant ("OpenBSD");
-#elif defined (FREEBSD)
-      value = Variant ("FreeBSD");
-#elif defined (NETBSD)
-      value = Variant ("NetBSD");
-#elif defined (LINUX)
-      value = Variant ("Linux");
-#elif defined (KFREEBSD)
-      value = Variant ("GNU/kFreeBSD");
-#elif defined (GNUHURD)
-      value = Variant ("GNU/Hurd");
-#else
-      value = Variant (STRING_DOM_UNKNOWN);
-#endif
+      value = Variant (osName ());
       return true;
     }
     else
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 9ccb47abd..77076ed44 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -79,31 +79,7 @@ int CmdDiagnostics::execute (std::string& output)
       << bold.colorize (PACKAGE_STRING)
       << "\n";
 
-  out << "   " << STRING_CMD_DIAG_PLATFORM << ": "
-      <<
-#if defined (DARWIN)
-         "Darwin"
-#elif defined (SOLARIS)
-         "Solaris"
-#elif defined (CYGWIN)
-         "Cygwin"
-#elif defined (HAIKU)
-         "Haiku"
-#elif defined (OPENBSD)
-         "OpenBSD"
-#elif defined (FREEBSD)
-         "FreeBSD"
-#elif defined (NETBSD)
-         "NetBSD"
-#elif defined (LINUX)
-         "Linux"
-#elif defined (KFREEBSD)
-         "GNU/kFreeBSD"
-#elif defined (GNUHURD)
-         "GNU/Hurd"
-#else
-         STRING_CMD_DIAG_UNKNOWN
-#endif
+  out << "   " << STRING_CMD_DIAG_PLATFORM << ": " << osName ()
       << "\n\n";
 
   // Compiler.
diff --git a/src/util.cpp b/src/util.cpp
index 9b07c09af..0d7c6e3a8 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -484,4 +484,31 @@ time_t timegm (struct tm *tm)
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
+std::string osName ()
+{
+#if defined (DARWIN)
+  return "Darwin";
+#elif defined (SOLARIS)
+  return "Solaris";
+#elif defined (CYGWIN)
+  return "Cygwin";
+#elif defined (HAIKU)
+  return "Haiku";
+#elif defined (OPENBSD)
+  return "OpenBSD";
+#elif defined (FREEBSD)
+  return "FreeBSD";
+#elif defined (NETBSD)
+  return "NetBSD";
+#elif defined (LINUX)
+  return "Linux";
+#elif defined (KFREEBSD)
+  return "GNU/kFreeBSD";
+#elif defined (GNUHURD)
+  return "GNU/Hurd";
+#else
+  return STRING_DOM_UNKNOWN;
+#endif
+}
 
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index cec0ae8b5..078fadbe6 100644
--- a/src/util.h
+++ b/src/util.h
@@ -65,5 +65,7 @@ const std::vector <std::string> extractParents (
   time_t timegm (struct tm *tm);
 #endif
 
+std::string osName ();
+
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From 9e5a0f0e61055f1525c8533cd1067fd7fd77d44f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Feb 2016 23:55:46 -0500
Subject: [PATCH 007/879] Rules: Improved use of 'const' and 'auto'

---
 src/rules.cpp | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/rules.cpp b/src/rules.cpp
index 192cc425f..dc4accd76 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -53,7 +53,7 @@ void initializeColorRules ()
     // Load all the configuration values, filter to only the ones that begin with
     // "color.", then store name/value in gsColor, and name in rules.
     std::vector <std::string> rules;
-    for (auto& v : context.config)
+    for (const auto& v : context.config)
     {
       if (! v.first.compare (0, 6, "color.", 6))
       {
@@ -70,7 +70,7 @@ void initializeColorRules ()
     std::vector <std::string> precedence;
     split (precedence, context.config.get ("rule.precedence.color"), ',');
 
-    for (auto& p : precedence)
+    for (const auto& p : precedence)
     {
       // Add the leading "color." string.
       std::string rule = "color." + p;
@@ -90,13 +90,12 @@ void initializeColorRules ()
 ////////////////////////////////////////////////////////////////////////////////
 static void applyColor (const Color& base, Color& c, bool merge)
 {
-    if (merge)
-      c.blend (base);
-    else
-      c = base;
+  if (merge)
+    c.blend (base);
+  else
+    c = base;
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeBlocked (Task& task, const Color& base, Color& c, bool merge)
 {
@@ -154,8 +153,8 @@ static void colorizeProject (Task& task, const std::string& rule, const Color& b
   // Observe the case sensitivity setting.
   bool sensitive = context.config.getBoolean ("search.case.sensitive");
 
-  std::string project = task.get ("project");
-  std::string rule_trunc = rule.substr (14);
+  auto project = task.get ("project");
+  auto rule_trunc = rule.substr (14);
 
   // Match project names leftmost.
   if (rule_trunc.length () <= project.length ())
@@ -181,7 +180,7 @@ static void colorizeTagNone (Task& task, const Color& base, Color& c, bool merge
 static void colorizeKeyword (Task& task, const std::string& rule, const Color& base, Color& c, bool merge)
 {
   // Observe the case sensitivity setting.
-  bool sensitive = context.config.getBoolean ("search.case.sensitive");
+  auto sensitive = context.config.getBoolean ("search.case.sensitive");
 
   // The easiest thing to check is the description, because it is just one
   // attribute.
@@ -192,10 +191,10 @@ static void colorizeKeyword (Task& task, const std::string& rule, const Color& b
   // first match.
   else
   {
-    for (auto& it : task.data)
+    for (const auto& att : task.data)
     {
-      if (! it.first.compare (0, 11, "annotation_", 11) &&
-          find (it.second, rule.substr (14), sensitive) != std::string::npos)
+      if (! att.first.compare (0, 11, "annotation_", 11) &&
+          find (att.second, rule.substr (14), sensitive) != std::string::npos)
       {
         applyColor (base, c, merge);
         return;
@@ -208,7 +207,7 @@ static void colorizeKeyword (Task& task, const std::string& rule, const Color& b
 static void colorizeUDA (Task& task, const std::string& rule, const Color& base, Color& c, bool merge)
 {
   // Is the rule color.uda.name.value or color.uda.name?
-  size_t pos = rule.find (".", 10);
+  auto pos = rule.find (".", 10);
   if (pos == std::string::npos)
   {
     if (task.has (rule.substr (10)))
@@ -216,8 +215,8 @@ static void colorizeUDA (Task& task, const std::string& rule, const Color& base,
   }
   else
   {
-    const std::string uda = rule.substr (10, pos - 10);
-    const std::string val = rule.substr (pos + 1);
+    auto uda = rule.substr (10, pos - 10);
+    auto val = rule.substr (pos + 1);
     if ((val == "none" && ! task.has (uda)) ||
         task.get (uda) == val)
       applyColor (base, c, merge);
@@ -229,7 +228,7 @@ static void colorizeDue (Task& task, const Color& base, Color& c, bool merge)
 {
   if (task.has ("due"))
   {
-    Task::status status = task.getStatus ();
+    auto status = task.getStatus ();
     if (status != Task::completed &&
         status != Task::deleted   &&
         task.getDateState ("due") == Task::dateAfterToday)
@@ -242,8 +241,8 @@ static void colorizeDueToday (Task& task, const Color& base, Color& c, bool merg
 {
   if (task.has ("due"))
   {
-    Task::status status = task.getStatus ();
-    Task::dateState dateState = task.getDateState ("due");
+    auto status = task.getStatus ();
+    auto dateState = task.getDateState ("due");
     if (status != Task::completed &&
         status != Task::deleted   &&
         (dateState == Task::dateLaterToday || dateState == Task::dateEarlierToday))
@@ -256,7 +255,7 @@ static void colorizeOverdue (Task& task, const Color& base, Color& c, bool merge
 {
   if (task.has ("due"))
   {
-    Task::status status = task.getStatus ();
+    auto status = task.getStatus ();
     if (status != Task::completed &&
         status != Task::deleted   &&
         task.getDateState ("due") == Task::dateBeforeToday)
@@ -296,7 +295,7 @@ void autoColorize (Task& task, Color& c)
     return;
   }
 
-  bool merge = context.config.getBoolean ("rule.color.merge");
+  auto merge = context.config.getBoolean ("rule.color.merge");
 
   // Note: c already contains colors specifically assigned via command.
   // Note: These rules form a hierarchy - the last rule is King, hence the

From 48167f53ebaaa6f411e271a74a68d3cec8019313 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Feb 2016 00:19:38 -0500
Subject: [PATCH 008/879] Cleanup: Converted all sprintf to snprintf

---
 src/Task.cpp                 |  2 +-
 src/Variant.cpp              |  4 ++--
 src/commands/CmdBurndown.cpp | 16 ++++++++--------
 src/commands/CmdColor.cpp    |  2 +-
 src/commands/CmdLogo.cpp     |  4 ++--
 src/commands/CmdSummary.cpp  |  2 +-
 src/recur.cpp                | 18 +++++-------------
 src/util.cpp                 |  8 ++++----
 8 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 35191c9b6..5dee6f25e 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -180,7 +180,7 @@ const std::string Task::identifier (bool shortened /* = false */) const
 void Task::setAsNow (const std::string& att)
 {
   char now[16];
-  sprintf (now, "%u", (unsigned int) time (NULL));
+  snprintf (now, 16, "%u", (unsigned int) time (NULL));
   set (att, now);
 
   recalc_urgency = true;
diff --git a/src/Variant.cpp b/src/Variant.cpp
index c99b31525..1de474e85 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1782,7 +1782,7 @@ void Variant::cast (const enum type new_type)
     case type_string:
       {
         char temp[24];
-        sprintf (temp, "%d", _integer);
+        snprintf (temp, 24, "%d", _integer);
         _string = temp;
       }
       break;
@@ -1800,7 +1800,7 @@ void Variant::cast (const enum type new_type)
     case type_string:
       {
         char temp[24];
-        sprintf (temp, "%g", _real);
+        snprintf (temp, 24, "%g", _real);
         _string = temp;
       }
       break;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 3cf04e2fc..5151b3712 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -467,9 +467,9 @@ std::string Chart::render ()
 
   // Draw y-axis labels.
   char label [12];
-  sprintf (label, "%*d", _max_label, _labels[2]);
+  snprintf (label, 12, "%*d", _max_label, _labels[2]);
   _grid.replace (LOC (1,                       _max_label - strlen (label)), strlen (label), label);
-  sprintf (label, "%*d", _max_label, _labels[1]);
+  snprintf (label, 12, "%*d", _max_label, _labels[1]);
   _grid.replace (LOC (1 + (_graph_height / 2), _max_label - strlen (label)), strlen (label), label);
   _grid.replace (LOC (_graph_height + 1,       _max_label - 1),              1,              "0");
 
@@ -527,7 +527,7 @@ std::string Chart::render ()
   calculateRates ();
   char rate[12];
   if (_net_fix_rate != 0.0)
-    sprintf (rate, "%.1f/d", _net_fix_rate);
+    snprintf (rate, 12, "%.1f/d", _net_fix_rate);
   else
     strcpy (rate, "-");
 
@@ -729,24 +729,24 @@ void Chart::generateBars ()
         std::string month = ISO8601d::monthName (cursor.month ());
         bar._major_label = month.substr (0, 3);
 
-        sprintf (str, "%02d", cursor.day ());
+        snprintf (str, 12, "%02d", cursor.day ());
         bar._minor_label = str;
       }
       break;
 
     case 'W': // year/week
-      sprintf (str, "%d", cursor.year ());
+      snprintf (str, 12, "%d", cursor.year ());
       bar._major_label = str;
 
-      sprintf (str, "%02d", cursor.weekOfYear (0));
+      snprintf (str, 12, "%02d", cursor.weekOfYear (0));
       bar._minor_label = str;
       break;
 
     case 'M': // year/month
-      sprintf (str, "%d", cursor.year ());
+      snprintf (str, 12, "%d", cursor.year ());
       bar._major_label = str;
 
-      sprintf (str, "%02d", cursor.month ());
+      snprintf (str, 12, "%02d", cursor.month ());
       bar._minor_label = str;
       break;
     }
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 64672d271..6fe0e3b2e 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -219,7 +219,7 @@ int CmdColor::execute (std::string& output)
       char label [12];
       for (int g = 0; g < 6; ++g)
       {
-        sprintf (label, " %d", g);
+        snprintf (label, 12, " %d", g);
         out << Color::colorize (label, "bold green");
         for (int r = 0; r < 6; ++r)
         {
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 8a1c2c408..744c7e641 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -108,7 +108,7 @@ int CmdLogo::execute (std::string& output)
       {
         value += 167;
         char block [24];
-        sprintf (block, "\033[48;5;%dm  \033[0m", value);
+        snprintf (block, 24, "\033[48;5;%dm  \033[0m", value);
         output += block;
       }
     }
@@ -122,7 +122,7 @@ int CmdLogo::execute (std::string& output)
       {
         value += 167;
         char block [24];
-        sprintf (block, "\033[48;5;%dm  \033[0m", value);
+        snprintf (block, 24, "\033[48;5;%dm  \033[0m", value);
         output += block;
       }
     }
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 90da8328d..04e06ce4b 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -199,7 +199,7 @@ int CmdSummary::execute (std::string& output)
 
       char percent[12] = "0%";
       if (c + p)
-        sprintf (percent, "%d%%", 100 * c / (c + p));
+        snprintf (percent, 12, "%d%%", 100 * c / (c + p));
       view.set (row, 3, percent);
       processed.push_back (i.first);
     }
diff --git a/src/recur.cpp b/src/recur.cpp
index 2c8b3f670..6ee2179fc 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <time.h>
-
 #include <Context.h>
 #include <Lexer.h>
 #include <ISO8601.h>
@@ -80,10 +79,10 @@ void handleRecurrence ()
       }
 
       // Get the mask from the parent task.
-      std::string mask = t.get ("mask");
+      auto mask = t.get ("mask");
 
       // Iterate over the due dates, and check each against the mask.
-      bool changed = false;
+      auto changed = false;
       unsigned int i = 0;
       for (auto& d : due)
       {
@@ -97,18 +96,14 @@ void handleRecurrence ()
           rec.set ("uuid", uuid ());             // New UUID.
           rec.set ("parent", t.get ("uuid"));    // Remember mom.
           rec.setAsNow ("entry");                // New entry date.
-
-          char dueDate[16];
-          sprintf (dueDate, "%u", (unsigned int) d.toEpoch ());
-          rec.set ("due", dueDate);              // Store generated due date.
+          rec.set ("due", format (d.toEpoch ()));
 
           if (t.has ("wait"))
           {
             ISO8601d old_wait (t.get_date ("wait"));
             ISO8601d old_due (t.get_date ("due"));
             ISO8601d due (d);
-            sprintf (dueDate, "%u", (unsigned int) (due + (old_wait - old_due)).toEpoch ());
-            rec.set ("wait", dueDate);
+            rec.set ("wait", format ((due + (old_wait - old_due)).toEpoch ()));
             rec.setStatus (Task::waiting);
             mask += 'W';
           }
@@ -118,10 +113,7 @@ void handleRecurrence ()
             rec.setStatus (Task::pending);
           }
 
-          char indexMask[12];
-          sprintf (indexMask, "%u", (unsigned int) i);
-          rec.set ("imask", indexMask);          // Store index into mask.
-
+          rec.set ("imask", i);
           rec.remove ("mask");                   // Remove the mask of the parent.
 
           // Add the new task to the DB.
diff --git a/src/util.cpp b/src/util.cpp
index 0d7c6e3a8..2db86148d 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -155,10 +155,10 @@ std::string formatBytes (size_t bytes)
 {
   char formatted[24];
 
-       if (bytes >=  995000000) sprintf (formatted, "%.1f %s", (bytes / 1000000000.0), STRING_UTIL_GIBIBYTES);
-  else if (bytes >=     995000) sprintf (formatted, "%.1f %s", (bytes /    1000000.0), STRING_UTIL_MEBIBYTES);
-  else if (bytes >=        995) sprintf (formatted, "%.1f %s", (bytes /       1000.0), STRING_UTIL_KIBIBYTES);
-  else                          sprintf (formatted, "%d %s",   (int)bytes,             STRING_UTIL_BYTES);
+       if (bytes >=  995000000) snprintf (formatted, 24, "%.1f %s", (bytes / 1000000000.0), STRING_UTIL_GIBIBYTES);
+  else if (bytes >=     995000) snprintf (formatted, 24, "%.1f %s", (bytes /    1000000.0), STRING_UTIL_MEBIBYTES);
+  else if (bytes >=        995) snprintf (formatted, 24, "%.1f %s", (bytes /       1000.0), STRING_UTIL_KIBIBYTES);
+  else                          snprintf (formatted, 24, "%d %s",   (int)bytes,             STRING_UTIL_BYTES);
 
   return Lexer::commify (formatted);
 }

From 677c2e87b520ea2f6ed8ffbde74cfeccc3ed51b7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Feb 2016 00:21:52 -0500
Subject: [PATCH 009/879] calc: Uses osName() to reduce string literals

---
 src/calc.cpp | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index be0b83f33..681f6af00 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -33,6 +33,7 @@
 #include <Dates.h>
 #include <Context.h>
 #include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 Context context;
@@ -83,29 +84,7 @@ int main (int argc, char** argv)
       {
         std::cout << "\n"
                   << format (STRING_CMD_VERSION_BUILT, "calc", VERSION)
-#if defined (DARWIN)
-                  << "darwin"
-#elif defined (SOLARIS)
-                  << "solaris"
-#elif defined (CYGWIN)
-                  << "cygwin"
-#elif defined (HAIKU)
-                  << "haiku"
-#elif defined (OPENBSD)
-                  << "openbsd"
-#elif defined (FREEBSD)
-                  << "freebsd"
-#elif defined (NETBSD)
-                  << "netbsd"
-#elif defined (LINUX)
-                  << "linux"
-#elif defined (KFREEBSD)
-                  << "gnu-kfreebsd"
-#elif defined (GNUHURD)
-                  << "gnu-hurd"
-#else
-                  << STRING_CMD_VERSION_UNKNOWN
-#endif
+                  << osName ()
                   << "\n"
                   << STRING_CMD_VERSION_COPY
                   << "\n"

From 2980f5d3ce517a510b068661b4f8411d04f94ec2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 28 Feb 2016 11:09:00 -0500
Subject: [PATCH 010/879] TD-64: sync conflict deleted all annotations of the
 task

- Thanks to Markus Beppler, Konstantin Vorobyev.
---
 AUTHORS      | 2 +-
 ChangeLog    | 2 ++
 src/Task.cpp | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 32b8d3752..1e2e01e2c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,7 +126,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Sunil Joshi
   Misty De Meo
   Kent R. Spillner
-  Konstantin
+  Konstantin Vorobyev
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 32916e3a5..672d258af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2.5.2 () -
 
+- TD-64 sync conflict deleted all annotations of the task
+        (thanks to Markus Beppler, Konstantin Vorobyev).
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
diff --git a/src/Task.cpp b/src/Task.cpp
index 5dee6f25e..23e3a44a5 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -270,6 +270,9 @@ void Task::set (const std::string& name, const std::string& value)
 {
   data[name] = json::decode (value);
 
+  if (! name.compare (0, 11, "annotation_", 11))
+    ++annotation_count;
+
   recalc_urgency = true;
 }
 
@@ -286,6 +289,9 @@ void Task::remove (const std::string& name)
 {
   if (data.erase (name))
     recalc_urgency = true;
+
+  if (! name.compare (0, 11, "annotation_", 11))
+    --annotation_count;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From bf4b08efd252a0105d08404ddc38711fa4a024f6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 28 Feb 2016 11:19:29 -0500
Subject: [PATCH 011/879] =?UTF-8?q?TW-1741:=20Warning=20"ignoring=20return?=
 =?UTF-8?q?=20value=20of=20=E2=80=98int=20ftruncate"=20while=20doing=20mak?=
 =?UTF-8?q?e=20on=20xubuntu15.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Thanks to Sunil Joshi.
---
 src/FS.cpp         | 4 +++-
 src/l10n/deu-DEU.h | 1 +
 src/l10n/eng-USA.h | 1 +
 src/l10n/epo-RUS.h | 1 +
 src/l10n/esp-ESP.h | 1 +
 src/l10n/fra-FRA.h | 1 +
 src/l10n/ita-ITA.h | 1 +
 src/l10n/jpn-JPN.h | 1 +
 src/l10n/pol-POL.h | 1 +
 src/l10n/por-PRT.h | 1 +
 10 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/FS.cpp b/src/FS.cpp
index 04a84b80b..72bb9c72d 100644
--- a/src/FS.cpp
+++ b/src/FS.cpp
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <errno.h>
 #include <string.h>
 #include <text.h>
 #include <util.h>
@@ -556,7 +557,8 @@ void File::truncate ()
     open ();
 
   if (_fh)
-    (void) ftruncate (_h, 0);
+    if (ftruncate (_h, 0))
+      throw format (STRING_FILE_TRUNCATE, errno, strerror (errno));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index cbf9e5aa1..7f74bff50 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior hat die erforderlichen Rechte auf '{1}' nicht."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 559ce72d5..b97777e13 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -794,6 +794,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1ca0d4fae..30ff8b1c4 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior ne havas la bezonatan permeson por '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a1d855704..225993a90 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -804,6 +804,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior no tiene los permisos adecuados para '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 84c3996a8..98a25db4a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index eeb3125c1..d804d44e2 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -795,6 +795,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior non dispone dei permessi corretti per '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index b19f8298f..ac6b31f4c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 7d0fd121c..dec6b975e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "Taskwarrior nie posiada praw dostępu do '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 556467d6e..9d2ef8b74 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -796,6 +796,7 @@
 
 // File
 #define STRING_FILE_PERMS            "O taskwarrior não encontrou as permissões corretas em '{1}'."
+#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

From cbdd04e506e37a181aaccc2cc22493e35bef357a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 17 Mar 2016 17:17:22 -0400
Subject: [PATCH 012/879] CmdDiagnostics: Typo

---
 src/commands/CmdDiagnostics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 77076ed44..a71fa5190 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -280,7 +280,7 @@ int CmdDiagnostics::execute (std::string& output)
       << credentials
       << "\n\n";
 
-  // Disaply hook status.
+  // Display hook status.
   Path hookLocation (context.config.get ("data.location"));
   hookLocation += "hooks";
 

From f10a3d623241812fdddf0e083a63dc44961107a6 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 19 Mar 2016 20:18:41 +0100
Subject: [PATCH 013/879] TDB2: Add capability to purge tasks out of data files

---
 src/TDB2.cpp | 33 ++++++++++++++++++++++++++++++---
 src/TDB2.h   |  4 ++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 22dff8a72..5d501eb9b 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -218,6 +218,21 @@ bool TF2::modify_task (const Task& task)
   return false;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool TF2::purge_task (const Task& task)
+{
+  // Bail out if task is not found in this file
+  std::string uuid = task.get ("uuid");
+  if (!has (uuid))
+    return false;
+
+  // Mark the task to be purged
+  _purged_tasks.insert (uuid);
+  _dirty = true;
+
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void TF2::add_line (const std::string& line)
 {
@@ -248,7 +263,7 @@ void TF2::commit ()
   if (_dirty)
   {
     // Special case: added but no modified means just append to the file.
-    if (!_modified_tasks.size () &&
+    if (!_modified_tasks.size () && !_purged_tasks.size () &&
         (_added_tasks.size () || _added_lines.size ()))
     {
       if (_file.open ())
@@ -284,7 +299,9 @@ void TF2::commit ()
         // Only write out _tasks, because any deltas have already been applied.
         _file.append (std::string(""));  // Seek to end of file
         for (auto& task : _tasks)
-          _file.write_raw (task.composeF4 () + "\n");
+          // Skip over the tasks that are marked to be purged
+          if (_purged_tasks.find (task.get ("uuid")) == _purged_tasks.end ())
+            _file.write_raw (task.composeF4 () + "\n");
 
         // Write out all the added lines.
         _file.append (_added_lines);
@@ -492,6 +509,7 @@ void TF2::clear ()
   _tasks.clear ();
   _added_tasks.clear ();
   _modified_tasks.clear ();
+  _purged_tasks.clear ();
   _lines.clear ();
   _added_lines.clear ();
   _I2U.clear ();
@@ -565,17 +583,19 @@ const std::string TF2::dump ()
   std::string tasks          = green.colorize  (rightJustifyZero ((int) _tasks.size (),          4));
   std::string tasks_added    = red.colorize    (rightJustifyZero ((int) _added_tasks.size (),    3));
   std::string tasks_modified = yellow.colorize (rightJustifyZero ((int) _modified_tasks.size (), 3));
+  std::string tasks_purged   = red.colorize    (rightJustifyZero ((int) _purged_tasks.size (),   3));
   std::string lines          = green.colorize  (rightJustifyZero ((int) _lines.size (),          4));
   std::string lines_added    = red.colorize    (rightJustifyZero ((int) _added_lines.size (),    3));
 
   char buffer[256];  // Composed string is actually 246 bytes.  Yikes.
-  snprintf (buffer, 256, "%14s %s %s T%s+%s~%s L%s+%s",
+  snprintf (buffer, 256, "%14s %s %s T%s+%s~%s-%s L%s+%s",
             label.c_str (),
             mode.c_str (),
             hygiene.c_str (),
             tasks.c_str (),
             tasks_added.c_str (),
             tasks_modified.c_str (),
+            tasks_purged.c_str (),
             lines.c_str (),
             lines_added.c_str ());
 
@@ -649,6 +669,13 @@ void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
   update (task, add_to_backlog);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void TDB2::purge (Task& task)
+{
+  // Delete the task from completed.data
+  completed.purge_task (task);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void TDB2::update (
   Task& task,
diff --git a/src/TDB2.h b/src/TDB2.h
index b05aa21a7..a830355e4 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -28,6 +28,7 @@
 #define INCLUDED_TDB2
 
 #include <map>
+#include <unordered_set>
 #include <unordered_map>
 #include <vector>
 #include <string>
@@ -54,6 +55,7 @@ public:
 
   void add_task (Task&);
   bool modify_task (const Task&);
+  bool purge_task (const Task&);
   void add_line (const std::string&);
   void clear_tasks ();
   void clear_lines ();
@@ -90,6 +92,7 @@ public:
 
   std::vector <Task> _added_tasks;
   std::vector <Task> _modified_tasks;
+  std::unordered_set <std::string> _purged_tasks;
   std::vector <std::string> _lines;
   std::vector <std::string> _added_lines;
   File _file;
@@ -110,6 +113,7 @@ public:
   void set_location (const std::string&);
   void add (Task&, bool add_to_backlog = true);
   void modify (Task&, bool add_to_backlog = true);
+  void purge (Task&);
   void commit ();
   void get_changes (std::vector <Task>&);
   void revert ();

From 70a0e256b0c62029d8b3132aa0ef2c54dab18c47 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 19 Mar 2016 21:18:41 +0100
Subject: [PATCH 014/879] CmdPurge: Add initial implementation

---
 src/commands/CMakeLists.txt |  1 +
 src/commands/CmdPurge.cpp   | 80 +++++++++++++++++++++++++++++++++++++
 src/commands/CmdPurge.h     | 41 +++++++++++++++++++
 src/commands/Command.cpp    |  2 +
 src/l10n/eng-USA.h          |  2 +
 5 files changed, 126 insertions(+)
 create mode 100644 src/commands/CmdPurge.cpp
 create mode 100644 src/commands/CmdPurge.h

diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt
index cd6f7a519..575e351e7 100644
--- a/src/commands/CMakeLists.txt
+++ b/src/commands/CMakeLists.txt
@@ -40,6 +40,7 @@ set (commands_SRCS Command.cpp        Command.h
                    CmdModify.cpp      CmdModify.h
                    CmdPrepend.cpp     CmdPrepend.h
                    CmdProjects.cpp    CmdProjects.h
+                   CmdPurge.cpp       CmdPurge.h
                    CmdReports.cpp     CmdReports.h
                    CmdShow.cpp        CmdShow.h
                    CmdStart.cpp       CmdStart.h
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
new file mode 100644
index 000000000..5ca665efe
--- /dev/null
+++ b/src/commands/CmdPurge.cpp
@@ -0,0 +1,80 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <CmdPurge.h>
+#include <Context.h>
+#include <Filter.h>
+#include <i18n.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+CmdPurge::CmdPurge ()
+{
+  _keyword               = "purge";
+  _usage                 = "task <filter> purge";
+  _description           = STRING_CMD_PURGE_USAGE;
+  _read_only             = false;
+  _displays_id           = false;
+  _needs_confirm         = true;
+  _needs_gc              = false;
+  _uses_context          = true;
+  _accepts_filter        = true;
+  _accepts_modifications = false;
+  _accepts_miscellaneous = false;
+  _category              = Command::Category::operation;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int CmdPurge::execute (std::string&)
+{
+  int rc = 0;
+  int count = 0;
+
+  // Apply filter.
+  Filter filter;
+  std::vector <Task> filtered;
+  filter.subset (filtered);
+  if (filtered.size () == 0)
+  {
+    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    return 1;
+  }
+
+  for (auto& task : filtered)
+  {
+    if (task.getStatus () == Task::deleted)
+    {
+        context.tdb2.purge (task);
+        count++;
+    }
+  }
+
+  return rc;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
new file mode 100644
index 000000000..8e9c76446
--- /dev/null
+++ b/src/commands/CmdPurge.h
@@ -0,0 +1,41 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_CMDPURGE
+#define INCLUDED_CMDPURGE
+
+#include <string>
+#include <Command.h>
+
+class CmdPurge : public Command
+{
+public:
+  CmdPurge ();
+  int execute (std::string&);
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 29025d994..4783afc68 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -70,6 +70,7 @@
 #include <CmdModify.h>
 #include <CmdPrepend.h>
 #include <CmdProjects.h>
+#include <CmdPurge.h>
 #include <CmdReports.h>
 #include <CmdShow.h>
 #include <CmdStart.h>
@@ -145,6 +146,7 @@ void Command::factory (std::map <std::string, Command*>& all)
   c = new CmdModify ();             all[c->keyword ()] = c;
   c = new CmdPrepend ();            all[c->keyword ()] = c;
   c = new CmdProjects ();           all[c->keyword ()] = c;
+  c = new CmdPurge ();              all[c->keyword ()] = c;
   c = new CmdReports ();            all[c->keyword ()] = c;
   c = new CmdShow ();               all[c->keyword ()] = c;
   c = new CmdShowRaw ();            all[c->keyword ()] = c;
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index b97777e13..cbc038b76 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -396,6 +396,8 @@
 #define STRING_CMD_DUPLICATE_1       "Duplicated {1} task."
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified task from the data files. Causes permanent loss of data."
+
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Task not started."
 #define STRING_CMD_START_ALREADY     "Task {1} '{2}' already started."

From 909b2e271367fa5bf8d4e648e06c22a08d89626c Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 19 Mar 2016 23:05:59 +0100
Subject: [PATCH 015/879] CmdPurge: Remove purged tasks from dependencies

---
 src/commands/CmdPurge.cpp | 23 ++++++++++++++++++++---
 src/l10n/eng-USA.h        |  2 ++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 5ca665efe..2156e9777 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -29,6 +29,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <i18n.h>
+#include <main.h>
 
 extern Context context;
 
@@ -55,9 +56,10 @@ int CmdPurge::execute (std::string&)
   int rc = 0;
   int count = 0;
 
-  // Apply filter.
   Filter filter;
   std::vector <Task> filtered;
+
+  // Apply filter.
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
@@ -67,13 +69,28 @@ int CmdPurge::execute (std::string&)
 
   for (auto& task : filtered)
   {
+    std::string uuid = task.get ("uuid");
+
     if (task.getStatus () == Task::deleted)
     {
-        context.tdb2.purge (task);
-        count++;
+      context.tdb2.purge (task);
+      count++;
+
+      // Remove dependencies on the task being purged
+      for (auto& blockedConst: context.tdb2.all_tasks ())
+      {
+        Task& blocked = const_cast<Task&>(blockedConst);
+        if (blocked.has ("depends") &&
+            blocked.get ("depends").find (uuid) != std::string::npos)
+        {
+            blocked.removeDependency (uuid);
+            context.tdb2.modify (blocked);
+        }
+      }
     }
   }
 
+  feedback_affected (count == 1 ? STRING_CMD_PURGE_1 : STRING_CMD_PURGE_N, count);
   return rc;
 }
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index cbc038b76..750e9dc61 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -397,6 +397,8 @@
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified task from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
 
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Task not started."

From ffce61da4b76051a0921da100c424751fc0719e3 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 01:40:29 +0100
Subject: [PATCH 016/879] CmdPurge: Require GC run prior to execution

Since TDB2::purge method allows purging of the tasks only
on competed.data file, we need to make sure that all the tasks
that were supposed to be moved to completed.data have been
moved - in other words, we need to run GC.

This allows for diract usage of purge after delete, that is:

$ task <filter> delete
$ task <filter> purge

working as expected.
---
 src/commands/CmdPurge.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 2156e9777..12cf14c3a 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -42,7 +42,7 @@ CmdPurge::CmdPurge ()
   _read_only             = false;
   _displays_id           = false;
   _needs_confirm         = true;
-  _needs_gc              = false;
+  _needs_gc              = true;
   _uses_context          = true;
   _accepts_filter        = true;
   _accepts_modifications = false;

From ec1a7b4b40619764fe9e9c736baa9c6fad4f693c Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 01:45:20 +0100
Subject: [PATCH 017/879] DEVELOPER: Use multiple jobs during make

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index 8eb0b44cc..1fbc9197a 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -12,7 +12,7 @@ How to Build Taskwarrior
     $ cd task.git
     $ git checkout 2.6.0                 # Latest dev branch
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
-    $ make VERBOSE=1                     # Shows details
+    $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs
 
   Running Test Suite:
     $ cd tests

From 233d8e3ebfb4d4c8de10a43afc93e9cd8f7be467 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 02:03:42 +0100
Subject: [PATCH 018/879] tests: Add coverage for purge command

---
 test/purge.t | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100755 test/purge.t

diff --git a/test/purge.t b/test/purge.t
new file mode 100755
index 000000000..7b8363683
--- /dev/null
+++ b/test/purge.t
@@ -0,0 +1,79 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestDelete(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_add_delete_purge(self):
+        """Verify that add/delete/purge successfully purges a task"""
+        self.t("add one")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        code, out, err = self.t("1 delete", input="y\n")
+        self.assertIn("Deleted 1 task.", out)
+
+        code, out, err = self.t(uuid + " purge")
+        self.assertIn("Purged 1 task.", out)
+
+        code, out, err = self.t("uuids")
+        self.assertNotIn(uuid, out)
+
+    def test_purge_remove_deps(self):
+        """Verify that purge command removes dependency references"""
+        self.t("add one")
+        self.t("add two dep:1")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        code, out, err = self.t("1 delete", input="y\n")
+        self.assertIn("Deleted 1 task.", out)
+
+        code, out, err = self.t(uuid + " purge")
+        self.assertIn("Purged 1 task.", out)
+
+        code, out, err = self.t("uuids")
+        self.assertNotIn(uuid, out)
+
+        dependencies = self.t("_get 1.depends")[1].strip()
+        self.assertNotIn(uuid, dependencies)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4 ft=python

From 1091cc23aff6231bf8d8818a4db9f2444b71b3c3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Mar 2016 21:51:34 -0400
Subject: [PATCH 019/879] Docs: Added MAKEFLAGS example

---
 DEVELOPER | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DEVELOPER b/DEVELOPER
index 1fbc9197a..10c24f159 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -13,6 +13,7 @@ How to Build Taskwarrior
     $ git checkout 2.6.0                 # Latest dev branch
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs
+                                         # Alternately 'export MAKEFLAGS=-j 8'.
 
   Running Test Suite:
     $ cd tests

From 58cee899b0ffac6669886317528f285da04b7cab Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Mar 2016 21:57:01 -0400
Subject: [PATCH 020/879] L10N: Propagated new strings to all LANGS

---
 src/l10n/deu-DEU.h | 4 ++++
 src/l10n/eng-USA.h | 2 +-
 src/l10n/epo-RUS.h | 4 ++++
 src/l10n/esp-ESP.h | 4 ++++
 src/l10n/fra-FRA.h | 4 ++++
 src/l10n/ita-ITA.h | 4 ++++
 src/l10n/jpn-JPN.h | 4 ++++
 src/l10n/pol-POL.h | 4 ++++
 src/l10n/por-PRT.h | 4 ++++
 9 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7f74bff50..e3b4a003c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "{1} Aufgabe verdoppelt."
 #define STRING_CMD_DUPLICATE_N       "{1} Aufgaben verdoppelt."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Kennzeichnet die gewählte Aufgabe als begonnen."
 #define STRING_CMD_START_NO          "Aufgabe nicht begonnen."
 #define STRING_CMD_START_ALREADY     "Aufgabe {1} '{2}' ist bereits gestartet."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 750e9dc61..857628cf4 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -396,7 +396,7 @@
 #define STRING_CMD_DUPLICATE_1       "Duplicated {1} task."
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified task from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 30ff8b1c4..1412ce5b9 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "Kopiis {1} taskon."
 #define STRING_CMD_DUPLICATE_N       "Kopiis {1} taskojn."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Markas la specifatan taskon kiel ekita"
 #define STRING_CMD_START_NO          "Ne ekis taskon."
 #define STRING_CMD_START_ALREADY     "Tasko {1} '{2}' jam ekita."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 225993a90..15e3f638d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -403,6 +403,10 @@
 #define STRING_CMD_DUPLICATE_1       "Duplicada {1} tarea."
 #define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tareas."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Marca la tarea especificada como comenzada"
 #define STRING_CMD_START_NO          "Tarea no comenzada."
 #define STRING_CMD_START_ALREADY     "Tarea {1} '{2}' ya comenzada."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 98a25db4a..8ca0a4f0e 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "Duplicated {1} task."
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Tâche non démarrée."
 #define STRING_CMD_START_ALREADY     "Tâche {1} '{2}' déjà démarré."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d804d44e2..f5a6e48ac 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -397,6 +397,10 @@
 #define STRING_CMD_DUPLICATE_1       "Task {1} duplicato."
 #define STRING_CMD_DUPLICATE_N       "Task {1} duplicati."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Contrassegna i task specificati come avviati"
 #define STRING_CMD_START_NO          "Task non avviato."
 #define STRING_CMD_START_ALREADY     "Task {1} '{2}' già avviati."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ac6b31f4c..a6d8b0c7b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "重複した {1} タスク。"
 #define STRING_CMD_DUPLICATE_N       "重複した {1} タスク。"
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "タスク は開始していません。"
 #define STRING_CMD_START_ALREADY     "タスク {1} '{2}' は既に開始しています。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index dec6b975e..529599321 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "Skopiowano {1} zadanie."
 #define STRING_CMD_DUPLICATE_N       "Skopiowano {1} zadań."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Oznacza zadanie jako uruchomione"
 #define STRING_CMD_START_NO          "Zadanie nie uruchomione"
 #define STRING_CMD_START_ALREADY     "Zadanie {1} '{2}' jest już uruchomione"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9d2ef8b74..f310a6d2d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -398,6 +398,10 @@
 #define STRING_CMD_DUPLICATE_1       "Duplicada {1} tarefa."
 #define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tarefas."
 
+#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_1           "Purged {1} task."
+#define STRING_CMD_PURGE_N           "Purged {1} tasks."
+
 #define STRING_CMD_START_USAGE       "Assinala a tarefa especificada como iniciada"
 #define STRING_CMD_START_NO          "Tarefa não iniciada."
 #define STRING_CMD_START_ALREADY     "Tarefa {1} '{2}' já iniciada."

From 894eb3ab7990632989b4b37485bcf96de015d4c4 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 10:02:29 +0100
Subject: [PATCH 021/879] CmdPurge: Prompt before purging a task

---
 src/commands/CmdPurge.cpp | 27 ++++++++++++++++++---------
 src/l10n/eng-USA.h        |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 12cf14c3a..1d9143e43 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -30,6 +30,7 @@
 #include <Filter.h>
 #include <i18n.h>
 #include <main.h>
+#include <text.h>
 
 extern Context context;
 
@@ -73,18 +74,26 @@ int CmdPurge::execute (std::string&)
 
     if (task.getStatus () == Task::deleted)
     {
-      context.tdb2.purge (task);
-      count++;
+      std::string question;
+      question = format (STRING_CMD_PURGE_CONFIRM,
+                         task.identifier (true),
+                         task.get ("description"));
 
-      // Remove dependencies on the task being purged
-      for (auto& blockedConst: context.tdb2.all_tasks ())
+      if (permission (question, filtered.size ()))
       {
-        Task& blocked = const_cast<Task&>(blockedConst);
-        if (blocked.has ("depends") &&
-            blocked.get ("depends").find (uuid) != std::string::npos)
+        context.tdb2.purge (task);
+        count++;
+
+        // Remove dependencies on the task being purged
+        for (auto& blockedConst: context.tdb2.all_tasks ())
         {
-            blocked.removeDependency (uuid);
-            context.tdb2.modify (blocked);
+          Task& blocked = const_cast<Task&>(blockedConst);
+          if (blocked.has ("depends") &&
+              blocked.get ("depends").find (uuid) != std::string::npos)
+          {
+              blocked.removeDependency (uuid);
+              context.tdb2.modify (blocked);
+          }
         }
       }
     }
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 857628cf4..3bded4f9e 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -399,6 +399,7 @@
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
 
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Task not started."

From c04bdc48aae54f482bf3bc18b840585b0b45e970 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 15:16:05 +0100
Subject: [PATCH 022/879] CmdPurge: Move dependency handling into separate
 method

---
 src/commands/CmdPurge.cpp | 32 ++++++++++++++++++++------------
 src/commands/CmdPurge.h   |  2 ++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 1d9143e43..ef9816e3e 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -51,6 +51,25 @@ CmdPurge::CmdPurge ()
   _category              = Command::Category::operation;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Makes sure that any task having the dependency on the task being purged
+// has that dependency removed, to preserve referential integrity.
+void CmdPurge::handleDeps (Task& task)
+{
+   std::string uuid = task.get ("uuid");
+
+   for (auto& blockedConst: context.tdb2.all_tasks ())
+   {
+     Task& blocked = const_cast<Task&>(blockedConst);
+     if (blocked.has ("depends") &&
+         blocked.get ("depends").find (uuid) != std::string::npos)
+     {
+         blocked.removeDependency (uuid);
+         context.tdb2.modify (blocked);
+     }
+   }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 int CmdPurge::execute (std::string&)
 {
@@ -82,19 +101,8 @@ int CmdPurge::execute (std::string&)
       if (permission (question, filtered.size ()))
       {
         context.tdb2.purge (task);
+        handleDeps(task);
         count++;
-
-        // Remove dependencies on the task being purged
-        for (auto& blockedConst: context.tdb2.all_tasks ())
-        {
-          Task& blocked = const_cast<Task&>(blockedConst);
-          if (blocked.has ("depends") &&
-              blocked.get ("depends").find (uuid) != std::string::npos)
-          {
-              blocked.removeDependency (uuid);
-              context.tdb2.modify (blocked);
-          }
-        }
       }
     }
   }
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index 8e9c76446..76644f3b3 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -32,6 +32,8 @@
 
 class CmdPurge : public Command
 {
+private:
+  void handleDeps (Task& task);
 public:
   CmdPurge ();
   int execute (std::string&);

From 3e65c3af5e84f59bd10df75c9fe9be25c4c95cd9 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 15:45:15 +0100
Subject: [PATCH 023/879] CmdPurge: Simplify implementation

---
 src/commands/CmdPurge.cpp | 23 ++++++++++++++++-------
 src/commands/CmdPurge.h   |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index ef9816e3e..040598c19 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -51,6 +51,16 @@ CmdPurge::CmdPurge ()
   _category              = Command::Category::operation;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Purges the task, while taking care of:
+// - dependencies on this task
+void CmdPurge::purgeTask (Task& task, int& count)
+{
+  context.tdb2.purge (task);
+  handleDeps (task);
+  count++;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Makes sure that any task having the dependency on the task being purged
 // has that dependency removed, to preserve referential integrity.
@@ -89,8 +99,11 @@ int CmdPurge::execute (std::string&)
 
   for (auto& task : filtered)
   {
-    std::string uuid = task.get ("uuid");
-
+    // Allow purging of deleted tasks only. Hence no need to deal with:
+    // - unblocked tasks notifications (deleted tasks are not blocking)
+    // - project changes (deleted tasks not included in progress)
+    // It also has the nice property of being explicit - users need to
+    // mark tasks as deleted before purging.
     if (task.getStatus () == Task::deleted)
     {
       std::string question;
@@ -99,11 +112,7 @@ int CmdPurge::execute (std::string&)
                          task.get ("description"));
 
       if (permission (question, filtered.size ()))
-      {
-        context.tdb2.purge (task);
-        handleDeps(task);
-        count++;
-      }
+        purgeTask (task, count);
     }
   }
 
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index 76644f3b3..7081e9776 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -33,6 +33,7 @@
 class CmdPurge : public Command
 {
 private:
+  void purgeTask (Task& task, int& count);
   void handleDeps (Task& task);
 public:
   CmdPurge ();

From 181f098958bafa22be5d82ea1ad47a12fc15aa4a Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 15:46:17 +0100
Subject: [PATCH 024/879] TDB2: Fix wrong comment

---
 src/TDB2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 5d501eb9b..0f3e696c3 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1408,7 +1408,7 @@ const std::vector <Task> TDB2::children (Task& task)
       if (i.getStatus () != Task::completed &&
           i.getStatus () != Task::deleted)
       {
-        // If task has the same parent, it is a sibling.
+        // If task has the given task as a parent, it is a child task.
         if (i.get ("parent") == parent)
           results.push_back (i);
       }

From 2467200a3b3eb51a715f8a6a55a8e878174b774f Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 17:25:03 +0100
Subject: [PATCH 025/879] CmdPurge: Handle child tasks of recurrence templates

---
 src/commands/CmdPurge.cpp | 53 +++++++++++++++++++++++++++++++++++++++
 src/commands/CmdPurge.h   |  1 +
 src/l10n/eng-USA.h        |  3 +++
 3 files changed, 57 insertions(+)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 040598c19..ab6d3b4b7 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -31,6 +31,7 @@
 #include <i18n.h>
 #include <main.h>
 #include <text.h>
+#include <util.h>
 
 extern Context context;
 
@@ -54,10 +55,12 @@ CmdPurge::CmdPurge ()
 ////////////////////////////////////////////////////////////////////////////////
 // Purges the task, while taking care of:
 // - dependencies on this task
+// - child tasks
 void CmdPurge::purgeTask (Task& task, int& count)
 {
   context.tdb2.purge (task);
   handleDeps (task);
+  handleChildren (task, count);
   count++;
 }
 
@@ -80,6 +83,56 @@ void CmdPurge::handleDeps (Task& task)
    }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Makes sure that with any recurrence parent are all the child tasks removed
+// as well. If user chooses not to, the whole command is aborted.
+void CmdPurge::handleChildren (Task& task, int& count)
+{
+  // If this is not a recurrence parent, we have no job here
+  if (!task.has ("mask"))
+    return;
+
+  std::string uuid = task.get ("uuid");
+  std::vector<Task> children;
+
+  // Find all child tasks
+  for (auto& childConst: context.tdb2.all_tasks ())
+  {
+    Task& child = const_cast<Task&> (childConst);
+
+    if (child.get ("parent") == uuid)
+    {
+      if (child.getStatus () != Task::deleted)
+        // In case any child task is not deleted, bail out
+        throw format (STRING_CMD_PURGE_NDEL_CHILD,
+                      task.get ("description"),
+                      child.identifier (true));
+      else
+        children.push_back (child);
+    }
+  }
+
+  // If there are no children, our job is done
+  if (children.empty ())
+    return;
+
+  // Ask for confirmation to purge them, if needed
+  std::string question = format (STRING_CMD_PURGE_CONFIRM_R,
+                                 task.get ("description"),
+                                 children.size ());
+
+  if (context.config.getBoolean ("recurrence.confirmation") ||
+      (context.config.get ("recurrence.confirmation") == "prompt"
+       && confirm (question)))
+  {
+    for (auto& child: children)
+      purgeTask (child, count);
+  }
+  else
+    throw std::string (STRING_CMD_PURGE_ABRT);
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 int CmdPurge::execute (std::string&)
 {
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index 7081e9776..3bb0f2c82 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -34,6 +34,7 @@ class CmdPurge : public Command
 {
 private:
   void purgeTask (Task& task, int& count);
+  void handleChildren (Task& task, int& count);
   void handleDeps (Task& task);
 public:
   CmdPurge ();
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3bded4f9e..84de21d6b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -397,9 +397,12 @@
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
 #define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Task not started."

From 46a36a10a50095459f05c0acff7a3769e19c9835 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 17:33:42 +0100
Subject: [PATCH 026/879] tests: The purge command now requires confirmation

---
 test/purge.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/purge.t b/test/purge.t
index 7b8363683..cce3bf733 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -47,7 +47,7 @@ class TestDelete(TestCase):
         code, out, err = self.t("1 delete", input="y\n")
         self.assertIn("Deleted 1 task.", out)
 
-        code, out, err = self.t(uuid + " purge")
+        code, out, err = self.t(uuid + " purge", input="y\n")
         self.assertIn("Purged 1 task.", out)
 
         code, out, err = self.t("uuids")
@@ -62,7 +62,7 @@ class TestDelete(TestCase):
         code, out, err = self.t("1 delete", input="y\n")
         self.assertIn("Deleted 1 task.", out)
 
-        code, out, err = self.t(uuid + " purge")
+        code, out, err = self.t(uuid + " purge", input="y\n")
         self.assertIn("Purged 1 task.", out)
 
         code, out, err = self.t("uuids")

From cae0f15245067ec4f9e46448ef5ee7d0f6e78faf Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 18:26:16 +0100
Subject: [PATCH 027/879] tests: Expand test cases for purge command

---
 test/purge.t | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/test/purge.t b/test/purge.t
index cce3bf733..afa2ddd3c 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -54,7 +54,7 @@ class TestDelete(TestCase):
         self.assertNotIn(uuid, out)
 
     def test_purge_remove_deps(self):
-        """Verify that purge command removes dependency references"""
+        """Purge command removes broken dependency references"""
         self.t("add one")
         self.t("add two dep:1")
         uuid = self.t("_get 1.uuid")[1].strip()
@@ -71,6 +71,86 @@ class TestDelete(TestCase):
         dependencies = self.t("_get 1.depends")[1].strip()
         self.assertNotIn(uuid, dependencies)
 
+    def test_purge_children(self):
+        """Purge command indirectly purges child tasks"""
+        self.t("add one recur:daily due:yesterday")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        # A dummy call to report, so that recurrence tasks get generated
+        self.t("list")
+
+        code, out, err = self.t("1 delete", input="y\ny\n")
+        self.assertIn("Deleted 4 tasks.", out)
+
+        code, out, err = self.t(uuid + " purge", input="y\ny\n")
+        self.assertIn("Purged 4 tasks.", out)
+
+        code, out, err = self.t("uuids")
+        self.assertEqual('\n', out)
+
+    def test_purge_children_fail_pending(self):
+        """Purge aborts if task has pending children"""
+        self.t("add one recur:daily due:yesterday")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        # A dummy call to report, so that recurrence tasks get generated
+        self.t("list")
+
+        code, out, err = self.t("1 delete", input="y\nn\n")
+        self.assertIn("Deleted 1 task.", out)
+
+        code, out, err = self.t.runError(uuid + " purge", input="y\n")
+        self.assertIn("child task 1 must be deleted before", err)
+
+        # Check that nothing was purged
+        code, out, err = self.t("count")
+        self.assertEqual('4\n', out)
+
+    def test_purge_children_fail_confirm(self):
+        """Purge aborts if user does not agree with it affecting child tasks"""
+        self.t("add one recur:daily due:yesterday")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        # A dummy call to report, so that recurrence tasks get generated
+        self.t("list")
+
+        code, out, err = self.t("1 delete", input="y\ny\n")
+        self.assertIn("Deleted 4 tasks.", out)
+
+        # Do not agree with purging of the child tasks
+        code, out, err = self.t.runError(uuid + " purge", input="y\nn\n")
+        self.assertIn("Purge operation aborted.", err)
+
+        # Check that nothing was purged
+        code, out, err = self.t("count")
+        self.assertEqual('4\n', out)
+
+    def test_purge_children(self):
+        """Purge command removes dependencies on indirectly purged tasks"""
+        self.t("add one recur:daily due:yesterday")
+        uuid = self.t("_get 1.uuid")[1].strip()
+
+        # A dummy call to report, so that recurrence tasks get generated
+        self.t("list")
+        self.t("add two dep:4")
+
+        # Check that the dependency is present
+        dependencies = self.t("_get 5.depends")[1].strip()
+        self.assertNotEqual("", dependencies)
+
+        code, out, err = self.t("1 delete", input="y\ny\n")
+        self.assertIn("Deleted 4 tasks.", out)
+
+        code, out, err = self.t(uuid + " purge", input="y\ny\n")
+        self.assertIn("Purged 4 tasks.", out)
+
+        # Make sure we are dealing with the intended task
+        description = self.t("_get 1.description")[1].strip()
+        self.assertEqual("two", description)
+
+        # Check that the dependency was removed
+        dependencies = self.t("_get 1.depends")[1].strip()
+        self.assertEqual("", dependencies)
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner

From 75b220dbc418ea1c795a68f2bcef37cd68692fc1 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 19:21:07 +0100
Subject: [PATCH 028/879] docs: Document new purge command

---
 doc/man/task.1.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 684143e74..d6f8d2f51 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -376,6 +376,14 @@ Modifies the existing task with provided information.
 .B task <filter> prepend <mods>
 Prepends description text to an existing task.
 
+.TP
+.B task <filter> purge
+Permanently removes the specified tasks from the data files. Only
+tasks that are alredy deleted can be purged. This command has a
+local-only effect and changes introduced by it are not synced.
+
+Warning: causes permanent, non-revertible loss of data.
+
 .TP
 .B task <filter> start <mods>
 Marks the specified tasks as started.

From 3cb974de49243e5a391478f246cf06cb9c0c113e Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 19:24:44 +0100
Subject: [PATCH 029/879] Docs: Update ChangeLog and NEWS

---
 ChangeLog | 6 ++++--
 NEWS      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 672d258af..ac1dd4669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2.5.2 () -
 
-- TD-64 sync conflict deleted all annotations of the task
-        (thanks to Markus Beppler, Konstantin Vorobyev).
+- TD-64   sync conflict deleted all annotations of the task
+          (thanks to Markus Beppler, Konstantin Vorobyev).
+- TW-1785 Purge command to remove deleted tasks
+          (thanks to Paul Beckingham)
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
diff --git a/NEWS b/NEWS
index 01a955d27..ec110212d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ New Features in Taskwarrior 2.5.2
 
 New Commands in Taskwarrior 2.5.2
 
-  -
+  - The 'purge' command was introduced.
 
 New Configuration Options in Taskwarrior 2.5.2
 

From dbec3ad33ff08cc6e13cdf75a91e59a2d004c1a1 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 19:28:09 +0100
Subject: [PATCH 030/879] l10n: Propagate the purge-related strings into
 language files

---
 src/l10n/deu-DEU.h | 4 ++++
 src/l10n/epo-RUS.h | 4 ++++
 src/l10n/esp-ESP.h | 4 ++++
 src/l10n/fra-FRA.h | 4 ++++
 src/l10n/ita-ITA.h | 4 ++++
 src/l10n/jpn-JPN.h | 4 ++++
 src/l10n/pol-POL.h | 4 ++++
 src/l10n/por-PRT.h | 4 ++++
 8 files changed, 32 insertions(+)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e3b4a003c..3135d37ac 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "{1} Aufgaben verdoppelt."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Kennzeichnet die gewählte Aufgabe als begonnen."
 #define STRING_CMD_START_NO          "Aufgabe nicht begonnen."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1412ce5b9..cb07b51e7 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "Kopiis {1} taskojn."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Markas la specifatan taskon kiel ekita"
 #define STRING_CMD_START_NO          "Ne ekis taskon."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 15e3f638d..4ca54b673 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -404,8 +404,12 @@
 #define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tareas."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Marca la tarea especificada como comenzada"
 #define STRING_CMD_START_NO          "Tarea no comenzada."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8ca0a4f0e..4046ed457 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "Tâche non démarrée."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f5a6e48ac..95e0da6b2 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -398,8 +398,12 @@
 #define STRING_CMD_DUPLICATE_N       "Task {1} duplicati."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Contrassegna i task specificati come avviati"
 #define STRING_CMD_START_NO          "Task non avviato."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a6d8b0c7b..e82ba9bc7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "重複した {1} タスク。"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Marks specified task as started"
 #define STRING_CMD_START_NO          "タスク は開始していません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 529599321..1264c3f6f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "Skopiowano {1} zadań."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Oznacza zadanie jako uruchomione"
 #define STRING_CMD_START_NO          "Zadanie nie uruchomione"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f310a6d2d..0de68ed5c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -399,8 +399,12 @@
 #define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tarefas."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
+#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
 #define STRING_CMD_PURGE_N           "Purged {1} tasks."
+#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
+#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
+#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
 #define STRING_CMD_START_USAGE       "Assinala a tarefa especificada como iniciada"
 #define STRING_CMD_START_NO          "Tarefa não iniciada."

From 726c31f8deeadf2f50e21de5ce18052ba1e181a4 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 02:49:01 +0100
Subject: [PATCH 031/879] dependencyIsCircular: Do not visit one node multiple
 times

---
 src/dependency.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index 608f0b5bc..124610d6f 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -75,7 +75,11 @@ bool dependencyIsCircular (const Task& task)
     auto task_uuid = task.get ("uuid");
 
     std::stack <Task> s;
+    std::unordered_set <std::string> visited;
+
     s.push (task);
+    visited.insert (task_uuid);
+
     while (! s.empty ())
     {
       Task& current = s.top ();
@@ -83,21 +87,25 @@ bool dependencyIsCircular (const Task& task)
       current.getDependencies (deps_current);
 
       // This is a basic depth first search that always terminates given the
-      // assumption that any cycles in the dependency graph must have been
-      // introduced by the task that is being checked.
-      // Since any previous cycles would have been prevented by this very
-      // function, this is a reasonable assumption.
+      // fact that we do not visit any task twice
       for (unsigned int i = 0; i < deps_current.size (); i++)
       {
         if (context.tdb2.get (deps_current[i], current))
         {
-          if (task_uuid == current.get ("uuid"))
+          auto current_uuid = current.get ("uuid");
+
+          if (task_uuid == current_uuid)
           {
             // Cycle found, initial task reached for the second time!
             return true;
           }
 
-          s.push (current);
+          if (visited.find (current_uuid) == visited.end ())
+          {
+            // Push the task to the stack, if it has not been processed yet
+            s.push (current);
+            visited.insert (current_uuid);
+          }
         }
       }
 

From 75403c0ec1dff020a36f39f38ff303b5d2db44d2 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 02:50:48 +0100
Subject: [PATCH 032/879] TW-1772: Implementation of circular dependency
 detection is inefficient

- Thanks to Michael Meier.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 1e2e01e2c..2f2743f28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -288,3 +288,4 @@ suggestions:
   pawprint
   Reg
   Yaroslav Molochko
+  Michael Meier
diff --git a/ChangeLog b/ChangeLog
index ac1dd4669..547d963d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
           (thanks to Markus Beppler, Konstantin Vorobyev).
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham)
+- TW-1772 Implementation of circular dependency detection is
+          inefficient (thanks to Michael Meier).
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0

From 8a50d8b6a974cfbc719919502c7a82104820833b Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 23:42:23 +0100
Subject: [PATCH 033/879] validate: Pending tasks cannot have end attribute set

---
 src/Task.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Task.cpp b/src/Task.cpp
index 23e3a44a5..6ac7c952c 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1491,6 +1491,10 @@ void Task::validate (bool applyDefault /* = true */)
       (! has ("end") || get ("end") == ""))
     setAsNow ("end");
 
+  // Pending tasks cannot have an end date, remove if present
+  if ((status == Task::pending) && (get ("end") != ""))
+    remove ("end");
+
   // Provide an entry date unless user already specified one.
   if (! has ("modified") || get ("modified") == "")
     setAsNow ("modified");

From c42a73d57262ce7f4292229915a143292ab97871 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 23:43:27 +0100
Subject: [PATCH 034/879] tests: Add test for TW-1788

---
 test/start.t | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/start.t b/test/start.t
index a1d143864..63befe283 100755
--- a/test/start.t
+++ b/test/start.t
@@ -95,6 +95,19 @@ class TestStart(TestCase):
         code, out, err = self.t("long")
         self.assertIn("Nu stannar vi", out)
 
+    def test_start_remove_end(self):
+        """Verify that starting a task removes end timestamp"""
+        self.t("add one")
+        uuid = self.t('_get 1.uuid')[1].strip()
+
+        self.t("1 done")
+        task = self.t.export()[0]
+        self.assertIn("end", task)
+
+        self.t(uuid + " start")
+        task = self.t.export()[0]
+        self.assertNotIn("end", task)
+
 
 class TestActiveTaskHandling(TestCase):
     def setUp(self):

From 1980df89c06c9c36d5c90822c367f5d13e05818b Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 23:43:49 +0100
Subject: [PATCH 035/879] TW-1788: Closing a reopened task does not update the
 end time

- Thanks to Ralph Bean.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 547d963d2..a55d9cd98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
+- TW-1788 Closing a reopened task does not update the end time (thanks
+          to Ralph Bean).
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0

From 6d6bdebb57f16f84a7a3df59b8761f84fb195bfd Mon Sep 17 00:00:00 2001
From: Tom Sydney Kerckhove <syd.kerckhove@gmail.com>
Date: Sat, 26 Mar 2016 15:30:02 +0100
Subject: [PATCH 036/879] Docs: fixed inconsistency in the spelling of CMake

---
 AUTHORS | 1 +
 INSTALL | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 2f2743f28..3cb2e526a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -127,6 +127,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Misty De Meo
   Kent R. Spillner
   Konstantin Vorobyev
+  Tom Sydney Kerckhove
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/INSTALL b/INSTALL
index 034caee9a..1c6a5e862 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,7 @@ Dependencies
 ------------
 
 You will need the CMake build system installed in order to build Taskwarrior
-from source. More information on cmake can be obtained at http://cmake.org
+from source. More information on CMake can be obtained at http://cmake.org
 
 You will also need:
   - make

From 7f91e014a0efb26f47c779b0950f213da6f1a83a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 26 Mar 2016 21:21:51 -0400
Subject: [PATCH 037/879] Tests: Typo in test

---
 test/version.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/version.t b/test/version.t
index 5880ee5c2..76e8a2f58 100755
--- a/test/version.t
+++ b/test/version.t
@@ -110,7 +110,7 @@ class TestVersion(TestCase):
         self.assertIn(expected, out)
 
     def test_version_option(self):
-        """Verify that  'task --version' returnes something valid"""
+        """Verify that  'task --version' returns something valid"""
         code, out, err = self.t("--version")
         self.assertRegexpMatches(out, r'^\d\.\d+\.\d+(\.\w+)?$')
 

From ea8a499769ae1e2982f6403a3076b967edead04d Mon Sep 17 00:00:00 2001
From: Lynoure Braakman <lynoure@lynoure.net>
Date: Sun, 27 Mar 2016 22:34:57 +0200
Subject: [PATCH 038/879] juhannus as an alternative name for midsommarafton

---
 AUTHORS           | 1 +
 ChangeLog         | 6 ++++--
 doc/man/task.1.in | 2 ++
 src/Dates.cpp     | 5 +++--
 test/dates.t.cpp  | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3cb2e526a..681ec89e5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -128,6 +128,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Kent R. Spillner
   Konstantin Vorobyev
   Tom Sydney Kerckhove
+  Lynoure Braakman
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index a55d9cd98..114e8b526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,10 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
-- TW-1788 Closing a reopened task does not update the end time (thanks
-          to Ralph Bean).
+- TW-1788 Closing a reopened task does not update the end time
+          (thanks to Ralph Bean).
+- Added 'juhannus' as a synonym for 'midsommarafton'
+          (thanks to Lynoure Braakman).
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index d6f8d2f51..3a9670b91 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1048,6 +1048,8 @@ task ... due:pentecost
 task ... due:midsommar
 .br
 task ... due:midsommarafton
+.br
+task ... due:juhannus
 .RE
 
 .SS FREQUENCIES
diff --git a/src/Dates.cpp b/src/Dates.cpp
index a0b5035c2..a721b6a49 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -93,7 +93,7 @@ static void midsommar (struct tm* t)
 static void midsommarafton (struct tm* t)
 {
   t->tm_mon = 5;                          // June.
-  t->tm_mday = 19;                        // Saturday after 20th.
+  t->tm_mday = 19;                        // Friday after 19th.
   t->tm_hour = t->tm_min = t->tm_sec = 0; // Midnight.
   t->tm_isdst = -1;                       // Probably DST, but check.
 
@@ -491,7 +491,8 @@ bool namedDates (const std::string& name, Variant& value)
     value = Variant (mktime (t), Variant::type_date);
   }
 
-  else if (closeEnough ("midsommarafton", name, minimum))
+  else if (closeEnough ("midsommarafton", name, minimum) ||
+           closeEnough ("juhannus", name, minimum))
   {
     Variant valueNow = Variant (mktime (t), Variant::type_date);
     midsommarafton (t);
diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 0b1b9edc3..1075a0178 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -146,6 +146,7 @@ int main (int, char**)
   Variant var_false;      testInit (t, "false", var_false);
   Variant midsommar;      testInit (t, "midsommar", midsommar);
   Variant midsommarafton; testInit (t, "midsommarafton", midsommarafton);
+  Variant juhannus;       testInit (t, "juhannus", juhannus);
   Variant first;          testInit (t, "1st", first);
   Variant second;         testInit (t, "2nd", second);
   Variant third;          testInit (t, "3rd", third);
@@ -173,6 +174,7 @@ int main (int, char**)
   t.ok (easter < eastermonday,      "easter < eastermonday");
   t.ok (easter < midsommarafton,    "easter < midsommarafton");
   t.ok (midsommarafton < midsommar, "midsommarafton < midsommar");
+  t.ok (juhannus == midsommarafton, "juhannus == midsommarafton");
 
   return 0;
 }

From c44900bf8fe325005324888437d4c53a9095365a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 29 Mar 2016 07:52:38 -0400
Subject: [PATCH 039/879] Task: Deprecated the 'DUETODAY' virtual tag, which is
 a synonym for the 'TODAY'       virtual tag.

- Thanks to Tomas Babej
---
 ChangeLog         | 2 ++
 NEWS              | 3 ++-
 doc/man/task.1.in | 1 -
 src/Task.cpp      | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 114e8b526..2d391d74c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
           (thanks to Ralph Bean).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
+- Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
+  virtual tag.
 - Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
diff --git a/NEWS b/NEWS
index ec110212d..622098373 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,8 @@ New Configuration Options in Taskwarrior 2.5.2
 
 Newly Deprecated Features in Taskwarrior 2.5.2
 
-  -
+  - The 'DUETODAY' virtual tag is a synonym for the 'TODAY' virtual tag, and is
+    not needed.
 
 Removed Features in 2.5.2
 
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 3a9670b91..ac6707c6e 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -682,7 +682,6 @@ are:
     COMPLETED    Matches if the task has completed status
     DELETED      Matches if the task has deleted status
     DUE          Matches if the task is due
-    DUETODAY     Matches if the task is due today
     LATEST       Matches if the task is the newest added task
     MONTH        Matches if the task is due this month
     ORPHAN       Matches if the task has any orphaned UDA values
diff --git a/src/Task.cpp b/src/Task.cpp
index 6ac7c952c..884e7f23e 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1212,7 +1212,7 @@ bool Task::hasTag (const std::string& tag) const
 #ifdef PRODUCT_TASKWARRIOR
     if (tag == "READY")     return is_ready ();
     if (tag == "DUE")       return is_due ();
-    if (tag == "DUETODAY")  return is_duetoday ();
+    if (tag == "DUETODAY")  return is_duetoday ();          // 2016-03-29: Deprecated in 2.6.0
     if (tag == "TODAY")     return is_duetoday ();
     if (tag == "YESTERDAY") return is_dueyesterday ();
     if (tag == "TOMORROW")  return is_duetomorrow ();

From 81ac8e2be9b5caed31950f99636080c549e57609 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 29 Mar 2016 22:56:07 -0400
Subject: [PATCH 040/879] Tests: Updated test harness

---
 test/test.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/test.cpp b/test/test.cpp
index de1e9f1d2..60ddd3cf5 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -416,7 +416,9 @@ void UnitTest::diag (const std::string& text)
 {
   auto start = text.find_first_not_of (" \t\n\r\f");
   auto end   = text.find_last_not_of  (" \t\n\r\f");
-  std::cout << "# " << text.substr (start, end - start + 1) << "\n";
+  if (start != std::string::npos &&
+      end   != std::string::npos)
+    std::cout << "# " << text.substr (start, end - start + 1) << "\n";
 }
 
 ///////////////////////////////////////////////////////////////////////////////

From 1ebc8034b4bccdfdf016a9937667d7e7993e18e1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Apr 2016 15:08:35 -0400
Subject: [PATCH 041/879] TW-1791: taskrc(5) manpage: spurious "pri." in
 rule.precedence.color

- Thanks to Sebastien Badia.
---
 AUTHORS             | 2 +-
 ChangeLog           | 2 ++
 doc/man/taskrc.5.in | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 681ec89e5..24b3f475a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -129,6 +129,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Konstantin Vorobyev
   Tom Sydney Kerckhove
   Lynoure Braakman
+  Sebastien Badia
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -276,7 +277,6 @@ suggestions:
   James Cline
   Ryan
   Simon W. Jackson
-  Sebastien Badia
   Michale Meier
   Svetoslav Trochev
   Marc Cornellà
diff --git a/ChangeLog b/ChangeLog
index 2d391d74c..ad1a9674c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
           inefficient (thanks to Michael Meier).
 - TW-1788 Closing a reopened task does not update the end time
           (thanks to Ralph Bean).
+- TW-1791 taskrc(5) manpage: spurious "pri." in rule.precedence.color
+          (thanks to Sebastien Badia).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 2de7799bf..83294dd83 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1056,7 +1056,7 @@ Colors the output of the sync command.
 .TP
 .B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,
 .B                       scheduled,keyword.,project.,tag.,uda.,recurring,
-.B                       pri.,tagged,completed,deleted
+.B                       tagged,completed,deleted
 .RS
 This setting specifies the precedence of the color rules, from highest to
 lowest. Note that the prefix 'color.' is omitted (for brevity), and that any

From 084383a644ad2c2689fe0f1961d060c40a36cfa0 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 3 Apr 2016 11:05:32 +0200
Subject: [PATCH 042/879] feedback: Use task identifiers instead of IDs

During construction of a feedback string for a dependency change,
a list of IDs of the dependencies was used. However, if the tasks
being referred to are already deleted / completed, their respective
IDs are all 0s.

Use shortened UUIDs in such case.
---
 src/Task.cpp     | 16 ++++++++++++++++
 src/Task.h       |  1 +
 src/feedback.cpp | 50 +++++++++++++++++++++++++++---------------------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 884e7f23e..d53f8a540 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1177,6 +1177,22 @@ void Task::getDependencies (std::vector <std::string>& all) const
   all.clear ();
   split (all, get ("depends"), ',');
 }
+
+////////////////////////////////////////////////////////////////////////////////
+void Task::getDependencies (std::vector <Task>& all) const
+{
+  std::vector <std::string> deps;
+  split (deps, get ("depends"), ',');
+
+  all.clear ();
+
+  for (auto& dep : deps)
+  {
+    Task task;
+    context.tdb2.get (dep, task);
+    all.push_back (task);
+  }
+}
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Task.h b/src/Task.h
index 47245b588..474049179 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -142,6 +142,7 @@ public:
   void removeDependency (const std::string&);
   void getDependencies (std::vector <int>&) const;
   void getDependencies (std::vector <std::string>&) const;
+  void getDependencies (std::vector <Task>&) const;
 
   void getUDAOrphans (std::vector <std::string>&) const;
 
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 213eb3b09..49f5a4556 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -44,6 +44,20 @@ extern Context context;
 
 static void countTasks (const std::vector <Task>&, const std::string&, int&, int&);
 
+////////////////////////////////////////////////////////////////////////////////
+// Converts a vector of tasks to a human-readable string that represents the tasks.
+std::string taskIdentifiers (const std::vector <Task>& tasks)
+{
+  std::vector <std::string> identifiers;
+  for (auto task: tasks)
+    identifiers.push_back (task.identifier (true));
+
+  std::string result;
+  join (result, ", ", identifiers);
+
+  return result;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 std::string taskDifferences (const Task& before, const Task& after)
 {
@@ -72,13 +86,11 @@ std::string taskDifferences (const Task& before, const Task& after)
   {
     if (name == "depends")
     {
-      std::vector <int> deps_after;
+      std::vector <Task> deps_after;
       after.getDependencies (deps_after);
-      std::string to;
-      join (to, ", ", deps_after);
 
       out << "  - "
-          << format (STRING_FEEDBACK_DEP_SET, to)
+          << format (STRING_FEEDBACK_DEP_SET, taskIdentifiers (deps_after))
           << "\n";
     }
     else
@@ -100,15 +112,13 @@ std::string taskDifferences (const Task& before, const Task& after)
     {
       if (name == "depends")
       {
-        std::vector <int> deps_before;
+        std::vector <Task> deps_before;
         before.getDependencies (deps_before);
-        std::string from;
-        join (from, ", ", deps_before);
+        std::string from = taskIdentifiers (deps_before);
 
-        std::vector <int> deps_after;
+        std::vector <Task> deps_after;
         after.getDependencies (deps_after);
-        std::string to;
-        join (to, ", ", deps_after);
+        std::string to = taskIdentifiers (deps_after);
 
         out << "  - "
             << format (STRING_FEEDBACK_DEP_MOD, from, to)
@@ -161,10 +171,9 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-        std::vector <int> deps_before;
+        std::vector <Task> deps_before;
         before.getDependencies (deps_before);
-        std::string from;
-        join (from, ", ", deps_before);
+        std::string from = taskIdentifiers (deps_before);
 
         out << format (STRING_FEEDBACK_DEP_DEL, from)
             << "\n";
@@ -191,10 +200,9 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-      std::vector <int> deps_after;
+      std::vector <Task> deps_after;
       after.getDependencies (deps_after);
-      std::string to;
-      join (to, ", ", deps_after);
+      std::string to = taskIdentifiers (deps_after);
 
       out << format (STRING_FEEDBACK_DEP_WAS_SET, to)
           << "\n";
@@ -225,15 +233,13 @@ std::string taskInfoDifferences (
     {
       if (name == "depends")
       {
-        std::vector <int> deps_before;
+        std::vector <Task> deps_before;
         before.getDependencies (deps_before);
-        std::string from;
-        join (from, ", ", deps_before);
+        std::string from = taskIdentifiers (deps_before);
 
-        std::vector <int> deps_after;
+        std::vector <Task> deps_after;
         after.getDependencies (deps_after);
-        std::string to;
-        join (to, ", ", deps_after);
+        std::string to = taskIdentifiers (deps_after);
 
         out << format (STRING_FEEDBACK_DEP_WAS_MOD, from, to)
             << "\n";

From 8dfd71ccc6064d8c33292845f535dabfb4b17643 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 3 Apr 2016 19:28:21 +0200
Subject: [PATCH 043/879] TW-1792: The info command uses '0' to reference
 dependencies on non-pending tasks

- Thanks to Paul Beckingham for providing screenshots capturing the bug.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ad1a9674c..9ccb71b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
           (thanks to Ralph Bean).
 - TW-1791 taskrc(5) manpage: spurious "pri." in rule.precedence.color
           (thanks to Sebastien Badia).
+- TW-1792 The info command uses '0' to reference dependencies on non-
+          pending tasks.
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 300e7e125ea97dba41961f22d55843f5561deadd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 9 Apr 2016 16:18:07 -0400
Subject: [PATCH 044/879] cmake: Use the CXXSniffer

---
 CMakeLists.txt         | 89 ++++++------------------------------------
 cmake/CXXSniffer.cmake | 51 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 76 deletions(-)
 create mode 100644 cmake/CXXSniffer.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8c580d8f..011c6a59b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 include (CheckFunctionExists)
 include (CheckStructHasMember)
@@ -8,6 +9,7 @@ set (HAVE_CMAKE true)
 
 project (task)
 set (PROJECT_VERSION "2.5.2")
+include (CXXSniffer)
 
 OPTION (ENABLE_SYNC "Enable 'task sync' support" ON)
 
@@ -18,82 +20,6 @@ else (ENABLE_SYNC)
   message (WARNING "ENABLE_SYNC=OFF. Not building sync support.")
 endif (ENABLE_SYNC)
 
-message ("CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
-
-include (CheckCXXCompilerFlag)
-
-# NOTE: If we are to actually use C++11 features, we should either require
-#       a compiler that supports the -std=c++11 flag or check for the
-#       features used.
-#       Relying on -std=c++0x or even -std=gnu++0x is highly volatile.
-
-CHECK_CXX_COMPILER_FLAG("-std=c++11" _HAS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" _HAS_CXX0X)
-CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
-
-if (_HAS_CXX11)
-  set (_CXX11_FLAGS "-std=c++11")
-elseif (_HAS_CXX0X)
-  message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
-  set (_CXX11_FLAGS "-std=c++0x")
-elseif (_HAS_GNU0X)
-  message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
-  set (_CXX11_FLAGS "-std=gnu++0x")
-else (_HAS_CXX11)
- message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
-endif (_HAS_CXX11)
-
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
-endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set (LINUX true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set (DARWIN true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
-  set (KFREEBSD true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-  set (FREEBSD true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-  set (OPENBSD true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-  set (NETBSD true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-  set (SOLARIS true)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
-  set (GNUHURD true)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
-  set (CYGWIN true)
-  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
-  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
-  #       workaround instead of fixing Cygwin.
-  set (_CXX11_FLAGS "-std=gnu++0x")
-else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set (UNKNOWN true)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
-
-set (CMAKE_CXX_FLAGS "-Wall -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")
-
-if (NETBSD)
-   # Since readline, etc likely to be in /usr/pkg/lib, not standard library
-   # Otherwise will remove links during install
-   set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif (NETBSD)
-
-if (FREEBSD)
-SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
-SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
-else (FREEBSD)
-SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
-SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
-endif (FREEBSD)
-SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
-SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
-SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
-
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
   set (HAVE_COMMIT true)
@@ -113,6 +39,17 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
 
+if (FREEBSD)
+SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
+SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
+else (FREEBSD)
+SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
+endif (FREEBSD)
+SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
+SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
+SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+
 if (USE_GNUTLS)
    message ("-- Looking for GnuTLS")
    find_package (GnuTLS)
diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake
new file mode 100644
index 000000000..96062263b
--- /dev/null
+++ b/cmake/CXXSniffer.cmake
@@ -0,0 +1,51 @@
+message ("-- Configuring C++11")
+message ("-- System: ${CMAKE_SYSTEM_NAME}")
+
+include (CheckCXXCompilerFlag)
+
+# NOTE: Phase out -std=gnu++0x and --std=c++0x as soon as realistically possible.
+CHECK_CXX_COMPILER_FLAG("-std=c++11"   _HAS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x"   _HAS_CXX0X)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
+
+if (_HAS_CXX11)
+  set (_CXX11_FLAGS "-std=c++11")
+elseif (_HAS_CXX0X)
+  message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
+  set (_CXX11_FLAGS "-std=c++0x")
+elseif (_HAS_GNU0X)
+  message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
+  set (_CXX11_FLAGS "-std=gnu++0x")
+else (_HAS_CXX11)
+ message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
+endif (_HAS_CXX11)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set (LINUX true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set (DARWIN true)
+  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
+  set (KFREEBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  set (FREEBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+  set (OPENBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+  set (NETBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  set (SOLARIS true)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+  set (GNUHURD true)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
+  set (CYGWIN true)
+  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
+  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
+  #       workaround instead of fixing Cygwin.
+  set (_CXX11_FLAGS "-std=gnu++0x")
+else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set (UNKNOWN true)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
+set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")

From dde7e6781d39b9a1e8d4ac12c7156c9183a30ce6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 9 Apr 2016 16:18:35 -0400
Subject: [PATCH 045/879] Tests: Wrong test count causes unexpected 'green' in
 test results

---
 test/dates.t.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 1075a0178..9a73bdba3 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -55,7 +55,7 @@ void testInit (UnitTest& t, const std::string& value, Variant& var)
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (104);
+  UnitTest t (106);
 
   Variant sunday;    testInit (t, "sunday",    sunday);
   Variant monday;    testInit (t, "monday",    monday);

From 4395818e7208426e89b44ca560a726cf877238f0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 13 Apr 2016 16:35:08 -0400
Subject: [PATCH 046/879] CMake: Added snotty comment about CMake bullshit

---
 test/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9cb997f31..411b61571 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,11 @@
 cmake_minimum_required (VERSION 2.8)
+
+# See this CMake issue before complaining about the following.
+# https://cmake.org/Bug/view.php?id=16062
 if(POLICY CMP0037)
   cmake_policy(SET CMP0037 OLD)
 endif()
+
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands

From ea2faa0607d73c2da49f9fd5ab80b43b22f4411b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 15 Apr 2016 07:55:21 -0400
Subject: [PATCH 047/879] TW-1795: Calendar underline on Day padding

- Thanks to Renato Alves.
---
 ChangeLog                    |  2 ++
 src/commands/CmdCalendar.cpp | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ccb71b5f..71a472aea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
           (thanks to Sebastien Badia).
 - TW-1792 The info command uses '0' to reference dependencies on non-
           pending tasks.
+- TW-1795 Calendar underline on Day padding
+          (thanks to Renato Alves).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 8a3c6cae5..36a9823ad 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -440,7 +440,7 @@ std::string CmdCalendar::renderMonths (
   {
     if (weekStart == 1)
     {
-      view.add (Column::factory ("string.right", "    "));
+      view.add (Column::factory ("string.right", ""));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
@@ -451,7 +451,7 @@ std::string CmdCalendar::renderMonths (
     }
     else
     {
-      view.add (Column::factory ("string.right", "    "));
+      view.add (Column::factory ("string.right", ""));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
       view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
@@ -516,7 +516,11 @@ std::string CmdCalendar::renderMonths (
       int woy = temp.weekOfYear (weekStart);
 
       if (context.config.getBoolean ("displayweeknumber"))
-        view.set (row, (8 * mpl), woy, color_weeknumber);
+        view.set (row,
+                  (8 * mpl),
+                  // Make sure the week number is always 4 columns, space-padded.
+                  format ((woy < 10 ? "   {1}" : "  {1}"), woy),
+                  color_weeknumber);
 
       // Calculate column id.
       int thisCol = dow +                       // 0 = Sunday

From c6e190118fee85280aef327f4031f9c82ca36f25 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 15 Apr 2016 08:06:17 -0400
Subject: [PATCH 048/879] Tests: Removed broken test

- It was not only broken between easter and midsommarafton, but just performing
  an additional comparison. Not needed.
---
 test/dates.t.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 9a73bdba3..044e892a9 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -55,7 +55,7 @@ void testInit (UnitTest& t, const std::string& value, Variant& var)
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (106);
+  UnitTest t (105);
 
   Variant sunday;    testInit (t, "sunday",    sunday);
   Variant monday;    testInit (t, "monday",    monday);
@@ -172,7 +172,6 @@ int main (int, char**)
   t.ok (now < someday,              "now < someday");
   t.ok (goodfriday < easter,        "goodfriday < easter");
   t.ok (easter < eastermonday,      "easter < eastermonday");
-  t.ok (easter < midsommarafton,    "easter < midsommarafton");
   t.ok (midsommarafton < midsommar, "midsommarafton < midsommar");
   t.ok (juhannus == midsommarafton, "juhannus == midsommarafton");
 

From 079e2f3008d55dfb80a016f8e4890a90c7c33900 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 28 Apr 2016 21:02:09 -0400
Subject: [PATCH 049/879] L10N: Fixed ambiguity in the esp-ESP localization

- Thanks to Fidel Mato.
---
 ChangeLog          | 2 ++
 src/l10n/esp-ESP.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71a472aea..c09eb28f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
   virtual tag.
 - Removed deprecated 'alias._query' setting.
+- Fixed ambiguity in the esp-ESP localization
+          (thanks to Fidel Mato).
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4ca54b673..c46fd745e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -1048,7 +1048,7 @@
 #define STRING_UTIL_CONFIRM_NO       "no"  // |esp-ESP|==|eng-USA|
 #define STRING_UTIL_CONFIRM_ALL      "todos"
 #define STRING_UTIL_CONFIRM_ALL_U    "Todos"
-#define STRING_UTIL_CONFIRM_QUIT     "sal"
+#define STRING_UTIL_CONFIRM_QUIT     "canc"
 #define STRING_UTIL_GIBIBYTES        "GiB"  // |esp-ESP|==|eng-USA|
 #define STRING_UTIL_MEBIBYTES        "MiB"  // |esp-ESP|==|eng-USA|
 #define STRING_UTIL_KIBIBYTES        "KiB"  // |esp-ESP|==|eng-USA|

From a7153a082fb86b8ca6419f5487722161f9abeb4c Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 1 May 2016 22:21:36 +0200
Subject: [PATCH 050/879] NEWS: Deprecate new-uuid verbosity option

---
 ChangeLog | 2 ++
 NEWS      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c09eb28f0..c45ed259d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
           (thanks to Fidel Mato).
+- Deprecated the 'new-uuid' verbosity option, since its functionality can be
+  removed by merging with 'new-id'.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
diff --git a/NEWS b/NEWS
index 622098373..51f974152 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ Newly Deprecated Features in Taskwarrior 2.5.2
 
   - The 'DUETODAY' virtual tag is a synonym for the 'TODAY' virtual tag, and is
     not needed.
+  - The 'new-uuid' verbosity option is to be removed due to being redundant, its
+    functionality will be merged with 'new-id' option.
 
 Removed Features in 2.5.2
 

From f29583d81da4436b53d95e8cba176091cb1b16eb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 May 2016 16:36:25 -0400
Subject: [PATCH 051/879] util: Corrected comment

---
 src/util.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 2db86148d..e36bc251d 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -399,8 +399,8 @@ int execute (
 #undef max
 
 ////////////////////////////////////////////////////////////////////////////////
-// Accept a list of projects, and return an indented list
-// that reflects the hierarchy.
+// Accept a list of projects, and return an indented list that reflects the
+// hierarchy.
 //
 //      Input  - "one"
 //               "one.two"

From 038126d59c368230941a7c1cad0b42b5b94d9387 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 May 2016 16:37:19 -0400
Subject: [PATCH 052/879] ColTypeDate: Fixed countdown format only showing
 values in the past

---
 src/columns/ColTypeDate.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index c46f87eca..33cdc96b3 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -94,8 +94,7 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
     else if (_style == "countdown")
     {
       ISO8601d now;
-      if (now > date)
-        minimum = maximum = ISO8601p (now - date).formatVague ().length ();
+      minimum = maximum = ISO8601p (now - date).formatVague ().length ();
     }
     else if (_style == "julian")
     {
@@ -167,8 +166,7 @@ void ColumnTypeDate::render (
     else if (_style == "countdown")
     {
       ISO8601d now;
-      if (now > date)
-        renderStringRight (lines, width, color, ISO8601p (now - date).formatVague ());
+      renderStringRight (lines, width, color, ISO8601p (now - date).formatVague ());
     }
     else if (_style == "julian")
       renderStringRight (lines, width, color, format (date.toJulian (), 13, 12));

From 7d2d06dbcdc4b6a9517d483b8fdf8f59c39e4db5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 May 2016 16:41:24 -0400
Subject: [PATCH 053/879] Task: Corrected false-positive warning about relative
 dates

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c45ed259d..ae8a73bb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
           (thanks to Fidel Mato).
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
   removed by merging with 'new-id'.
+- Correct a false-positive warning when a due date is removed and a wait is
+  added.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 

From 0683e1477721a69e98c2943de01d4bcf4d3652a3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 May 2016 10:56:20 -0500
Subject: [PATCH 054/879] Cleanup: Removed debug output

---
 src/Task.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index d53f8a540..0e8cbf9bc 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -2008,7 +2008,6 @@ float Task::urgency_blocking () const
 // It came from the Command base object, but doesn't really belong there either.
 void Task::modify (modType type, bool text_required /* = false */)
 {
-  context.debug ("Task::modify");
   std::string label = "  MODIFICATION ";
 
   // Need this for later comparison.

From bac71c76704211d279557d6539297db45e144e4b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 May 2016 11:13:46 -0500
Subject: [PATCH 055/879] TW-1806: project:ide is not allowed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Thanks to Slaven ʙanovic.
---
 AUTHORS                    |  1 +
 ChangeLog                  |  2 ++
 src/Eval.cpp               |  2 +-
 src/columns/ColProject.cpp | 31 +++++++++++++++++++++++--------
 src/l10n/deu-DEU.h         |  1 +
 src/l10n/eng-USA.h         |  1 +
 src/l10n/epo-RUS.h         |  1 +
 src/l10n/esp-ESP.h         |  1 +
 src/l10n/fra-FRA.h         |  1 +
 src/l10n/ita-ITA.h         |  1 +
 src/l10n/jpn-JPN.h         |  1 +
 src/l10n/pol-POL.h         |  1 +
 src/l10n/por-PRT.h         |  1 +
 13 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 24b3f475a..dec886fdb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -291,3 +291,4 @@ suggestions:
   Reg
   Yaroslav Molochko
   Michael Meier
+  Slaven ʙanovic
diff --git a/ChangeLog b/ChangeLog
index ae8a73bb3..21a9a0934 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
           pending tasks.
 - TW-1795 Calendar underline on Day padding
           (thanks to Renato Alves).
+- TW-1806 project:ide is not allowed
+          (thanks to Slaven ʙanovic).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 7a4d9fc61..9736d0981 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -387,7 +387,7 @@ void Eval::evaluatePostfixStack (
   // If there is more than one variant left on the stack, then the original
   // expression was not valid.
   if (values.size () != 1)
-    throw std::string (STRING_EVAL_NO_EVAL);
+    throw std::string (STRING_EVAL_NOT_EXPRESSION);
 
   result = values[0];
 }
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 0e803aae9..f94a967f0 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -124,15 +124,30 @@ void ColumnProject::modify (Task& task, const std::string& value)
   if (lexer.token (domRef, type) &&
       type == Lexer::Type::dom)
   {
-    Eval e;
-    e.addSource (domSource);
-    e.addSource (namedDates);
-    contextTask = task;
+    try
+    {
+      Eval e;
+      e.addSource (domSource);
+      e.addSource (namedDates);
+      contextTask = task;
 
-    Variant v;
-    e.evaluateInfixExpression (value, v);
-    task.set (_name, (std::string) v);
-    context.debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + "'");
+      Variant v;
+      e.evaluateInfixExpression (value, v);
+      task.set (_name, (std::string) v);
+      context.debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + "'");
+    }
+    catch (const std::string& e)
+    {
+      // If the expression failed because it didn't look like an expression,
+      // simply store it as-is.
+      if (e == STRING_EVAL_NOT_EXPRESSION)
+      {
+        task.set (_name, value);
+        context.debug (label + _name + " <-- '" + value + "'");
+      }
+      else
+        throw;
+    }
   }
   else
   {
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 3135d37ac..960195312 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Nicht unterstützter Operator: '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operator erwartet."
 #define STRING_EVAL_NO_EVAL          "Der Ausdruck konnte nicht ausgewertet werden."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Ungültige Klammerung in Ausdruck."
 
 // edit
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 84de21d6b..0e58ee66a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -679,6 +679,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operator expected."
 #define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
 
 // edit
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index cb07b51e7..fa09d5ee6 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Ne subtenas infikson '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Anticipis infikson."
 #define STRING_EVAL_NO_EVAL          "Ne povis kalkuli la esprimon."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Malbalancataj parentezoj en esprimo"
 
 // edit
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c46fd745e..303f2723d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -690,6 +690,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Operador no soportado '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Se esperaba operador."
 #define STRING_EVAL_NO_EVAL          "La expresión podría no ser evaluada."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Paréntesis desemparejados en expresión"
 
 // edit
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 4046ed457..5bb47aef0 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operator expected."
 #define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
 
 // edit
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 95e0da6b2..86d8969d5 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -680,6 +680,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Operatore non supportato '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operator expected."
 #define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
 
 // edit
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index e82ba9bc7..4ef19a050 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operator expected."
 #define STRING_EVAL_NO_EVAL          "式を評価出来ません。"
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
 
 // edit
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 1264c3f6f..c6e1d7723 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Niewspierany operator '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Oczekiwany operator."
 #define STRING_EVAL_NO_EVAL          "Wyrażenie nie może być przetworzone."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Niedopasowane nawiasy w wyrażeniu"
 
 // edit
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 0de68ed5c..0c73f794e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -681,6 +681,7 @@
 #define STRING_EVAL_UNSUPPORTED      "Operador não suportado '{1}'."
 #define STRING_EVAL_OP_EXPECTED      "Operador em falta."
 #define STRING_EVAL_NO_EVAL          "Não foi possível calcular a expressão."
+#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
 #define STRING_PAREN_MISMATCH        "Parentesis incompatíveis na expressão."
 
 // edit

From 271d55506a07ea6b51bff2fb9a1c1ac44cd3c2a0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 May 2016 14:41:08 -0500
Subject: [PATCH 056/879] TW-1807: dateformat lacks a flag to display day of
 week

- Thanks to Ellington Santos.
---
 AUTHORS             | 1 +
 ChangeLog           | 2 ++
 doc/man/taskrc.5.in | 2 ++
 src/ISO8601.cpp     | 1 +
 4 files changed, 6 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index dec886fdb..d79ffd0af 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -292,3 +292,4 @@ suggestions:
   Yaroslav Molochko
   Michael Meier
   Slaven ʙanovic
+  Ellington Santos
diff --git a/ChangeLog b/ChangeLog
index 21a9a0934..33e42580a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
           (thanks to Renato Alves).
 - TW-1806 project:ide is not allowed
           (thanks to Slaven ʙanovic).
+- TW-1807 dateformat lacks a flag to display day of week
+          (thanks to Ellington Santos).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 83294dd83..837e94858 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -583,6 +583,8 @@ S  two-digit seconds,      for example 07 or 47
 J  three-digit Julian day, for example 023 or 365
 .br
 j  Julian day,             for example 23 or 365
+.br
+w  Week day,               for example 0 for Monday, 5 for Friday
 .RE
 .RE
 
diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
index bf3282627..2edf511af 100644
--- a/src/ISO8601.cpp
+++ b/src/ISO8601.cpp
@@ -1122,6 +1122,7 @@ const std::string ISO8601d::toString (
     case 'S': formatted << std::setw (2) << std::setfill ('0') << this->second ();        break;
     case 'j': formatted                                        << this->dayOfYear ();     break;
     case 'J': formatted << std::setw (3) << std::setfill ('0') << this->dayOfYear ();     break;
+    case 'w': formatted                                        << this->dayOfWeek ();     break;
     default:  formatted                                        << static_cast <char> (c); break;
     }
   }

From c99754391f16be0bdad9a9271dfdc80bff46f9dc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 May 2016 14:47:34 -0500
Subject: [PATCH 057/879] Tests: Added 'w' dateformat test

---
 test/iso8601d.t.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/iso8601d.t.cpp b/test/iso8601d.t.cpp
index 938532335..431b570ca 100644
--- a/test/iso8601d.t.cpp
+++ b/test/iso8601d.t.cpp
@@ -72,9 +72,9 @@ void testParse (
 int main (int, char**)
 {
 #ifdef PRODUCT_TASKWARRIOR
-  UnitTest t (1025);
+  UnitTest t (1026);
 #else
-  UnitTest t (996);
+  UnitTest t (997);
 #endif
 
   ISO8601d iso;
@@ -657,6 +657,7 @@ int main (int, char**)
     t.is (r32.toString ("v"),        "44", "2015-10-28T12:55:00 -> v ->        44");
     t.is (r32.toString ("J"),       "301", "2015-10-28T12:55:00 -> J ->       301");
     t.is (r32.toString ("j"),       "301", "2015-10-28T12:55:00 -> j ->       301");
+    t.is (r32.toString ("w"),         "3", "2015-10-28T12:55:00 -> w ->         3");
 
     // Test all parse options.
     ISO8601d r33 ("2015 10 28 19 28 01", "Y M D H N S");

From 0820549b4c1615079854bd050a0f3771b6d2ae91 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:04:49 -0400
Subject: [PATCH 058/879] ISO8601: Added ::sameQuarter

---
 src/ISO8601.cpp |  7 +++++++
 src/ISO8601.h   | 31 ++++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
index 2edf511af..8a94621b5 100644
--- a/src/ISO8601.cpp
+++ b/src/ISO8601.cpp
@@ -1574,6 +1574,13 @@ bool ISO8601d::sameMonth (const ISO8601d& rhs) const
          this->month () == rhs.month ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool ISO8601d::sameQuarter (const ISO8601d& rhs) const
+{
+  return (this->year () == rhs.year ()) &&
+         ((this->month () - 1) / 4) == ((rhs.month () - 1) / 4);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool ISO8601d::sameYear (const ISO8601d& rhs) const
 {
diff --git a/src/ISO8601.h b/src/ISO8601.h
index c7b7cd027..b3f82e5aa 100644
--- a/src/ISO8601.h
+++ b/src/ISO8601.h
@@ -86,26 +86,27 @@ public:
   int minute () const;
   int second () const;
 
-  bool operator== (const ISO8601d&) const;
-  bool operator!= (const ISO8601d&) const;
-  bool operator<  (const ISO8601d&) const;
-  bool operator>  (const ISO8601d&) const;
-  bool operator<= (const ISO8601d&) const;
-  bool operator>= (const ISO8601d&) const;
-  bool sameHour   (const ISO8601d&) const;
-  bool sameDay    (const ISO8601d&) const;
-  bool sameWeek   (const ISO8601d&) const;
-  bool sameMonth  (const ISO8601d&) const;
-  bool sameYear   (const ISO8601d&) const;
+  bool operator==  (const ISO8601d&) const;
+  bool operator!=  (const ISO8601d&) const;
+  bool operator<   (const ISO8601d&) const;
+  bool operator>   (const ISO8601d&) const;
+  bool operator<=  (const ISO8601d&) const;
+  bool operator>=  (const ISO8601d&) const;
+  bool sameHour    (const ISO8601d&) const;
+  bool sameDay     (const ISO8601d&) const;
+  bool sameWeek    (const ISO8601d&) const;
+  bool sameMonth   (const ISO8601d&) const;
+  bool sameQuarter (const ISO8601d&) const;
+  bool sameYear    (const ISO8601d&) const;
   ISO8601d operator+  (const int);
   ISO8601d operator-  (const int);
   ISO8601d& operator+= (const int);
   ISO8601d& operator-= (const int);
   time_t operator- (const ISO8601d&);
-  void operator-- ();    // Prefix
-  void operator-- (int); // Postfix
-  void operator++ ();    // Prefix
-  void operator++ (int); // Postfix
+  void operator--  ();    // Prefix
+  void operator--  (int); // Postfix
+  void operator++  ();    // Prefix
+  void operator++  (int); // Postfix
 
 private:
   void clear ();

From 8e8e0201f073b60198f356cec5af0a7b2c8db756 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:09:49 -0400
Subject: [PATCH 059/879] Tests: Added ::sameQuarter tests

---
 test/iso8601d.t.cpp | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/test/iso8601d.t.cpp b/test/iso8601d.t.cpp
index 431b570ca..e6d67c481 100644
--- a/test/iso8601d.t.cpp
+++ b/test/iso8601d.t.cpp
@@ -72,9 +72,9 @@ void testParse (
 int main (int, char**)
 {
 #ifdef PRODUCT_TASKWARRIOR
-  UnitTest t (1026);
+  UnitTest t (1032);
 #else
-  UnitTest t (997);
+  UnitTest t (1003);
 #endif
 
   ISO8601d iso;
@@ -256,27 +256,31 @@ int main (int, char**)
     // Loose comparisons.
     ISO8601d left ("7/4/2008", "m/d/Y");
     ISO8601d comp1 ("7/4/2008", "m/d/Y");
-    t.ok (left.sameDay   (comp1), "7/4/2008 is on the same day as 7/4/2008");
-    t.ok (left.sameWeek  (comp1), "7/4/2008 is on the same week as 7/4/2008");
-    t.ok (left.sameMonth (comp1), "7/4/2008 is in the same month as 7/4/2008");
-    t.ok (left.sameYear  (comp1), "7/4/2008 is in the same year as 7/4/2008");
+    t.ok (left.sameDay     (comp1), "7/4/2008 is on the same day as 7/4/2008");
+    t.ok (left.sameWeek    (comp1), "7/4/2008 is on the same week as 7/4/2008");
+    t.ok (left.sameMonth   (comp1), "7/4/2008 is in the same month as 7/4/2008");
+    t.ok (left.sameQuarter (comp1), "7/4/2008 is in the same quarter as 7/4/2008");
+    t.ok (left.sameYear    (comp1), "7/4/2008 is in the same year as 7/4/2008");
 
     ISO8601d comp2 ("7/5/2008", "m/d/Y");
-    t.notok (left.sameDay   (comp2), "7/4/2008 is not on the same day as 7/5/2008");
-    t.ok    (left.sameMonth (comp2), "7/4/2008 is in the same month as 7/5/2008");
-    t.ok    (left.sameYear  (comp2), "7/4/2008 is in the same year as 7/5/2008");
+    t.notok (left.sameDay     (comp2), "7/4/2008 is not on the same day as 7/5/2008");
+    t.ok    (left.sameMonth   (comp2), "7/4/2008 is in the same month as 7/5/2008");
+    t.ok    (left.sameQuarter (comp2), "7/4/2008 is in the same quarter as 7/5/2008");
+    t.ok    (left.sameYear    (comp2), "7/4/2008 is in the same year as 7/5/2008");
 
     ISO8601d comp3 ("8/4/2008", "m/d/Y");
-    t.notok (left.sameDay   (comp3), "7/4/2008 is not on the same day as 8/4/2008");
-    t.notok (left.sameWeek  (comp3), "7/4/2008 is not on the same week as 8/4/2008");
-    t.notok (left.sameMonth (comp3), "7/4/2008 is not in the same month as 8/4/2008");
-    t.ok    (left.sameYear  (comp3), "7/4/2008 is in the same year as 8/4/2008");
+    t.notok (left.sameDay     (comp3), "7/4/2008 is not on the same day as 8/4/2008");
+    t.notok (left.sameWeek    (comp3), "7/4/2008 is not on the same week as 8/4/2008");
+    t.notok (left.sameMonth   (comp3), "7/4/2008 is not in the same month as 8/4/2008");
+    t.ok    (left.sameQuarter (comp3), "7/4/2008 is in the same quarter as 8/4/2008");
+    t.ok    (left.sameYear    (comp3), "7/4/2008 is in the same year as 8/4/2008");
 
     ISO8601d comp4 ("7/4/2009", "m/d/Y");
-    t.notok (left.sameDay   (comp4), "7/4/2008 is not on the same day as 7/4/2009");
-    t.notok (left.sameWeek  (comp3), "7/4/2008 is not on the same week as 7/4/2009");
-    t.notok (left.sameMonth (comp4), "7/4/2008 is not in the same month as 7/4/2009");
-    t.notok (left.sameYear  (comp4), "7/4/2008 is not in the same year as 7/4/2009");
+    t.notok (left.sameDay     (comp4), "7/4/2008 is not on the same day as 7/4/2009");
+    t.notok (left.sameWeek    (comp4), "7/4/2008 is not on the same week as 7/4/2009");
+    t.notok (left.sameMonth   (comp4), "7/4/2008 is not in the same month as 7/4/2009");
+    t.notok (left.sameQuarter (comp4), "7/4/2008 is not in the same quarter as 7/4/2009");
+    t.notok (left.sameYear    (comp4), "7/4/2008 is not in the same year as 7/4/2009");
 
     // Validity.
     t.ok    (ISO8601d::valid (2, 29, 2008), "valid: 2/29/2008");
@@ -528,6 +532,7 @@ int main (int, char**)
 
     ISO8601d r13 ("eom");
     t.ok (r13.sameMonth (now), "eom in same month as now");
+    t.ok (r13.sameQuarter (now), "eom in same quarter as now");
 
     ISO8601d r14 ("eocm");
     t.ok (r14.sameMonth (now), "eocm in same month as now");
@@ -546,6 +551,7 @@ int main (int, char**)
 
     ISO8601d r18 ("socm");
     t.ok (r18.sameMonth (now), "socm in same month as now");
+    t.ok (r18.sameQuarter (now), "socm in same quarter as now");
 
     ISO8601d r19 ("soy");
     t.notok (r19.sameYear (now), "soy not in same year as now");

From 62944cdf6f8e06debd94f2607cc5fe7c6afecd93 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:11:07 -0400
Subject: [PATCH 060/879] Task: Added QUARTER virtual tag

---
 src/Task.cpp | 20 ++++++++++++++++++++
 src/Task.h   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/src/Task.cpp b/src/Task.cpp
index 0e8cbf9bc..bfa1f8214 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -474,6 +474,25 @@ bool Task::is_duemonth () const
   return false;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool Task::is_duequarter () const
+{
+  if (has ("due"))
+  {
+    Task::status status = getStatus ();
+
+    if (status != Task::completed &&
+        status != Task::deleted)
+    {
+      ISO8601d due (get_date ("due"));
+      if (due.sameQuarter (ISO8601d ()))
+        return true;
+    }
+  }
+
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool Task::is_dueyear () const
 {
@@ -1235,6 +1254,7 @@ bool Task::hasTag (const std::string& tag) const
     if (tag == "OVERDUE")   return is_overdue ();
     if (tag == "WEEK")      return is_dueweek ();
     if (tag == "MONTH")     return is_duemonth ();
+    if (tag == "QUARTER")   return is_duequarter ();
     if (tag == "YEAR")      return is_dueyear ();
 #endif
     if (tag == "ACTIVE")    return has ("start");
diff --git a/src/Task.h b/src/Task.h
index 474049179..b4cf6d336 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -107,6 +107,7 @@ public:
   bool is_duetomorrow () const;
   bool is_dueweek () const;
   bool is_duemonth () const;
+  bool is_duequarter () const;
   bool is_dueyear () const;
   bool is_overdue () const;
   bool is_udaPresent () const;

From edeac7e6a26b6ae902703d7f273949af6ec00445 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:11:29 -0400
Subject: [PATCH 061/879] Task: Made better use of ::sameN methods

---
 src/Task.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index bfa1f8214..6a9e10f13 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -445,8 +445,7 @@ bool Task::is_dueweek () const
         status != Task::deleted)
     {
       ISO8601d due (get_date ("due"));
-      if (due >= ISO8601d ("socw") &&
-          due <= ISO8601d ("eocw"))
+      if (due.sameWeek (ISO8601d ()))
         return true;
     }
   }
@@ -465,8 +464,7 @@ bool Task::is_duemonth () const
         status != Task::deleted)
     {
       ISO8601d due (get_date ("due"));
-      if (due >= ISO8601d ("socm") &&
-          due <= ISO8601d ("eocm"))
+      if (due.sameMonth (ISO8601d ()))
         return true;
     }
   }
@@ -503,9 +501,8 @@ bool Task::is_dueyear () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d now;
       ISO8601d due (get_date ("due"));
-      if (now.year () == due.year ())
+      if (due.sameYear (ISO8601d ()))
         return true;
     }
   }

From 6358b22289aa603760a5e671a33ab5925aa7cf7a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:13:03 -0400
Subject: [PATCH 062/879] Docs: Added QUARTER virtual tag

---
 ChangeLog         | 1 +
 NEWS              | 2 +-
 doc/man/task.1.in | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 33e42580a..8be8ed9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
   removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
+- Added 'QUARTER' virtual tag.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
diff --git a/NEWS b/NEWS
index 51f974152..4d739de4e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 
 New Features in Taskwarrior 2.5.2
 
-  -
+  - The 'QUARTER' virutal tag was added.
 
 New Commands in Taskwarrior 2.5.2
 
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index ac6707c6e..c279e2230 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -690,6 +690,7 @@ are:
     PENDING      Matches if the task has pending status
     PRIORITY     Matches if the task has a priority
     PROJECT      Matches if the task has a project
+    QUARTER      Matches if the task is due this quarter
     READY        Matches if the task is actionable
     SCHEDULED    Matches if the task is scheduled
     TAGGED       Matches if the task has tags

From 071adeeba4f20991b096c5c8f6e3e206b1080a3d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jun 2016 14:58:10 -0400
Subject: [PATCH 063/879] TW-1813: Range filter doesn't work

- Thanks to george js.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index d79ffd0af..e4eb5a1c2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -293,3 +293,4 @@ suggestions:
   Michael Meier
   Slaven ʙanovic
   Ellington Santos
+  george js
diff --git a/ChangeLog b/ChangeLog
index 8be8ed9bd..d8c8e1c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
           (thanks to Slaven ʙanovic).
 - TW-1807 dateformat lacks a flag to display day of week
           (thanks to Ellington Santos).
+- TW-1813 Range filter doesn't work
+          (thanks to george js).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 54aaac99641316747a2cdb135d53534ee58aadfc Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 12 Jun 2016 21:02:37 +0200
Subject: [PATCH 064/879] TW-61: Extract only tasks with annotations

- Thanks to Aikido Guy.
- Note: This is just bookkeeping commit, the solution (+ANNOTATED
  virtual tag) is present since 2.3.0.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d8c8e1c2a..e4e4b71d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 - TD-64   sync conflict deleted all annotations of the task
           (thanks to Markus Beppler, Konstantin Vorobyev).
+- TW-61   Extract only tasks with annotations
+          (thanks to Aikido Guy)
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is

From 1efeea38843a87c10c1b75473381aafc92a2383c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 14 Jun 2016 19:36:52 -0400
Subject: [PATCH 065/879] L10N: Removed unused strings

---
 src/l10n/deu-DEU.h | 8 --------
 src/l10n/eng-USA.h | 8 --------
 src/l10n/epo-RUS.h | 8 --------
 src/l10n/esp-ESP.h | 8 --------
 src/l10n/fra-FRA.h | 8 --------
 src/l10n/ita-ITA.h | 8 --------
 src/l10n/jpn-JPN.h | 8 --------
 src/l10n/pol-POL.h | 8 --------
 src/l10n/por-PRT.h | 8 --------
 9 files changed, 72 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 960195312..4cb7e32b7 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Divisionsrest von null kann nicht berechnet werden"
 #define STRING_VARIANT_SQRT_NEG      "Quadratwurzel einer negativen Zahl kann nicht berechnet werden."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Fehler: Kein Monat hat mehr als 31 Tage."
-#define STRING_DATES_ORD_MISMATCH    "Fehler: Zahl und Ordinalsuffix passen nicht (z.B., '1st', nicht '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Farbe '{1}' nicht erkannt."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
 #define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_UNKNOWN      "<unknown>"
 #define STRING_CMD_DIAG_COMPILER     "Compiler"
 #define STRING_CMD_DIAG_VERSION      "Version"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "Kein Befehl angegeben - nehme 'information' an."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type nicht gefunden. Das UDA '{1}' muss einen festgelegten Typ haben."
 #define STRING_UDA_NUMERIC           "Der Wert '{1}' ist kein zulässiger Zahlenwert."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 0e58ee66a..29575dad4 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Cannot modulo zero"
 #define STRING_VARIANT_SQRT_NEG      "Cannot take the square root of a negative number."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Error: no month has more than 31 days."
-#define STRING_DATES_ORD_MISMATCH    "Error: number and ordinal don't match (e.g., '1st', not '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
 
@@ -499,7 +493,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
 #define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_UNKNOWN      "<unknown>"
 #define STRING_CMD_DIAG_COMPILER     "Compiler"
 #define STRING_CMD_DIAG_VERSION      "Version"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -758,7 +751,6 @@
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type not found. The UDA '{1}' must have a type specified."
 #define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fa09d5ee6..6594bf211 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Ne povas moduli nulon"
 #define STRING_VARIANT_SQRT_NEG      "Ne povas kalkuli kvadratan radikon de negativa nombro."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Eraro: nenia monato havas pli de 31 tagojn."
-#define STRING_DATES_ORD_MISMATCH    "Eraro: la ordosufikso ne kongruas kun la nombro (ĝuste '1st', malĝuste '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Koloro '{1}' ne rekonata."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
 #define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_UNKNOWN      "<unknown>"
 #define STRING_CMD_DIAG_COMPILER     "Compiler"
 #define STRING_CMD_DIAG_VERSION      "Version"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "Nenia komando specifita.  Supozanta 'information'."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "Ne trovis uda.{1}.type.  Oni devas specifid la tipo de UDA '{1}'."
 #define STRING_UDA_NUMERIC           "Valoro '{1}' ne estas valida nombra valoro."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 303f2723d..e42d0b90f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "No se puede modular cero"
 #define STRING_VARIANT_SQRT_NEG      "No se puede calcular la raíz cuadrada de un tipo desconocido"
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Error: no hay ningún mes que tenga más de 31 días."
-#define STRING_DATES_ORD_MISMATCH    "Error: el sufijo ordinal no corresponde al número (i.e. '1st', no '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "El color '{1}' no se reconoce."
 
@@ -507,7 +501,6 @@
 #define STRING_CMD_SYNC_TRUST_OBS    "Los ajustes de 'taskd.trust' ahora solo pueden contener uno de los valores 'strict', 'ignore hostname' o 'allow all'."
 #define STRING_CMD_DIAG_USAGE        "Detalles de plataforma, construcción y entorno"
 #define STRING_CMD_DIAG_PLATFORM     "Plataforma"
-#define STRING_CMD_DIAG_UNKNOWN      "<desconocido>"
 #define STRING_CMD_DIAG_COMPILER     "Compilador"
 #define STRING_CMD_DIAG_VERSION      "Versión"
 #define STRING_CMD_DIAG_CAPS         "Capacidades"
@@ -769,7 +762,6 @@
 #define STRING_ASSUME_INFO           "No especificó un comando - asumido 'information'."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "No se encontró uda.{1}.type . El UDA '{1}' debe tener algún tipo especificado."
 #define STRING_UDA_NUMERIC           "El valor '{1}' no es un valor numérico válido."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5bb47aef0..46847ffa1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Ne peut pas moduler zéro"
 #define STRING_VARIANT_SQRT_NEG      "Ne peut pas calculer la racine carrée d'un nombre négatif."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Erreur : aucun mois n'a plus de 31 jours."
-#define STRING_DATES_ORD_MISMATCH    "Erreur : le nombre ne correspond pas à l'ordinal (ie '1st', pas '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "La couleur '{1}' n'est pas reconnue."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
 #define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_UNKNOWN      "<unknown>"
 #define STRING_CMD_DIAG_COMPILER     "Compiler"
 #define STRING_CMD_DIAG_VERSION      "Version"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type introuvable. L'ADU '{1}' doit avoir un type déclaré."
 #define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 86d8969d5..858b257da 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Cannot modulo zero"
 #define STRING_VARIANT_SQRT_NEG      "Cannot take the square root of a negative number."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Error: no month has more than 31 days."
-#define STRING_DATES_ORD_MISMATCH    "Error: number and ordinal don't match (e.g., '1st', not '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Il colore '{1}' non è riconosciuto."
 
@@ -500,7 +494,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Dettagli su piattaforma, build e ambiente"
 #define STRING_CMD_DIAG_PLATFORM     "Piattaforma"
-#define STRING_CMD_DIAG_UNKNOWN      "<sconoscito>"
 #define STRING_CMD_DIAG_COMPILER     "Compilatore"
 #define STRING_CMD_DIAG_VERSION      "Versione"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -759,7 +752,6 @@
 #define STRING_ASSUME_INFO           "Nessun comando specificato - si assume 'information'."
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type non trovato. L'UDA '{1}' deve avere un tipo specificato."
 #define STRING_UDA_NUMERIC           "Il valore '{1}' non è un valore numerico valido."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4ef19a050..4f53cba27 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "零で剰余を取ることは出来ません。"
 #define STRING_VARIANT_SQRT_NEG      "負の数は平方根を計算できません。"
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "エラー: 月の日付は31日まで。"
-#define STRING_DATES_ORD_MISMATCH    "Error: number and ordinal don't match (e.g., '1st', not '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
 #define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_UNKNOWN      "<unknown>"
 #define STRING_CMD_DIAG_COMPILER     "Compiler"
 #define STRING_CMD_DIAG_VERSION      "Version"
 #define STRING_CMD_DIAG_CAPS         "Caps"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "コマンドが指定されていません - 'information' を仮定します。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type not found. The UDA '{1}' must have a type specified."
 #define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index c6e1d7723..8e5d82760 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Nie można uzyskać modulo z zera"
 #define STRING_VARIANT_SQRT_NEG      "Nie można wyciągnąć pierwiastka kwadratowego z wartości ujemnej."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Błąd: żaden miesiąc nie ma więcej niż 31 dni."
-#define STRING_DATES_ORD_MISMATCH    "Błąd: niepoprawny sufix (np., '1st', nie '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Kolor '{1}' nie został rozpoznany."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Szczegóły platformy i środowiska budowania"
 #define STRING_CMD_DIAG_PLATFORM     "Platforma"
-#define STRING_CMD_DIAG_UNKNOWN      "<nieznane>"
 #define STRING_CMD_DIAG_COMPILER     "Kompilator"
 #define STRING_CMD_DIAG_VERSION      "Wersja"
 #define STRING_CMD_DIAG_CAPS         "Flagi"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "Nie podano polecenia - zakładam 'information'."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type nie znaleziony. UDA '{1}' musi posiadać typ."
 #define STRING_UDA_NUMERIC           "Wartość '{1}' nie jest poprawną wartością numeryczną."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 0c73f794e..c8859b024 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -162,12 +162,6 @@
 #define STRING_VARIANT_MOD_ZERO      "Impossível calcular módulo de zero"
 #define STRING_VARIANT_SQRT_NEG      "Impossível calcular a raiz quadrada de um número negativo."
 
-// Dates
-//
-// These are errors generated when parsing date values.
-#define STRING_DATES_MONTH_31        "Erro: nenhum mês tem mais de 31 dias."
-#define STRING_DATES_ORD_MISMATCH    "Erro: correspondencia inválida entre número e ordinal (usar '1st', e não '1nd')."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "A cor '{1}' não é reconhecida."
 
@@ -501,7 +495,6 @@
 // STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_DIAG_USAGE        "Plataforma, versão e detalhes de ambiente"
 #define STRING_CMD_DIAG_PLATFORM     "Plataforma"
-#define STRING_CMD_DIAG_UNKNOWN      "<desconhecido>"
 #define STRING_CMD_DIAG_COMPILER     "Compilador"
 #define STRING_CMD_DIAG_VERSION      "Versão"
 #define STRING_CMD_DIAG_CAPS         "Capacidades"
@@ -760,7 +753,6 @@
 #define STRING_ASSUME_INFO           "Nenhum comando especificado - assumindo 'information'."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
-#define STRING_UDA_TYPE_MISSING      "uda.{1}.type não encontrado. É necessário especificar um tipo no 'UDA' '{1}'."
 #define STRING_UDA_NUMERIC           "O valor '{1}' não é um valor numérico válido."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."

From 395329fb6c3b3b67e07e7c1430712486eb11a375 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 14 Jun 2016 19:38:36 -0400
Subject: [PATCH 066/879] TW-1820: Install with -DLANGUAGE=2 flag not work.

- Thanks to E. Manuel Cerr'on Angeles
---
 AUTHORS            | 1 +
 ChangeLog          | 2 ++
 src/l10n/esp-ESP.h | 1 +
 3 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index e4eb5a1c2..93f150806 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -294,3 +294,4 @@ suggestions:
   Slaven ʙanovic
   Ellington Santos
   george js
+  E. Manuel Cerr'on Angeles
diff --git a/ChangeLog b/ChangeLog
index e4e4b71d2..f36852b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
           (thanks to Ellington Santos).
 - TW-1813 Range filter doesn't work
           (thanks to george js).
+- TW-1820 Install with -DLANGUAGE=2 flag not work.
+          (thanks to E. Manuel Cerr'on Angeles)
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e42d0b90f..1a512c4d7 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -769,6 +769,7 @@
 #define STRING_TLS_INIT_FAIL         "Error inicializando TLS. {1}"
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
+#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "El estatus '{1}' no es válido."
 
 // Feedback

From 35ab335cb2205d6e7086a3a490869c83569de75e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 24 Jun 2016 22:23:49 -0400
Subject: [PATCH 067/879] Docs: Removed one suggestion for reporting bugs

---
 NEWS | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/NEWS b/NEWS
index 4d739de4e..3b35a1b08 100644
--- a/NEWS
+++ b/NEWS
@@ -41,10 +41,6 @@ encounter a bug, please enter a new issue at:
 
   https://bug.tasktools.org
 
-Or you can also report the issue in the forums at:
-
-  https://answers.tasktools.org
-
 Or just send a message to:
 
   support@taskwarrior.org

From 83ddb3f99f310f12d27e7a5e6ca3d176cd6c24cc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:12:00 -0400
Subject: [PATCH 068/879] libshared: Added libshared

---
 .gitmodules   | 3 +++
 src/libshared | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 src/libshared

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..919cbabcb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/libshared"]
+	path = src/libshared
+	url = https://git.tasktools.org/scm/tm/libshared.git
diff --git a/src/libshared b/src/libshared
new file mode 160000
index 000000000..144d37263
--- /dev/null
+++ b/src/libshared
@@ -0,0 +1 @@
+Subproject commit 144d37263c52aef3e0959e1b891785da3911ece5

From d33a62ffa6df974a4d25e672e9d4deafb458f367 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:22:27 -0400
Subject: [PATCH 069/879] libshared: Integrated the submodule

- Integrated RX.
---
 src/CMakeLists.txt          |  77 ++++++++---------
 src/RX.cpp                  | 159 ------------------------------------
 src/RX.h                    |  58 -------------
 src/columns/CMakeLists.txt  |   1 +
 src/commands/CMakeLists.txt |   1 +
 test/rx.t.cpp               | 142 --------------------------------
 6 files changed, 41 insertions(+), 397 deletions(-)
 delete mode 100644 src/RX.cpp
 delete mode 100644 src/RX.h
 delete mode 100644 test/rx.t.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fde10cd3c..d3d7880c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,52 +3,53 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
+                     ${CMAKE_SOURCE_DIR}/src/libshared/src
                      ${TASK_INCLUDE_DIRS})
 
-set (task_SRCS CLI2.cpp CLI2.h
-               Color.cpp Color.h
-               Config.cpp Config.h
-               Context.cpp Context.h
-               DOM.cpp DOM.h
-               Dates.cpp Dates.h
-               Eval.cpp Eval.h
-               Filter.cpp Filter.h
-               FS.cpp FS.h
-               Hooks.cpp Hooks.h
-               ISO8601.cpp ISO8601.h
-               JSON.cpp JSON.h
-               Lexer.cpp Lexer.h
-               Msg.cpp Msg.h
-               Nibbler.cpp Nibbler.h
-               RX.cpp RX.h
-               TDB2.cpp TDB2.h
-               Task.cpp Task.h
-               Timer.cpp Timer.h
-               TLSClient.cpp TLSClient.h
-               Variant.cpp Variant.h
-               ViewTask.cpp ViewTask.h
-               ViewText.cpp ViewText.h
-               dependency.cpp
-               feedback.cpp
-               i18n.h
-               legacy.cpp
-               recur.cpp
-               rules.cpp
-               sort.cpp
-               text.cpp text.h
-               utf8.cpp utf8.h
-               util.cpp util.h
-               wcwidth6.cpp)
+add_library (task CLI2.cpp CLI2.h
+                  Color.cpp Color.h
+                  Config.cpp Config.h
+                  Context.cpp Context.h
+                  DOM.cpp DOM.h
+                  Dates.cpp Dates.h
+                  Eval.cpp Eval.h
+                  Filter.cpp Filter.h
+                  FS.cpp FS.h
+                  Hooks.cpp Hooks.h
+                  ISO8601.cpp ISO8601.h
+                  JSON.cpp JSON.h
+                  Lexer.cpp Lexer.h
+                  Msg.cpp Msg.h
+                  Nibbler.cpp Nibbler.h
+                  TDB2.cpp TDB2.h
+                  Task.cpp Task.h
+                  Timer.cpp Timer.h
+                  TLSClient.cpp TLSClient.h
+                  Variant.cpp Variant.h
+                  ViewTask.cpp ViewTask.h
+                  ViewText.cpp ViewText.h
+                  dependency.cpp
+                  feedback.cpp
+                  i18n.h
+                  legacy.cpp
+                  recur.cpp
+                  rules.cpp
+                  sort.cpp
+                  text.cpp text.h
+                  utf8.cpp utf8.h
+                  util.cpp util.h
+                  wcwidth6.cpp)
+
+add_library (libshared libshared/src/RX.cpp            libshared/src/RX.h)
 
-add_library (task STATIC ${task_SRCS})
 add_executable (task_executable main.cpp)
 add_executable (calc_executable calc.cpp)
 add_executable (lex_executable lex.cpp)
 
 # Yes, 'task' is included twice, otherwise linking fails on assorted OSes.
-target_link_libraries (task_executable task commands columns task ${TASK_LIBRARIES})
-target_link_libraries (calc_executable task commands columns task ${TASK_LIBRARIES})
-target_link_libraries (lex_executable task commands columns task ${TASK_LIBRARIES})
+target_link_libraries (task_executable task commands columns libshared task ${TASK_LIBRARIES})
+target_link_libraries (calc_executable task commands columns libshared task ${TASK_LIBRARIES})
+target_link_libraries (lex_executable  task commands columns libshared task ${TASK_LIBRARIES})
 
 set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task")
 
diff --git a/src/RX.cpp b/src/RX.cpp
deleted file mode 100644
index b68a063b7..000000000
--- a/src/RX.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <RX.h>
-#include <cstdlib>
-#include <cstring>
-
-////////////////////////////////////////////////////////////////////////////////
-RX::RX ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-RX::RX (
-  const std::string& pattern,
-  bool case_sensitive /* = true */)
-: _compiled (false)
-, _pattern (pattern)
-, _case_sensitive (case_sensitive)
-{
-  compile ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-RX::RX (const RX& other)
-{
-  _compiled       = false;
-  _pattern        = other._pattern;
-  _case_sensitive = other._case_sensitive;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-RX::~RX ()
-{
-  if (_compiled)
-    regfree (&_regex);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-RX& RX::operator= (const RX& other)
-{
-  _compiled       = false;
-  _pattern        = other._pattern;
-  _case_sensitive = other._case_sensitive;
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void RX::compile ()
-{
-  if (! _compiled)
-  {
-    memset (&_regex, 0, sizeof (regex_t));
-
-    int result;
-    if ((result = regcomp (&_regex, _pattern.c_str (),
-#if defined REG_ENHANCED
-                           REG_ENHANCED | REG_EXTENDED | REG_NEWLINE |
-#else
-                           REG_EXTENDED | REG_NEWLINE |
-#endif
-                           (_case_sensitive ? 0 : REG_ICASE))) != 0)
-    {
-      char message[256];
-      regerror (result, &_regex, message, 256);
-      throw std::string (message);
-    }
-
-    _compiled = true;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool RX::match (const std::string& in)
-{
-  if (! _compiled)
-    compile ();
-
-  return regexec (&_regex, in.c_str (), 0, nullptr, 0) == 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool RX::match (
-  std::vector<std::string>& matches,
-  const std::string& in)
-{
-  if (! _compiled)
-    compile ();
-
-  regmatch_t rm[2];
-  int offset = 0;
-  int length = in.length ();
-  while (regexec (&_regex, in.c_str () + offset, 2, &rm[0], 0) == 0 &&
-         offset < length)
-  {
-    matches.push_back (in.substr (rm[0].rm_so + offset, rm[0].rm_eo - rm[0].rm_so));
-    offset += rm[0].rm_eo;
-
-    // Protection against zero-width patterns causing infinite loops.
-    if (rm[0].rm_so == rm[0].rm_eo)
-      ++offset;
-  }
-
-  return matches.size () ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool RX::match (
-  std::vector <int>& start,
-  std::vector <int>& end,
-  const std::string& in)
-{
-  if (! _compiled)
-    compile ();
-
-  regmatch_t rm[2];
-  int offset = 0;
-  int length = in.length ();
-  while (regexec (&_regex, in.c_str () + offset, 2, &rm[0], 0) == 0 &&
-         offset < length)
-  {
-    start.push_back (rm[0].rm_so + offset);
-    end.push_back   (rm[0].rm_eo + offset);
-    offset += rm[0].rm_eo;
-
-    // Protection against zero-width patterns causing infinite loops.
-    if (rm[0].rm_so == rm[0].rm_eo)
-      ++offset;
-  }
-
-  return start.size () ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/RX.h b/src/RX.h
deleted file mode 100644
index b98371113..000000000
--- a/src/RX.h
+++ /dev/null
@@ -1,58 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_RX
-#define INCLUDED_RX
-
-#include <string>
-#include <vector>
-#include <regex.h>
-
-class RX
-{
-public:
-  RX ();
-  RX (const std::string&, bool caseSensitive = true);
-  RX (const RX&);
-  ~RX ();
-  RX& operator= (const RX&);
-
-  bool match (const std::string&);
-  bool match (std::vector<std::string>&, const std::string&);
-  bool match (std::vector <int>&, std::vector <int>&, const std::string&);
-
-private:
-  void compile ();
-
-private:
-  bool _compiled       {false};
-  std::string _pattern {};
-  bool _case_sensitive {false};
-  regex_t _regex;
-};
-
-#endif
-
diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt
index 76ccdc0fc..0bfffc941 100644
--- a/src/columns/CMakeLists.txt
+++ b/src/columns/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
+                     ${CMAKE_SOURCE_DIR}/src/libshared/src
                      ${TASK_INCLUDE_DIRS})
 
 set (columns_SRCS Column.cpp Column.h
diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt
index 575e351e7..188a8ef81 100644
--- a/src/commands/CMakeLists.txt
+++ b/src/commands/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
+                     ${CMAKE_SOURCE_DIR}/src/libshared/src
                      ${TASK_INCLUDE_DIRS})
 
 set (commands_SRCS Command.cpp        Command.h
diff --git a/test/rx.t.cpp b/test/rx.t.cpp
deleted file mode 100644
index 134bacf97..000000000
--- a/test/rx.t.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <stdlib.h>
-#include <Context.h>
-#include <RX.h>
-#include <test.h>
-
-Context context;
-
-int main (int, char**)
-{
-  UnitTest ut (26);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  std::string text = "This is a test.";
-
-  RX r1 ("i. ", true);
-  ut.ok (r1.match (text), text + " =~ /i. /");
-
-  std::vector <std::string> matches;
-  ut.ok (r1.match (matches, text), text + " =~ /i. /");
-  ut.ok (matches.size () == 2, "2 match");
-  ut.is (matches[0], "is ", "$1 == is\\s");
-  ut.is (matches[1], "is ", "$1 == is\\s");
-
-  text = "abcdefghijklmnopqrstuvwxyz";
-
-  RX r3 ("t..", true);
-  ut.ok (r3.match (text), "t..");
-
-  RX r4 ("T..", false);
-  ut.ok (r4.match (text), "T..");
-
-  RX r5 ("T..", true);
-  ut.ok (!r5.match (text), "! T..");
-
-  text = "this is a test of the regex engine.";
-  //      |...:....|....:....|....:....|....:
-
-  RX r6 ("^this");
-  ut.ok (r6.match (text),      "^this matches");
-
-  RX r7 ("engine\\.$");
-  ut.ok (r7.match (text), "engine\\.$ matches");
-
-  std::vector <std::string> results;
-  std::vector <int> start;
-  std::vector <int> end;
-  RX r8 ("e..", true);
-  ut.ok (r8.match (results, text), "e.. there are matches");
-  ut.ok (r8.match (start, end, text), "e.. there are matches");
-  ut.is (results.size (), (size_t) 4, "e.. == 4 matches");
-  ut.is (results[0], "est", "e..[0] == 'est'");
-  ut.is (start[0],      11, "e..[0] == 11->");
-  ut.is (end[0],        14, "e..[0] == ->14");
-
-  results.clear ();
-  RX r9 ("e", true);
-  ut.ok (r9.match (results, text),           "e there are matches");
-  ut.is (results.size (), (size_t) 6,        "e == 6 matches");
-
-  start.clear ();
-  end.clear ();
-  ut.ok (r9.match (start, end, text),        "e there are matches");
-  ut.is (start.size (), (size_t) 6,          "e == 6 matches");
-
-#if defined(DARWIN) || defined(CYGWIN) || defined(FREEBSD) || defined(OPENBSD)
-  text = "this is the end.";
-  ut.pass (text + " =~ /\\bthe/");
-  ut.pass (text + " =~ /the\\b/");
-  ut.pass (text + " =~ /\\bthe\\b/");
-#elif defined(SOLARIS)
-  RX r10 ("\\<the");
-  text = "this is the end.";
-  ut.ok (r10.match (text), text + " =~ /\\<the/");
-
-  RX r11 ("the\\>");
-  ut.ok (r11.match (text), text + " =~ /the\\>/");
-
-  RX r12 ("\\<the\\>");
-  ut.ok (r12.match (text), text + " =~ /\\<the\\>/");
-#else
-  RX r10 ("\\bthe");
-  text = "this is the end.";
-  ut.ok (r10.match (text), text + " =~ /\\bthe/");
-
-  RX r11 ("the\\b");
-  ut.ok (r11.match (text), text + " =~ /the\\b/");
-
-  RX r12 ("\\bthe\\b");
-  ut.ok (r12.match (text), text + " =~ /\\bthe\\b/");
-#endif
-
-#if defined(DARWIN)
-  text = "D0";
-  RX r13 ("D\\d");
-  ut.ok (r13.match (text), text + " =~ /D\\d/");
-#else
-  ut.skip (" =~ /D\\d/");
-#endif
-
-  text = "D0";
-  RX r14 ("D[[:digit:]]");
-  ut.ok (r14.match (text), text + " =~ /D[[:digit:]]/");
-
-  text = "D0";
-  RX r15 ("D[0-9]");
-  ut.ok (r15.match (text), text + " =~ /D[0-9]/");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-

From db182f4612f27d3c1f6fc63db8f81f1473009ba6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:23:15 -0400
Subject: [PATCH 070/879] Tests: Removed RX tests

---
 test/.gitignore     | 1 -
 test/CMakeLists.txt | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/.gitignore b/test/.gitignore
index 368a48a6e..aae3c5865 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -18,7 +18,6 @@ lexer.t
 list.t
 msg.t
 nibbler.t
-rx.t
 t.t
 taskmod.t
 tdb2.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 411b61571..4bb26533e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,11 +10,12 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
+                     ${CMAKE_SOURCE_DIR}/src/libshared/src
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
 set (test_SRCS autocomplete.t col.t color.t config.t fs.t i18n.t json.t list.t
-               msg.t nibbler.t rx.t t.t tdb2.t text.t utf8.t util.t view.t
+               msg.t nibbler.t t.t tdb2.t text.t utf8.t util.t view.t
                json_test lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
                variant_equal.t variant_exp.t variant_gt.t variant_gte.t
@@ -32,7 +33,7 @@ add_custom_target (build_tests DEPENDS ${test_SRCS}
 
 foreach (src_FILE ${test_SRCS})
   add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
-  target_link_libraries (${src_FILE} task commands task columns ${TASK_LIBRARIES})
+  target_link_libraries (${src_FILE} task commands task columns libshared ${TASK_LIBRARIES})
 endforeach (src_FILE)
 
 configure_file(run_all run_all COPYONLY)

From 22baaecd14af6f5e438cb05b3b44caedba409c06 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:27:57 -0400
Subject: [PATCH 071/879] libshared: Integrated JSON

---
 src/CMakeLists.txt |   6 +-
 src/JSON.cpp       | 494 ---------------------------------------------
 src/JSON.h         | 135 -------------
 3 files changed, 4 insertions(+), 631 deletions(-)
 delete mode 100644 src/JSON.cpp
 delete mode 100644 src/JSON.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3d7880c5..231508ba1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library (task CLI2.cpp CLI2.h
                   FS.cpp FS.h
                   Hooks.cpp Hooks.h
                   ISO8601.cpp ISO8601.h
-                  JSON.cpp JSON.h
                   Lexer.cpp Lexer.h
                   Msg.cpp Msg.h
                   Nibbler.cpp Nibbler.h
@@ -40,7 +39,10 @@ add_library (task CLI2.cpp CLI2.h
                   util.cpp util.h
                   wcwidth6.cpp)
 
-add_library (libshared libshared/src/RX.cpp            libshared/src/RX.h)
+add_library (libshared libshared/src/JSON.cpp          libshared/src/JSON.h
+                       libshared/src/Pig.cpp           libshared/src/Pig.h
+                       libshared/src/RX.cpp            libshared/src/RX.h
+                       libshared/src/unicode.cpp       libshared/src/unicode.h)
 
 add_executable (task_executable main.cpp)
 add_executable (calc_executable calc.cpp)
diff --git a/src/JSON.cpp b/src/JSON.cpp
deleted file mode 100644
index a18256362..000000000
--- a/src/JSON.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <JSON.h>
-#include <text.h>
-#include <i18n.h>
-#include <utf8.h>
-
-const char *json_encode[] = {
-  "\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07",
-   "\\b",  "\\t",  "\\n", "\x0b",  "\\f",  "\\r", "\x0e", "\x0f",
-  "\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
-  "\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
-  "\x20", "\x21", "\\\"", "\x23", "\x24", "\x25", "\x26", "\x27",
-  "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x2d", "\x2e",  "\\/",
-  "\x30", "\x31", "\x32", "\x33", "\x34", "\x35", "\x36", "\x37",
-  "\x38", "\x39", "\x3a", "\x3b", "\x3c", "\x3d", "\x3e", "\x3f",
-  "\x40", "\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47",
-  "\x48", "\x49", "\x4a", "\x4b", "\x4c", "\x4d", "\x4e", "\x4f",
-  "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57",
-  "\x58", "\x59", "\x5a", "\x5b", "\\\\", "\x5d", "\x5e", "\x5f",
-  "\x60", "\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67",
-  "\x68", "\x69", "\x6a", "\x6b", "\x6c", "\x6d", "\x6e", "\x6f",
-  "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77",
-  "\x78", "\x79", "\x7a", "\x7b", "\x7c", "\x7d", "\x7e", "\x7f",
-  "\x80", "\x81", "\x82", "\x83", "\x84", "\x85", "\x86", "\x87",
-  "\x88", "\x89", "\x8a", "\x8b", "\x8c", "\x8d", "\x8e", "\x8f",
-  "\x90", "\x91", "\x92", "\x93", "\x94", "\x95", "\x96", "\x97",
-  "\x98", "\x99", "\x9a", "\x9b", "\x9c", "\x9d", "\x9e", "\x9f",
-  "\xa0", "\xa1", "\xa2", "\xa3", "\xa4", "\xa5", "\xa6", "\xa7",
-  "\xa8", "\xa9", "\xaa", "\xab", "\xac", "\xad", "\xae", "\xaf",
-  "\xb0", "\xb1", "\xb2", "\xb3", "\xb4", "\xb5", "\xb6", "\xb7",
-  "\xb8", "\xb9", "\xba", "\xbb", "\xbc", "\xbd", "\xbe", "\xbf",
-  "\xc0", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7",
-  "\xc8", "\xc9", "\xca", "\xcb", "\xcc", "\xcd", "\xce", "\xcf",
-  "\xd0", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7",
-  "\xd8", "\xd9", "\xda", "\xdb", "\xdc", "\xdd", "\xde", "\xdf",
-  "\xe0", "\xe1", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7",
-  "\xe8", "\xe9", "\xea", "\xeb", "\xec", "\xed", "\xee", "\xef",
-  "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", "\xf6", "\xf7",
-  "\xf8", "\xf9", "\xfa", "\xfb", "\xfc", "\xfd", "\xfe", "\xff"
-};
-
-////////////////////////////////////////////////////////////////////////////////
-json::value* json::value::parse (Nibbler& nibbler)
-{
-  json::value* v;
-  if ((v = json::object::parse  (nibbler)) ||
-      (v = json::array::parse   (nibbler)) ||
-      (v = json::string::parse  (nibbler)) ||
-      (v = json::number::parse  (nibbler)) ||
-      (v = json::literal::parse (nibbler)))
-    return v;
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::value::type ()
-{
-  return json::j_value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::value::dump () const
-{
-  return "<value>";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::string::string (const std::string& other)
-{
-  _data = other;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::string* json::string::parse (Nibbler& nibbler)
-{
-  std::string value;
-  if (nibbler.getQuoted ('"', value))
-  {
-    json::string* s = new json::string ();
-    s->_data = value;
-    return s;
-  }
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::string::type ()
-{
-  return json::j_string;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::string::dump () const
-{
-  return std::string ("\"") + _data + "\"";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::number* json::number::parse (Nibbler& nibbler)
-{
-  double d;
-  if (nibbler.getNumber (d))
-  {
-    json::number* s = new json::number ();
-    s->_dvalue = d;
-    return s;
-  }
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::number::type ()
-{
-  return json::j_number;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::number::dump () const
-{
-  return format (_dvalue);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::number::operator double () const
-{
-  return _dvalue;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::literal* json::literal::parse (Nibbler& nibbler)
-{
-  if (nibbler.getLiteral ("null"))
-  {
-    json::literal* s = new json::literal ();
-    s->_lvalue = nullvalue;
-    return s;
-  }
-  else if (nibbler.getLiteral ("false"))
-  {
-    json::literal* s = new json::literal ();
-    s->_lvalue = falsevalue;
-    return s;
-  }
-  else if (nibbler.getLiteral ("true"))
-  {
-    json::literal* s = new json::literal ();
-    s->_lvalue = truevalue;
-    return s;
-  }
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::literal::type ()
-{
-  return json::j_literal;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::literal::dump () const
-{
-       if (_lvalue == nullvalue)  return "null";
-  else if (_lvalue == falsevalue) return "false";
-  else                            return "true";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::array::~array ()
-{
-  for (auto& i : _data)
-    delete i;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::array* json::array::parse (Nibbler& nibbler)
-{
-  Nibbler n (nibbler);
-  n.skipWS ();
-  if (n.skip ('['))
-  {
-    n.skipWS ();
-
-    json::array* arr = new json::array ();
-
-    json::value* value;
-    if ((value = json::value::parse (n)))
-    {
-      arr->_data.push_back (value);
-      value = NULL; // Not a leak.  Looks like a leak.
-      n.skipWS ();
-      while (n.skip (','))
-      {
-        n.skipWS ();
-
-        if ((value = json::value::parse (n)))
-        {
-          arr->_data.push_back (value);
-          n.skipWS ();
-        }
-        else
-        {
-          delete arr;
-          throw format (STRING_JSON_MISSING_VALUE, (int) n.cursor ());
-        }
-      }
-    }
-
-    if (n.skip (']'))
-    {
-      nibbler = n;
-      return arr;
-    }
-    else
-      throw format (STRING_JSON_MISSING_BRACKET, (int) n.cursor ());
-
-    delete arr;
-  }
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::array::type ()
-{
-  return json::j_array;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::array::dump () const
-{
-  std::string output;
-  output += "[";
-
-  for (auto i = _data.begin (); i != _data.end (); ++i)
-  {
-    if (i != _data.begin ())
-      output += ",";
-
-    output += (*i)->dump ();
-  }
-
-  output += "]";
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::object::~object ()
-{
-  for (auto& i : _data)
-    delete i.second;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::object* json::object::parse (Nibbler& nibbler)
-{
-  Nibbler n (nibbler);
-  n.skipWS ();
-  if (n.skip ('{'))
-  {
-    n.skipWS ();
-
-    json::object* obj = new json::object ();
-
-    std::string name;
-    json::value* value;
-    if (json::object::parse_pair (n, name, value))
-    {
-      obj->_data.insert (std::pair <std::string, json::value*> (name, value));
-      value = NULL; // Not a leak.  Looks like a leak.
-
-      n.skipWS ();
-      while (n.skip (','))
-      {
-        n.skipWS ();
-
-        if (json::object::parse_pair (n, name, value))
-        {
-          obj->_data.insert (std::pair <std::string, json::value*> (name, value));
-          n.skipWS ();
-        }
-        else
-        {
-          delete obj;
-          throw format (STRING_JSON_MISSING_VALUE, (int) n.cursor ());
-        }
-      }
-    }
-
-    if (n.skip ('}'))
-    {
-      nibbler = n;
-      return obj;
-    }
-    else
-      throw format (STRING_JSON_MISSING_BRACE, (int) n.cursor ());
-
-    delete obj;
-  }
-
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool json::object::parse_pair (
-  Nibbler& nibbler,
-  std::string& name,
-  json::value*& val)
-{
-  Nibbler n (nibbler);
-
-  if (n.getQuoted ('"', name))
-  {
-    n.skipWS ();
-    if (n.skip (':'))
-    {
-      n.skipWS ();
-      if ((val = json::value::parse (n)))
-      {
-        nibbler = n;
-        return true;
-      }
-      else
-        throw format (STRING_JSON_MISSING_VALUE2, (int) n.cursor ());
-    }
-    else
-      throw format (STRING_JSON_MISSING_COLON, (int) n.cursor ());
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::jtype json::object::type ()
-{
-  return json::j_object;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::object::dump () const
-{
-  std::string output;
-  output += "{";
-
-  for (auto i = _data.begin (); i != _data.end (); ++i)
-  {
-    if (i != _data.begin ())
-      output += ",";
-
-    output += "\"" + i->first + "\":";
-    output += i->second->dump ();
-  }
-
-  output += "}";
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-json::value* json::parse (const std::string& input)
-{
-  json::value* root = NULL;
-
-  Nibbler n (input);
-  n.skipWS ();
-
-       if (n.next () == '{') root = json::object::parse (n);
-  else if (n.next () == '[') root = json::array::parse (n);
-  else
-    throw format (STRING_JSON_MISSING_OPEN, (int) n.cursor ());
-
-  // Check for end condition.
-  n.skipWS ();
-  if (!n.depleted ())
-  {
-    delete root;
-    throw format (STRING_JSON_EXTRA_CHARACTERS, (int) n.cursor ());
-  }
-
-  return root;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::encode (const std::string& input)
-{
-  std::string output;
-  output.reserve ((input.size () * 6) / 5);  // 20% increase.
-
-  auto last = input.begin ();
-  for (auto i = input.begin (); i != input.end (); ++i)
-  {
-    switch (*i)
-    {
-    // Simple translations.
-    case  '"':
-    case '\\':
-    case  '/':
-    case '\b':
-    case '\f':
-    case '\n':
-    case '\r':
-    case '\t':
-      output.append (last, i);
-      output += json_encode[(unsigned char)(*i)];
-      last = i + 1;
-
-    // Default NOP.
-    }
-  }
-
-  output.append (last, input.end ());
-
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string json::decode (const std::string& input)
-{
-  std::string output;
-  output.reserve (input.size ());  // Same size.
-
-  size_t pos = 0;
-
-  while (pos < input.length ())
-  {
-    if (input[pos] == '\\')
-    {
-      ++pos;
-      switch (input[pos])
-      {
-        // Simple translations.
-        case '"':  output += '"';  break;
-        case '\\': output += '\\'; break;
-        case '/':  output += '/';  break;
-        case 'b':  output += '\b'; break;
-        case 'f':  output += '\f'; break;
-        case 'n':  output += '\n'; break;
-        case 'r':  output += '\r'; break;
-        case 't':  output += '\t'; break;
-
-        // Compose a UTF8 unicode character.
-        case 'u':
-          output += utf8_character (utf8_codepoint (input.substr (++pos)));
-          pos += 3;
-          break;
-
-        // If it is an unrecognized sequence, do nothing.
-        default:
-          output += '\\';
-          output += input[pos];
-          break;
-      }
-      ++pos;
-    }
-    else
-    {
-      size_t next_backslash = input.find ('\\', pos);
-      output.append (input, pos, next_backslash - pos);
-      pos = next_backslash;
-    }
-  }
-
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/JSON.h b/src/JSON.h
deleted file mode 100644
index 3408b3a37..000000000
--- a/src/JSON.h
+++ /dev/null
@@ -1,135 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_JSON
-#define INCLUDED_JSON
-
-#include <map>
-#include <vector>
-#include <string>
-#include <Nibbler.h>
-
-namespace json
-{
-  enum jtype
-  {
-    j_value,    // 0
-    j_object,   // 1
-    j_array,    // 2
-    j_string,   // 3
-    j_number,   // 4
-    j_literal   // 5
-  };
-
-  class value
-  {
-  public:
-    value () {}
-    virtual ~value () {}
-    static value* parse (Nibbler&);
-    virtual jtype type ();
-    virtual std::string dump () const;
-  };
-
-  class string : public value
-  {
-  public:
-    string () {}
-    string (const std::string&);
-    ~string () {}
-    static string* parse (Nibbler&);
-    jtype type ();
-    std::string dump () const;
-
-  public:
-    std::string _data;
-  };
-
-  class number : public value
-  {
-  public:
-    number () : _dvalue (0.0) {}
-    ~number () {}
-    static number* parse (Nibbler&);
-    jtype type ();
-    std::string dump () const;
-    operator double () const;
-
-  public:
-    double _dvalue;
-  };
-
-  class literal : public value
-  {
-  public:
-    literal () : _lvalue (none) {}
-    ~literal () {}
-    static literal* parse (Nibbler&);
-    jtype type ();
-    std::string dump () const;
-
-  public:
-    enum literal_value {none, nullvalue, falsevalue, truevalue};
-    literal_value _lvalue;
-  };
-
-  class array : public value
-  {
-  public:
-    array () {}
-    ~array ();
-    static array* parse (Nibbler&);
-    jtype type ();
-    std::string dump () const;
-
-  public:
-    std::vector <value*> _data;
-  };
-
-  class object : public value
-  {
-  public:
-    object () {}
-    ~object ();
-    static object* parse (Nibbler&);
-    static bool parse_pair (Nibbler&, std::string&, value*&);
-    jtype type ();
-    std::string dump () const;
-
-  public:
-    std::map <std::string, value*> _data;
-  };
-
-  // Parser entry point.
-  value* parse (const std::string&);
-
-  // Encode/decode for JSON entities.
-  std::string encode (const std::string&);
-  std::string decode (const std::string&);
-}
-
-#endif
-////////////////////////////////////////////////////////////////////////////////

From 3cf4f337e751c155a0363280916412679dca8b2c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:28:15 -0400
Subject: [PATCH 072/879] Git: Now ignores liblibshared.a

---
 src/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/.gitignore b/src/.gitignore
index 6b6ab2aee..99a78c14e 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,3 +3,4 @@ Makefile.in
 debug
 calc
 lex
+liblibshared.a

From dbb22f506d34e7b7550767322e6174eaa292763e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:42:59 -0400
Subject: [PATCH 073/879] Tests: Removed JSON tests

---
 test/.gitignore         |   1 -
 test/CMakeLists.txt     |   4 +-
 test/json.t.cpp         | 189 ----------------------------------------
 test/json/1.json        |  23 -----
 test/json/2.json        |  11 ---
 test/json/3.json        |  26 ------
 test/json/4.json        |  88 -------------------
 test/json/5.json        |  27 ------
 test/json/6.json        |   2 -
 test/json/e1.json       |   1 -
 test/json/e2.json       |  30 -------
 test/json/e3.json       |   4 -
 test/json/e4.json       |  26 ------
 test/json/e5.json       |  70 ---------------
 test/json/e6.json       |  17 ----
 test/json/e7.json       |  34 --------
 test/json/e8.json       |  36 --------
 test/json/facebook.json |  44 ----------
 test/json/flikr.json    |  21 -----
 test/json/interop.json  |  41 ---------
 test/json/iphone.json   |  77 ----------------
 test/json/twitter.json  |  50 -----------
 test/json/youtube.json  |  53 -----------
 test/json_test.cpp      |  87 ------------------
 test/json_test.t        |  83 ------------------
 25 files changed, 2 insertions(+), 1043 deletions(-)
 delete mode 100644 test/json.t.cpp
 delete mode 100644 test/json/1.json
 delete mode 100644 test/json/2.json
 delete mode 100644 test/json/3.json
 delete mode 100644 test/json/4.json
 delete mode 100644 test/json/5.json
 delete mode 100644 test/json/6.json
 delete mode 100644 test/json/e1.json
 delete mode 100644 test/json/e2.json
 delete mode 100644 test/json/e3.json
 delete mode 100644 test/json/e4.json
 delete mode 100644 test/json/e5.json
 delete mode 100644 test/json/e6.json
 delete mode 100644 test/json/e7.json
 delete mode 100644 test/json/e8.json
 delete mode 100644 test/json/facebook.json
 delete mode 100644 test/json/flikr.json
 delete mode 100644 test/json/interop.json
 delete mode 100644 test/json/iphone.json
 delete mode 100644 test/json/twitter.json
 delete mode 100644 test/json/youtube.json
 delete mode 100644 test/json_test.cpp
 delete mode 100755 test/json_test.t

diff --git a/test/.gitignore b/test/.gitignore
index aae3c5865..dd2709758 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -13,7 +13,6 @@ fs.t
 i18n.t
 iso8601d.t
 iso8601p.t
-json.t
 lexer.t
 list.t
 msg.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4bb26533e..6a4d15834 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,9 +14,9 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t fs.t i18n.t json.t list.t
+set (test_SRCS autocomplete.t col.t color.t config.t fs.t i18n.t list.t
                msg.t nibbler.t t.t tdb2.t text.t utf8.t util.t view.t
-               json_test lexer.t iso8601d.t iso8601p.t eval.t dates.t
+               lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
                variant_equal.t variant_exp.t variant_gt.t variant_gte.t
                variant_inequal.t variant_lt.t variant_lte.t variant_match.t
diff --git a/test/json.t.cpp b/test/json.t.cpp
deleted file mode 100644
index 9c3a948ad..000000000
--- a/test/json.t.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <JSON.h>
-#include <test.h>
-#include <Context.h>
-
-Context context;
-
-const char *positive_tests[] =
-{
-  "{}",
-
-  "    {    }    ",
-
-  "[]",
-
-  "{\"one\":1}",
-
-  "{\n\"one\"\n:\n1\n}\n",
-
-  "  {  \"one\"  :  1  }  ",
-
-  "{\"name\":123, \"array\":[1,2,3.4], \"object\":{\"m1\":\"v1\", \"m2\":\"v2\"}}",
-
-  "{\"name\":\"value\",\"array\":[\"one\",\"two\"],\"object\":{\"name2\":123,\"literal\":false}}",
-
-  "{\n"
-    "\"ticket\": { \"type\":\"add\", \"client\":\"taskwarrior 2.x\"},\n"
-    "\"auth\":   { \"user\":\"paul\", \"org\":\"gbf\", \"key\":\".........\",\n"
-    "            \"locale\":\"en-US\" },\n"
-    "\n"
-    "\"add\":    { \"description\":\"Wash the dog\",\n"
-    "            \"project\":\"home\",\n"
-    "            \"due\":\"20101101T000000Z\" }\n"
-  "}",
-
-  "{"
-    "\"ticket\":{"
-      "\"type\":\"synch\","
-      "\"client\":\"taskd-test-suite 1.0\""
-    "},"
-    "\"synch\":{"
-      "\"user\":{"
-        "\"data\":["
-          "{"
-            "\"uuid\":\"11111111-1111-1111-1111-111111111111\","
-            "\"status\":\"pending\","
-            "\"description\":\"This is a test\","
-            "\"entry\":\"20110111T124000Z\""
-          "}"
-        "],"
-        "\"synch\":\"key\""
-      "}"
-    "},"
-    "\"auth\":{"
-      "\"org\":\"gbf\","
-      "\"user\":\"Paul Beckingham\","
-      "\"key\":\"K\","
-      "\"locale\":\"en-US\""
-    "}"
-  "}"
-};
-
-#define NUM_POSITIVE_TESTS (sizeof (positive_tests) / sizeof (positive_tests[0]))
-
-const char *negative_tests[] =
-{
-  "",
-  "{",
-  "}",
-  "[",
-  "]",
-  "foo",
-  "[?]"
-};
-
-#define NUM_NEGATIVE_TESTS (sizeof (negative_tests) / sizeof (negative_tests[0]))
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (NUM_POSITIVE_TESTS + NUM_NEGATIVE_TESTS + 22);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  // Positive tests.
-  for (unsigned int i = 0; i < NUM_POSITIVE_TESTS; ++i)
-  {
-    try
-    {
-      json::value* root = json::parse (positive_tests[i]);
-      t.ok (root, std::string ("positive: ") + positive_tests[i]);
-      if (root)
-      {
-        t.diag (root->dump ());
-        delete root;
-      }
-    }
-
-    catch (const std::string& e) { t.diag (e); }
-    catch (...)                  { t.diag ("Unknown error"); }
-  }
-
-  // Negative tests.
-  for (unsigned int i = 0; i < NUM_NEGATIVE_TESTS; ++i)
-  {
-    try
-    {
-      json::value* root = json::parse (negative_tests[i]);
-      t.is ((const char*) root, (const char*) NULL,
-            std::string ("negative: ") + negative_tests[i]);
-    }
-
-    catch (const std::string& e) { t.pass (e); }
-    catch (...)                  { t.fail ("Unknown error"); }
-  }
-
-  // Other tests.
-  try
-  {
-    // Regular unit tests.
-    t.is (json::encode ("1\b2"), "1\\b2",    "json::encode slashslashb -> slashslashslashslashb");
-    t.is (json::decode ("1\\b2"), "1\b2",    "json::decode slashslashslashslashb -> slashslashb");
-
-    t.is (json::encode ("1\n2"), "1\\n2",    "json::encode slashslashn -> slashslashslashslashn");
-    t.is (json::decode ("1\\n2"), "1\n2",    "json::decode slashslashslashslashn -> slashslashn");
-
-    t.is (json::encode ("1\r2"), "1\\r2",    "json::encode slashslashr -> slashslashslashslashr");
-    t.is (json::decode ("1\\r2"), "1\r2",    "json::decode slashslashslashslashr -> slashslashr");
-
-    t.is (json::encode ("1\t2"), "1\\t2",    "json::encode slashslasht -> slashslashslashslasht");
-    t.is (json::decode ("1\\t2"), "1\t2",    "json::decode slashslashslashslasht -> slashslasht");
-
-    t.is (json::encode ("1\\2"), "1\\\\2",   "json::encode slashslash -> slashslashslashslash");
-    t.is (json::decode ("1\\\\2"), "1\\2",   "json::decode slashslashslashslash -> slashslash");
-
-    t.is (json::encode ("1\x2"), "1\x2",     "json::encode slashslashx -> slashslashx(NOP)");
-    t.is (json::decode ("1\x2"), "1\x2",     "json::decode slashslashx -> slashslashx(NOP)");
-
-    t.is (json::encode ("1€2"), "1€2",       "json::encode € -> €");
-    t.is (json::decode ("1\\u20ac2"), "1€2", "json::decode slashslashu20ac -> €");
-
-    std::string encoded = json::encode ("one\\");
-    t.is (encoded, "one\\\\",                "json::encode oneslashslashslashslash -> oneslashslashslashslashslashslashslashslash");
-    t.is ((int)encoded.length (), 5,         "json::encode oneslashslashslashslash -> length 5");
-    t.is (encoded[0], 'o',                   "json::encode oneslashslashslashslash[0] -> o");
-    t.is (encoded[1], 'n',                   "json::encode oneslashslashslashslash[1] -> n");
-    t.is (encoded[2], 'e',                   "json::encode oneslashslashslashslash[2] -> e");
-    t.is (encoded[3], '\\',                  "json::encode oneslashslashslashslash[3] -> slashslash");
-    t.is (encoded[4], '\\',                  "json::encode oneslashslashslashslash[4] -> slashslash");
-
-    t.is (json::decode (encoded), "one\\",   "json::decode oneslashslashslashslashslashslashslashslash -> oneslashslashslashslash");
-  }
-
-  catch (const std::string& e) {t.diag (e);}
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/test/json/1.json b/test/json/1.json
deleted file mode 100644
index 81d48c0d1..000000000
--- a/test/json/1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-    "GlossDiv": {
-            "title": "S",
-      "GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-          "SortAs": "SGML",
-          "GlossTerm": "Standard Generalized Markup Language",
-          "Acronym": "SGML",
-          "Abbrev": "ISO 8879:1986",
-          "GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-            "GlossSeeAlso": ["GML", "XML"]
-                    },
-          "GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
-
diff --git a/test/json/2.json b/test/json/2.json
deleted file mode 100644
index 5600991a4..000000000
--- a/test/json/2.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"menu": {
-  "id": "file",
-  "value": "File",
-  "popup": {
-    "menuitem": [
-      {"value": "New", "onclick": "CreateNewDoc()"},
-      {"value": "Open", "onclick": "OpenDoc()"},
-      {"value": "Close", "onclick": "CloseDoc()"}
-    ]
-  }
-}}
diff --git a/test/json/3.json b/test/json/3.json
deleted file mode 100644
index 9b820d853..000000000
--- a/test/json/3.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": { 
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}    
diff --git a/test/json/4.json b/test/json/4.json
deleted file mode 100644
index 9eea6ad6e..000000000
--- a/test/json/4.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{"web-app": {
-  "servlet": [   
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
- 
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
diff --git a/test/json/5.json b/test/json/5.json
deleted file mode 100644
index 49980ca25..000000000
--- a/test/json/5.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
diff --git a/test/json/6.json b/test/json/6.json
deleted file mode 100644
index 8711288cb..000000000
--- a/test/json/6.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[{"styleFocus":"GROWTH","creationTime":"2008-01-21","preferences":{"kfe.elite-rankings":"hide","guitarPromoClosed":"1","kfe.last_viewed_feature":"1"},"nickName":"Pascal-Louis Perez","showFlag":true,"firstName":"Pascal-Louis","points":0,"id":8,"industryFocus":"TECHNOLOGY","externalIds":[{"platform":"FACEBOOK","id":219948}],"useRealName":true,"shard":8,"concentrationFocus":"LESS_THAN_10","passwordSalt":3567830610840546163,"validatedEmails":["pascal.louis.perez@gmail.com","pascal@kaching.com","pascal@cs.stanford.edu"],"city":"Geneve","rankLevel":"BASIC","experiences":["KACHING","DEVELOPMENT","LOGIN_SYSTEM","ADMIN","RESEARCH","RANKINGS"],"marketCapFocus":"LARGE","picture":"sqr8.jpg","interests":{"MY_WALL":["EMAIL"]},"nonValidatedEmails":["pascal.loui-s.perez@gmail.com"],"showPicture":true,"lastName":"Perez","tradingFrequencyFocus":"BUY_AND_HOLD","validatedPrimaryEmail":"pascal.louis.perez@gmail.com","country":"CH","sessions":[{"d":"p","parameters":{"facebookSessionKey":"a9f133eed207196a563b0ca7-219948","facebookUserId":"219948"},"k":"qOtXSepsfrc=","platform":"FACEBOOK"},{"d":"s","k":"O7p3i91IXa8="},{"d":"s","k":"fexhG/MSXr0="},{"d":"s","k":"YUkWZMK4ors="},{"d":"s","k":"ETfFsm0svdg="}],"primaryEmail":"pascal.louis.perez@gmail.com","investmentStrategy":"Hire people who can manage my assets for me. I'm lousy.","lastLogin":"2008-12-17 12:45:25.000","portfolioId":219948}]
-
diff --git a/test/json/e1.json b/test/json/e1.json
deleted file mode 100644
index 0dd16dd01..000000000
--- a/test/json/e1.json
+++ /dev/null
@@ -1 +0,0 @@
-[ 100, 500, 300, 200, 400 ]
diff --git a/test/json/e2.json b/test/json/e2.json
deleted file mode 100644
index c3e38240b..000000000
--- a/test/json/e2.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-	{
-		"color": "red",
-		"value": "#f00"
-	},
-	{
-		"color": "green",
-		"value": "#0f0"
-	},
-	{
-		"color": "blue",
-		"value": "#00f"
-	},
-	{
-		"color": "cyan",
-		"value": "#0ff"
-	},
-	{
-		"color": "magenta",
-		"value": "#f0f"
-	},
-	{
-		"color": "yellow",
-		"value": "#ff0"
-	},
-	{
-		"color": "black",
-		"value": "#000"
-	}
-]
diff --git a/test/json/e3.json b/test/json/e3.json
deleted file mode 100644
index 93fd18825..000000000
--- a/test/json/e3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"color": "red",
-	"value": "#f00"
-}
diff --git a/test/json/e4.json b/test/json/e4.json
deleted file mode 100644
index ef2b65474..000000000
--- a/test/json/e4.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"id": "0001",
-	"type": "donut",
-	"name": "Cake",
-	"ppu": 0.55,
-	"batters":
-		{
-			"batter":
-				[
-					{ "id": "1001", "type": "Regular" },
-					{ "id": "1002", "type": "Chocolate" },
-					{ "id": "1003", "type": "Blueberry" },
-					{ "id": "1004", "type": "Devil's Food" }
-				]
-		},
-	"topping":
-		[
-			{ "id": "5001", "type": "None" },
-			{ "id": "5002", "type": "Glazed" },
-			{ "id": "5005", "type": "Sugar" },
-			{ "id": "5007", "type": "Powdered Sugar" },
-			{ "id": "5006", "type": "Chocolate with Sprinkles" },
-			{ "id": "5003", "type": "Chocolate" },
-			{ "id": "5004", "type": "Maple" }
-		]
-}
diff --git a/test/json/e5.json b/test/json/e5.json
deleted file mode 100644
index 70ddac09a..000000000
--- a/test/json/e5.json
+++ /dev/null
@@ -1,70 +0,0 @@
-[
-	{
-		"id": "0001",
-		"type": "donut",
-		"name": "Cake",
-		"ppu": 0.55,
-		"batters":
-			{
-				"batter":
-					[
-						{ "id": "1001", "type": "Regular" },
-						{ "id": "1002", "type": "Chocolate" },
-						{ "id": "1003", "type": "Blueberry" },
-						{ "id": "1004", "type": "Devil's Food" }
-					]
-			},
-		"topping":
-			[
-				{ "id": "5001", "type": "None" },
-				{ "id": "5002", "type": "Glazed" },
-				{ "id": "5005", "type": "Sugar" },
-				{ "id": "5007", "type": "Powdered Sugar" },
-				{ "id": "5006", "type": "Chocolate with Sprinkles" },
-				{ "id": "5003", "type": "Chocolate" },
-				{ "id": "5004", "type": "Maple" }
-			]
-	},
-	{
-		"id": "0002",
-		"type": "donut",
-		"name": "Raised",
-		"ppu": 0.55,
-		"batters":
-			{
-				"batter":
-					[
-						{ "id": "1001", "type": "Regular" }
-					]
-			},
-		"topping":
-			[
-				{ "id": "5001", "type": "None" },
-				{ "id": "5002", "type": "Glazed" },
-				{ "id": "5005", "type": "Sugar" },
-				{ "id": "5003", "type": "Chocolate" },
-				{ "id": "5004", "type": "Maple" }
-			]
-	},
-	{
-		"id": "0003",
-		"type": "donut",
-		"name": "Old Fashioned",
-		"ppu": 0.55,
-		"batters":
-			{
-				"batter":
-					[
-						{ "id": "1001", "type": "Regular" },
-						{ "id": "1002", "type": "Chocolate" }
-					]
-			},
-		"topping":
-			[
-				{ "id": "5001", "type": "None" },
-				{ "id": "5002", "type": "Glazed" },
-				{ "id": "5003", "type": "Chocolate" },
-				{ "id": "5004", "type": "Maple" }
-			]
-	}
-]
diff --git a/test/json/e6.json b/test/json/e6.json
deleted file mode 100644
index e55e960fa..000000000
--- a/test/json/e6.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"id": "0001",
-	"type": "donut",
-	"name": "Cake",
-	"image":
-		{
-			"url": "images/0001.jpg",
-			"width": 200,
-			"height": 200
-		},
-	"thumbnail":
-		{
-			"url": "images/thumbnails/0001.jpg",
-			"width": 32,
-			"height": 32
-		}
-}
diff --git a/test/json/e7.json b/test/json/e7.json
deleted file mode 100644
index adbd088e7..000000000
--- a/test/json/e7.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"items":
-		{
-			"item":
-				[
-					{
-						"id": "0001",
-						"type": "donut",
-						"name": "Cake",
-						"ppu": 0.55,
-						"batters":
-							{
-								"batter":
-									[
-										{ "id": "1001", "type": "Regular" },
-										{ "id": "1002", "type": "Chocolate" },
-										{ "id": "1003", "type": "Blueberry" },
-										{ "id": "1004", "type": "Devil's Food" }
-									]
-							},
-						"topping":
-							[
-								{ "id": "5001", "type": "None" },
-								{ "id": "5002", "type": "Glazed" },
-								{ "id": "5005", "type": "Sugar" },
-								{ "id": "5007", "type": "Powdered Sugar" },
-								{ "id": "5006", "type": "Chocolate with Sprinkles" },
-								{ "id": "5003", "type": "Chocolate" },
-								{ "id": "5004", "type": "Maple" }
-							]
-					}
-				]
-		}
-}
diff --git a/test/json/e8.json b/test/json/e8.json
deleted file mode 100644
index 468c919b4..000000000
--- a/test/json/e8.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"items":
-		{
-			"item":
-				[
-					{
-						"id": "0001",
-						"type": "donut",
-						"name": "Cake",
-						"ppu": 0.55,
-						"batters":
-							{
-								"batter":
-									[
-										{ "id": "1001", "type": "Regular" },
-										{ "id": "1002", "type": "Chocolate" },
-										{ "id": "1003", "type": "Blueberry" },
-										{ "id": "1004", "type": "Devil's Food" }
-									]
-							},
-						"topping":
-							[
-								{ "id": "5001", "type": "None" },
-								{ "id": "5002", "type": "Glazed" },
-								{ "id": "5005", "type": "Sugar" },
-								{ "id": "5007", "type": "Powdered Sugar" },
-								{ "id": "5006", "type": "Chocolate with Sprinkles" },
-								{ "id": "5003", "type": "Chocolate" },
-								{ "id": "5004", "type": "Maple" }
-							]
-					}
-
-
-				]
-		}
-}
diff --git a/test/json/facebook.json b/test/json/facebook.json
deleted file mode 100644
index 6627bf8df..000000000
--- a/test/json/facebook.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-   "data": [
-      {
-         "id": "X999_Y999",
-         "from": {
-            "name": "Tom Brady", "id": "X12"
-         },
-         "message": "Looking forward to 2010!",
-         "actions": [
-            {
-               "name": "Comment",
-               "link": "http://www.facebook.com/X999/posts/Y999"
-            },
-            {
-               "name": "Like",
-               "link": "http://www.facebook.com/X999/posts/Y999"
-            }
-         ],
-         "type": "status",
-         "created_time": "2010-08-02T21:27:44+0000",
-         "updated_time": "2010-08-02T21:27:44+0000"
-      },
-      {
-         "id": "X998_Y998",
-         "from": {
-            "name": "Peyton Manning", "id": "X18"
-         },
-         "message": "Where's my contract?",
-         "actions": [
-            {
-               "name": "Comment",
-               "link": "http://www.facebook.com/X998/posts/Y998"
-            },
-            {
-               "name": "Like",
-               "link": "http://www.facebook.com/X998/posts/Y998"
-            }
-         ],
-         "type": "status",
-         "created_time": "2010-08-02T21:27:44+0000",
-         "updated_time": "2010-08-02T21:27:44+0000"
-      }
-   ]
-}
diff --git a/test/json/flikr.json b/test/json/flikr.json
deleted file mode 100644
index 710db0c71..000000000
--- a/test/json/flikr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "title": "Talk On Travel Pool",
-    "link": "http://www.flickr.com/groups/talkontravel/pool/",
-    "description": "Travel and vacation photos from around the world.",
-    "modified": "2009-02-02T11:10:27Z",
-    "generator": "http://www.flickr.com/",
-    "items": [
-            {
-            "title": "View from the hotel",
-            "link": "http://www.flickr.com/photos/33112458@N08/3081564649/in/pool-998875@N22",
-            "media": {"m":"http://farm4.static.flickr.com/3037/3081564649_4a6569750c_m.jpg"},
-            "date_taken": "2008-12-04T04:43:03-08:00",
-            "description": "<p><a href=\"http://www.flickr.com/people/33112458@N08/\"> Talk On Travel<\/a> has added a photo to the pool:<\/p> <p><a href=\"http:// www.flickr.com/photos/33112458@N08/3081564649/\" title=\"View from the hotel\"> <img src=\"http://farm4.static.flickr.com/3037/3081564649_4a6569750c_m.jpg\" width=\"240\" height=\"180\" alt=\"View from the hotel\" /><\/a><\/p> ",
-            "published": "2008-12-04T12:43:03Z",
-            "author": "nobody@flickr.com (Talk On Travel)",
-            "author_id": "33112458@N08",
-            "tags": "spain dolphins tenerife canaries lagomera aqualand playadelasamericas junglepark losgigantos loscristines talkontravel"
-            }
-    ]
-}
-
diff --git a/test/json/interop.json b/test/json/interop.json
deleted file mode 100644
index 5d680f627..000000000
--- a/test/json/interop.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "ResultSet": {
-        "totalResultsAvailable": "1827221",
-        "totalResultsReturned": 2,
-        "firstResultPosition": 1,
-        "Result": [
-            {
-                "Title": "potato jpg",
-                "Summary": "Kentang Si bungsu dari keluarga Solanum tuberosum L ini ternyata memiliki khasiat untuk mengurangi kerutan  jerawat  bintik hitam dan kemerahan pada kulit  Gunakan seminggu sekali sebagai",
-                "Url": "http:\/\/www.mediaindonesia.com\/spaw\/uploads\/images\/potato.jpg",
-                "ClickUrl": "http:\/\/www.mediaindonesia.com\/spaw\/uploads\/images\/potato.jpg",
-                "RefererUrl": "http:\/\/www.mediaindonesia.com\/mediaperempuan\/index.php?ar_id=Nzkw",
-                "FileSize": 22630,
-                "FileFormat": "jpeg",
-                "Height": "362",
-                "Width": "532",
-                "Thumbnail": {
-                    "Url": "http:\/\/thm-a01.yimg.com\/nimage\/557094559c18f16a",
-                    "Height": "98",
-                    "Width": "145"
-                }
-            },
-            {
-                "Title": "potato jpg",
-                "Summary": "Introduction of puneri aloo This is a traditional potato preparation flavoured with curry leaves and peanuts and can be eaten on fasting day  Preparation time   10 min",
-                "Url": "http:\/\/www.infovisual.info\/01\/photo\/potato.jpg",
-                "ClickUrl": "http:\/\/www.infovisual.info\/01\/photo\/potato.jpg",
-                "RefererUrl": "http:\/\/sundayfood.com\/puneri-aloo-indian-%20recipe",
-                "FileSize": 119398,
-                "FileFormat": "jpeg",
-                "Height": "685",
-                "Width": "1024",
-                "Thumbnail": {
-                    "Url": "http:\/\/thm-a01.yimg.com\/nimage\/7fa23212efe84b64",
-                    "Height": "107",
-                    "Width": "160"
-                }
-            }
-        ]
-    }
-}
diff --git a/test/json/iphone.json b/test/json/iphone.json
deleted file mode 100644
index 08dcdf40a..000000000
--- a/test/json/iphone.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "menu": {
-        "header": "xProgress SVG Viewer",
-        "items": [
-            {
-                "id": "Open"
-            },
-            {
-                "id": "OpenNew",
-                "label": "Open New"
-            },
-            null,
-            {
-                "id": "ZoomIn",
-                "label": "Zoom In"
-            },
-            {
-                "id": "ZoomOut",
-                "label": "Zoom Out"
-            },
-            {
-                "id": "OriginalView",
-                "label": "Original View"
-            },
-            null,
-            {
-                "id": "Quality"
-            },
-            {
-                "id": "Pause"
-            },
-            {
-                "id": "Mute"
-            },
-            null,
-            {
-                "id": "Find",
-                "label": "Find..."
-            },
-            {
-                "id": "FindAgain",
-                "label": "Find Again"
-            },
-            {
-                "id": "Copy"
-            },
-            {
-                "id": "CopyAgain",
-                "label": "Copy Again"
-            },
-            {
-                "id": "CopySVG",
-                "label": "Copy SVG"
-            },
-            {
-                "id": "ViewSVG",
-                "label": "View SVG"
-            },
-            {
-                "id": "ViewSource",
-                "label": "View Source"
-            },
-            {
-                "id": "SaveAs",
-                "label": "Save As"
-            },
-            null,
-            {
-                "id": "Help"
-            },
-            {
-                "id": "About",
-                "label": "About xProgress CVG Viewer..."
-            }
-        ]
-    }
-}
diff --git a/test/json/twitter.json b/test/json/twitter.json
deleted file mode 100644
index bfbf99087..000000000
--- a/test/json/twitter.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{"results":[
- 
-     {"text":"@twitterapi  http:\/\/tinyurl.com\/ctrefg",
- 
-     "to_user_id":396524,
- 
-     "to_user":"TwitterAPI",
- 
-     "from_user":"jkoum",
- 
-     "metadata":
- 
-     {
- 
-      "result_type":"popular",
- 
-      "recent_retweets": 109
- 
-     },
- 
-     "id":1478555574,   
- 
-     "from_user_id":1833773,
- 
-     "iso_language_code":"nl",
- 
-     "source":"<a href=\"http:\/\/twitter.com\/\">twitter<\/a>",
- 
-     "profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/118412707\/2522215727_a5f07da155_b_normal.jpg",
- 
-     "created_at":"Wed, 08 Apr 2009 19:22:10 +0000"}
- 
-     ],
- 
-     "since_id":0,
- 
-     "max_id":1480307926,
- 
-     "refresh_url":"?since_id=1480307926&q=%40twitterapi",
- 
-     "results_per_page":15,
- 
-     "next_page":"?page=2&max_id=1480307926&q=%40twitterapi",
- 
-     "completed_in":0.031704,
- 
-     "page":1,
- 
-     "query":"%40twitterapi"
-}
diff --git a/test/json/youtube.json b/test/json/youtube.json
deleted file mode 100644
index 7e97ee6a8..000000000
--- a/test/json/youtube.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{"apiVersion":"2.0",
- "data":{
-    "updated":"2010-01-07T19:58:42.949Z",
-    "totalItems":800,
-    "startIndex":1,
-    "itemsPerPage":1,
-    "items":[
-        {"id":"hYB0mn5zh2c",
-         "uploaded":"2007-06-05T22:07:03.000Z",
-         "updated":"2010-01-07T13:26:50.000Z",
-         "uploader":"GoogleDeveloperDay",
-         "category":"News",
-         "title":"Google Developers Day US - Maps API Introduction",
-         "description":"Google Maps API Introduction ...",
-         "tags":[
-            "GDD07","GDD07US","Maps"
-         ],
-         "thumbnail":{
-            "default":"http://i.ytimg.com/vi/hYB0mn5zh2c/default.jpg",
-            "hqDefault":"http://i.ytimg.com/vi/hYB0mn5zh2c/hqdefault.jpg"
-         },
-         "player":{
-            "default":"http://www.youtube.com/watch?v\u003dhYB0mn5zh2c"
-         },
-         "content":{
-            "1":"rtsp://v5.cache3.c.youtube.com/CiILENy.../0/0/0/video.3gp",
-            "5":"http://www.youtube.com/v/hYB0mn5zh2c?f...",
-            "6":"rtsp://v1.cache1.c.youtube.com/CiILENy.../0/0/0/video.3gp"
-         },
-         "duration":2840,
-         "aspectRatio":"widescreen",
-         "rating":4.63,
-         "ratingCount":68,
-         "viewCount":220101,
-         "favoriteCount":201,
-         "commentCount":22,
-         "status":{
-            "value":"restricted",
-            "reason":"limitedSyndication"
-         },
-         "accessControl":{
-            "syndicate":"allowed",
-            "commentVote":"allowed",
-            "rate":"allowed",
-            "list":"allowed",
-            "comment":"allowed",
-            "embed":"allowed",
-            "videoRespond":"moderated"
-         }
-        }
-    ]
- }
-}
diff --git a/test/json_test.cpp b/test/json_test.cpp
deleted file mode 100644
index 0a1879b17..000000000
--- a/test/json_test.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <FS.h>
-#include <JSON.h>
-#include <Context.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int argc, char** argv)
-{
-  if (argc == 1)
-  {
-    std::cout << "\nUsage: json_test [-q] <file | JSON> ...\n"
-              << "\n"
-              << "      -q        quiet, no JSON dump\n"
-              << "      <file>    file containing JSON\n"
-              << "      <JSON>    JSON string, may need to be quoted\n"
-              << "\n";
-    return 0;
-  }
-
-  bool quiet = false;
-  for (int i = 1; i < argc; ++i)
-    if (!strcmp (argv[i], "-q"))
-      quiet = true;
-
-  for (int i = 1; i < argc; ++i)
-  {
-    if (strcmp (argv[i], "-q"))
-    {
-      try
-      {
-        json::value* root;
-        File file (argv[i]);
-        if (file.exists ())
-        {
-          std::string contents;
-          file.read (contents);
-          root = json::parse (contents);
-        }
-        else
-          root = json::parse (argv[i]);
-
-        if (root && !quiet)
-          std::cout << root->dump () << "\n";
-
-        delete root;
-      }
-
-      catch (const std::string& e) { std::cout << e << "\n";         }
-      catch (...)                  { std::cout << "Unknown error\n"; }
-    }
-  }
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/test/json_test.t b/test/json_test.t
deleted file mode 100755
index a1f566b2f..000000000
--- a/test/json_test.t
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python2.7
-# -*- coding: utf-8 -*-
-###############################################################################
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# http://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-import sys
-import os
-import unittest
-from glob import glob
-# Ensure python finds the local simpletap module
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import TestCase
-from basetest.utils import CURRENT_DIR, run_cmd_wait_nofail
-from basetest.meta import MetaTest
-
-
-class MetaTestJson(MetaTest):
-    """Helper metaclass to simplify test logic below (TestJson)
-
-    Creates test_methods in the TestCase class dynamically named after the
-    arguments used.
-    """
-    @staticmethod
-    def make_function(classname, *args, **kwargs):
-        filepath = args[0]
-        TEST_BIN = kwargs.get("TEST_BIN")
-
-        def test(self):
-            # ### Body of the usual test_testcase ### #
-            cmd = (TEST_BIN, filepath)
-            code, out, err = run_cmd_wait_nofail(cmd)
-
-            self.assertNotIn("Error", out)
-
-        filename = os.path.basename(filepath)
-
-        # Title of test in report
-        test.__doc__ = "{0} {1}".format(classname, filename)
-
-        return test
-
-
-class TestJsonParsing(TestCase):
-    __metaclass__ = MetaTestJson
-
-    EXTRA = {}
-    EXTRA["TEST_DIR"] = os.path.abspath(os.path.join(CURRENT_DIR, ".."))
-    EXTRA["TEST_BIN"] = os.path.join(EXTRA["TEST_DIR"], "json_test")
-
-    TESTS = (
-        zip(glob(os.path.join(EXTRA["TEST_DIR"], "json/*.json")))
-    )
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python

From a7900205e5e3fb9a81f509e9116953228df06e83 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:48:21 -0400
Subject: [PATCH 074/879] Tests: Removed redundant format tests

---
 test/.gitignore     |  1 -
 test/CMakeLists.txt |  2 +-
 test/i18n.t.cpp     | 81 ---------------------------------------------
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 test/i18n.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index dd2709758..9aaaafcec 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -10,7 +10,6 @@ config.t
 dates.t
 eval.t
 fs.t
-i18n.t
 iso8601d.t
 iso8601p.t
 lexer.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6a4d15834..b68ab046b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t fs.t i18n.t list.t
+set (test_SRCS autocomplete.t col.t color.t config.t fs.t list.t
                msg.t nibbler.t t.t tdb2.t text.t utf8.t util.t view.t
                lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
diff --git a/test/i18n.t.cpp b/test/i18n.t.cpp
deleted file mode 100644
index 8127c9dc8..000000000
--- a/test/i18n.t.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <string>
-#include <unistd.h>
-#include <stdarg.h>
-
-#include <Context.h>
-#include <text.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (11);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  try
-  {
-    t.is (format ("pre {1} post",    "mid"),        "pre mid post",    "format 1a");
-    t.is (format ("pre {1}{1} post", "mid"),        "pre midmid post", "format 1b");
-    t.is (format ("pre {1} post",    0),            "pre 0 post",      "format 1c");
-    t.is (format ("pre {1}{1} post", 0),            "pre 00 post",     "format 1d");
-
-    t.is (format ("pre {1}{2} post", "one", "two"), "pre onetwo post", "format 2a");
-    t.is (format ("pre {2}{1} post", "one", "two"), "pre twoone post", "format 2b");
-    t.is (format ("pre {1}{2} post", "one", 2),     "pre one2 post",   "format 2c");
-    t.is (format ("pre {1}{2} post", 1, "two"),     "pre 1two post",   "format 2d");
-    t.is (format ("pre {1}{2} post", 1, 2),         "pre 12 post",     "format 2e");
-
-    t.is (format ("pre {1}{2}{3} post", "one", "two", "three"), "pre onetwothree post", "format 3a");
-    t.is (format ("pre {3}{1}{2} post", "one", "two", "three"), "pre threeonetwo post", "format 3b");
-  }
-
-  catch (const std::string& error)
-  {
-    t.diag (error);
-    return -1;
-  }
-
-  catch (...)
-  {
-    t.diag ("Unknown error.");
-    return -2;
-  }
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 9a63bd5d6fabe78b9e75c52a9c1bc2158ceda4d2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:50:14 -0400
Subject: [PATCH 075/879] Tests: Removed redundant listt tests

---
 test/.gitignore     |  1 -
 test/CMakeLists.txt |  2 +-
 test/list.t.cpp     | 76 ---------------------------------------------
 3 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 test/list.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 9aaaafcec..4ea817725 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -13,7 +13,6 @@ fs.t
 iso8601d.t
 iso8601p.t
 lexer.t
-list.t
 msg.t
 nibbler.t
 t.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b68ab046b..d736af423 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t fs.t list.t
+set (test_SRCS autocomplete.t col.t color.t config.t fs.t
                msg.t nibbler.t t.t tdb2.t text.t utf8.t util.t view.t
                lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
diff --git a/test/list.t.cpp b/test/list.t.cpp
deleted file mode 100644
index 92c71d10a..000000000
--- a/test/list.t.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <main.h>
-#include <test.h>
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (8);
-
-  // 1,2,3  <=>  2,3,4
-  std::vector <std::string> string_one {"1", "2", "3"};
-  std::vector <std::string> string_two {"2", "3", "4"};
-  std::vector <std::string> string_three {"2", "3", "4"};
-  std::vector <std::string> string_four;
-
-  // What are the differences?
-  std::vector<std::string> string_leftOnly;
-  std::vector<std::string> string_rightOnly;
-  listDiff (string_one, string_two, string_leftOnly, string_rightOnly);
-  t.is ((int) string_leftOnly.size (), 1, "std::string (1,2,3) <=> (2,3,4) = 1<-");
-  t.is (string_leftOnly[0], "1",          "std::string (1,2,3) <=> (2,3,4) = 1<-");
-
-  t.is ((int) string_rightOnly.size (), 1, "std::string (1,2,3) <=> (2,3,4) = ->4");
-  t.is (string_rightOnly[0], "4",          "std::string (1,2,3) <=> (2,3,4) = ->4");
-
-  // Now do it all again, with integers.
-
-  // 1,2,3  <=>  2,3,4
-  std::vector <int> int_one {1, 2, 3};
-  std::vector <int> int_two {2, 3, 4};
-  std::vector <int> int_three {2, 3, 4};
-  std::vector <int> int_four;
-
-  // What are the differences?
-  std::vector<int> int_leftOnly;
-  std::vector<int> int_rightOnly;
-  listDiff (int_one, int_two, int_leftOnly, int_rightOnly);
-  t.is ((int) int_leftOnly.size (), 1, "int (1,2,3) <=> (2,3,4) = 1<-");
-  t.is (int_leftOnly[0], "1",          "int (1,2,3) <=> (2,3,4) = 1<-");
-
-  t.is ((int) int_rightOnly.size (), 1, "int (1,2,3) <=> (2,3,4) = ->4");
-  t.is (int_rightOnly[0], "4",          "int (1,2,3) <=> (2,3,4) = ->4");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-

From 1ca91b9e0c443ffc61bae79c5859fa383866ce3b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:52:20 -0400
Subject: [PATCH 076/879] libshared: Integrated utf8, wcwidth

---
 src/CMakeLists.txt |   8 +-
 src/utf8.cpp       | 296 ---------------------------------------------
 src/utf8.h         |  45 -------
 src/wcwidth6.cpp   | 211 --------------------------------
 4 files changed, 4 insertions(+), 556 deletions(-)
 delete mode 100644 src/utf8.cpp
 delete mode 100644 src/utf8.h
 delete mode 100644 src/wcwidth6.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 231508ba1..2638d2959 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,14 +35,14 @@ add_library (task CLI2.cpp CLI2.h
                   rules.cpp
                   sort.cpp
                   text.cpp text.h
-                  utf8.cpp utf8.h
-                  util.cpp util.h
-                  wcwidth6.cpp)
+                  util.cpp util.h)
 
 add_library (libshared libshared/src/JSON.cpp          libshared/src/JSON.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
-                       libshared/src/unicode.cpp       libshared/src/unicode.h)
+                       libshared/src/unicode.cpp       libshared/src/unicode.h
+                       libshared/src/utf8.cpp          libshared/src/utf8.h
+                       libshared/src/wcwidth6.cpp)
 
 add_executable (task_executable main.cpp)
 add_executable (calc_executable calc.cpp)
diff --git a/src/utf8.cpp b/src/utf8.cpp
deleted file mode 100644
index 34b4fabf1..000000000
--- a/src/utf8.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <utf8.h>
-#include <string>
-
-////////////////////////////////////////////////////////////////////////////////
-// Converts '0'     -> 0
-//          '9'     -> 9
-//          'a'/'A' -> 10
-//          'f'/'F' -> 15
-#define XDIGIT(x) ((x) >= '0' && (x) <= '9' ? ((x) - '0') : \
-                   (x) >= 'a' && (x) <= 'f' ? ((x) + 10 - 'a') : \
-                   (x) >= 'A' && (x) <= 'F' ? ((x) + 10 - 'A') : 0)
-
-////////////////////////////////////////////////////////////////////////////////
-// Note: Assumes 4-digit hex codepoints:
-//         xxxx
-//         \uxxxx
-//         U+xxxx
-unsigned int utf8_codepoint (const std::string& input)
-{
-  unsigned int codepoint = 0;
-  int length = input.length ();
-
-  // U+xxxx, \uxxxx
-  if (length >= 6 &&
-      ((input[0] == 'U'  && input[1] == '+') ||
-       (input[0] == '\\' && input[1] == 'u')))
-  {
-    codepoint = XDIGIT (input[2]) << 12 |
-                XDIGIT (input[3]) <<  8 |
-                XDIGIT (input[4]) <<  4 |
-                XDIGIT (input[5]);
-  }
-  else if (length >= 4)
-  {
-    codepoint = XDIGIT (input[0]) << 12 |
-                XDIGIT (input[1]) <<  8 |
-                XDIGIT (input[2]) <<  4 |
-                XDIGIT (input[3]);
-  }
-
-  return codepoint;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Iterates along a UTF8 string.
-//   - argument i counts bytes advanced through the string
-//   - returns the next character
-unsigned int utf8_next_char (const std::string& input, std::string::size_type& i)
-{
-  if (input[i] == '\0')
-    return 0;
-
-  // How many bytes in the sequence?
-  int length = utf8_sequence (input[i]);
-  i += length;
-
-  // 0xxxxxxx -> 0xxxxxxx
-  if (length == 1)
-    return input[i - 1];
-
-  // 110yyyyy 10xxxxxx -> 00000yyy yyxxxxxx
-  if (length == 2)
-    return ((input[i - 2] & 0x1F) << 6) +
-            (input[i - 1] & 0x3F);
-
-  // 1110zzzz 10yyyyyy 10xxxxxx -> zzzzyyyy yyxxxxxx
-  if (length == 3)
-    return ((input[i - 3] & 0xF)  << 12) +
-           ((input[i - 2] & 0x3F) <<  6) +
-            (input[i - 1] & 0x3F);
-
-  // 11110www 10zzzzzz 10yyyyyy 10xxxxxx -> 000wwwzz zzzzyyyy yyxxxxxx
-  if (length == 4)
-    return ((input[i - 4] & 0x7)  << 18) +
-           ((input[i - 3] & 0x3F) << 12) +
-           ((input[i - 2] & 0x3F) <<  6) +
-            (input[i - 1] & 0x3F);
-
-  // Default: pretend as though it's a single character.
-  // TODO Or should this throw?
-  return input[i - 1];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// http://en.wikipedia.org/wiki/UTF-8
-std::string utf8_character (unsigned int codepoint)
-{
-  char sequence[5] {};
-
-  // 0xxxxxxx -> 0xxxxxxx
-  if (codepoint < 0x80)
-  {
-    sequence[0] = codepoint;
-  }
-
-  // 00000yyy yyxxxxxx -> 110yyyyy 10xxxxxx
-  else if (codepoint < 0x800)
-  {
-    sequence[0] = 0xC0 | (codepoint & 0x7C0) >> 6;
-    sequence[1] = 0x80 | (codepoint & 0x3F);
-  }
-
-  // zzzzyyyy yyxxxxxx -> 1110zzzz 10yyyyyy 10xxxxxx
-  else if (codepoint < 0x10000)
-  {
-    sequence[0] = 0xE0 | (codepoint & 0xF000) >> 12;
-    sequence[1] = 0x80 | (codepoint & 0xFC0)  >> 6;
-    sequence[2] = 0x80 | (codepoint & 0x3F);
-  }
-
-  // 000wwwzz zzzzyyyy yyxxxxxx -> 11110www 10zzzzzz 10yyyyyy 10xxxxxx
-  else if (codepoint < 0x110000)
-  {
-    sequence[0] = 0xF0 | (codepoint & 0x1C0000) >> 18;
-    sequence[1] = 0x80 | (codepoint & 0x03F000) >> 12;
-    sequence[2] = 0x80 | (codepoint & 0x0FC0)   >> 6;
-    sequence[3] = 0x80 | (codepoint & 0x3F);
-  }
-
-  return std::string (sequence);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int utf8_sequence (unsigned int character)
-{
-  if ((character & 0xE0) == 0xC0)
-    return 2;
-
-  if ((character & 0xF0) == 0xE0)
-    return 3;
-
-  if ((character & 0xF8) == 0xF0)
-    return 4;
-
-  return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Length of a string in characters.
-unsigned int utf8_length (const std::string& str)
-{
-  int byteLength = str.length ();
-  int charLength = byteLength;
-  const char* data = str.data ();
-
-  // Decrement the number of bytes for each byte that matches 0b10??????
-  // this way only the first byte of any utf8 sequence is counted.
-  for (int i = 0; i < byteLength; i++)
-  {
-    // Extract the first two bits and check whether they are 10
-    if ((data[i] & 0xC0) == 0x80)
-      charLength--;
-  }
-
-  return charLength;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Width of a string in character cells.
-unsigned int utf8_width (const std::string& str)
-{
-  unsigned int length = 0;
-  std::string::size_type i = 0;
-  unsigned int c;
-  while ((c = utf8_next_char (str, i)))
-  {
-    // Control characters, and more especially newline characters, make
-    // mk_wcwidth() return -1.  Ignore that, thereby "adding zero" to length.
-    // Since control characters are not displayed in reports, this is a valid
-    // choice.
-    int l = mk_wcwidth (c);
-    if (l != -1)
-      length += l;
-  }
-
-  return length;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned int utf8_text_length (const std::string& str)
-{
-  int byteLength = str.length ();
-  int charLength = byteLength;
-  const char* data = str.data ();
-  bool in_color = false;
-
-  // Decrement the number of bytes for each byte that matches 0b10??????
-  // this way only the first byte of any utf8 sequence is counted.
-  for (int i = 0; i < byteLength; i++)
-  {
-    if (in_color)
-    {
-      if (data[i] == 'm')
-        in_color = false;
-
-      --charLength;
-    }
-    else
-    {
-      if (data[i] == 033)
-      {
-        in_color = true;
-        --charLength;
-      }
-      else
-      {
-        // Extract the first two bits and check whether they are 10
-        if ((data[i] & 0xC0) == 0x80)
-          --charLength;
-      }
-    }
-  }
-
-  return charLength;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned int utf8_text_width (const std::string& str)
-{
-  bool in_color = false;
-
-  unsigned int length = 0;
-  std::string::size_type i = 0;
-  unsigned int c;
-  while ((c = utf8_next_char (str, i)))
-  {
-    if (in_color)
-    {
-      if (c == 'm')
-        in_color = false;
-    }  
-    else if (c == 033)
-    {
-      in_color = true;
-    }
-    else
-      length += mk_wcwidth (c);
-  }
-
-  return length;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string utf8_substr (
-  const std::string& input,
-  unsigned int start,
-  unsigned int length /* = 0 */)
-{
-  // Find the starting index.
-  std::string::size_type index_start = 0;
-  for (unsigned int i = 0; i < start; i++)
-    utf8_next_char (input, index_start);
-
-  std::string result;
-  if (length)
-  {
-    std::string::size_type index_end = index_start;
-    for (unsigned int i = 0; i < length; i++)
-      utf8_next_char (input, index_end);
-
-    result = input.substr (index_start, index_end - index_start);
-  }
-  else
-    result = input.substr (index_start);
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/utf8.h b/src/utf8.h
deleted file mode 100644
index bf0a9e3c8..000000000
--- a/src/utf8.h
+++ /dev/null
@@ -1,45 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_UTF8
-#define INCLUDED_UTF8
-
-#include <string>
-
-unsigned int utf8_codepoint (const std::string&);
-unsigned int utf8_next_char (const std::string&, std::string::size_type&);
-std::string utf8_character (unsigned int);
-int utf8_sequence (unsigned int);
-unsigned int utf8_length (const std::string&);
-unsigned int utf8_text_length (const std::string&);
-unsigned int utf8_width (const std::string& str);
-unsigned int utf8_text_width (const std::string&);
-const std::string utf8_substr (const std::string&, unsigned int, unsigned int length = 0);
-
-int mk_wcwidth (wchar_t);
-
-#endif
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/wcwidth6.cpp b/src/wcwidth6.cpp
deleted file mode 100644
index b26aa8f01..000000000
--- a/src/wcwidth6.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * This is an implementation of wcwidth() and wcswidth() (defined in
- * IEEE Std 1002.1-2001) for Unicode.
- *
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
- *
- * In fixed-width output devices, Latin characters all occupy a single
- * "cell" position of equal width, whereas ideographic CJK characters
- * occupy two such cells. Interoperability between terminal-line
- * applications and (teletype-style) character terminals using the
- * UTF-8 encoding requires agreement on which character should advance
- * the cursor by how many cell positions. No established formal
- * standards exist at present on which Unicode character shall occupy
- * how many cell positions on character terminals. These routines are
- * a first attempt of defining such behavior based on simple rules
- * applied to data provided by the Unicode Consortium.
- *
- * For some graphical characters, the Unicode standard explicitly
- * defines a character-cell width via the definition of the East Asian
- * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
- * In all these cases, there is no ambiguity about which width a
- * terminal shall use. For characters in the East Asian Ambiguous (A)
- * class, the width choice depends purely on a preference of backward
- * compatibility with either historic CJK or Western practice.
- * Choosing single-width for these characters is easy to justify as
- * the appropriate long-term solution, as the CJK practice of
- * displaying these characters as double-width comes from historic
- * implementation simplicity (8-bit encoded characters were displayed
- * single-width and 16-bit ones double-width, even for Greek,
- * Cyrillic, etc.) and not any typographic considerations.
- *
- * Much less clear is the choice of width for the Not East Asian
- * (Neutral) class. Existing practice does not dictate a width for any
- * of these characters. It would nevertheless make sense
- * typographically to allocate two character cells to characters such
- * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
- * represented adequately with a single-width glyph. The following
- * routines at present merely assign a single-cell width to all
- * neutral characters, in the interest of simplicity. This is not
- * entirely satisfactory and should be reconsidered before
- * establishing a formal standard in this area. At the moment, the
- * decision which Not East Asian (Neutral) characters should be
- * represented by double-width glyphs cannot yet be answered by
- * applying a simple rule from the Unicode database content. Setting
- * up a proper standard for the behavior of UTF-8 character terminals
- * will require a careful analysis not only of each Unicode character,
- * but also of each presentation form, something the author of these
- * routines has avoided to do so far.
- *
- * http://www.unicode.org/unicode/reports/tr11/
- *
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
- *
- * Permission to use, copy, modify, and distribute this software
- * for any purpose and without fee is hereby granted. The author
- * disclaims all warranties with regard to this software.
- *
- * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
- */
-
-#include <cmake.h>
-#include <wchar.h>
-
-struct interval {
-    int first;
-    int last;
-};
-
-/* auxiliary function for binary search in interval table */
-static int bisearch(wchar_t ucs, const struct interval *table, int max) {
-    int min = 0;
-    int mid;
-
-    if (ucs < table[0].first || ucs > table[max].last)
-        return 0;
-    while (max >= min) {
-        mid = (min + max) / 2;
-        if (ucs > table[mid].last)
-            min = mid + 1;
-        else if (ucs < table[mid].first)
-            max = mid - 1;
-        else
-            return 1;
-    }
-
-    return 0;
-}
-
-
-/* The following two functions define the column width of an ISO 10646
- * character as follows:
- *
- *    - The null character (U+0000) has a column width of 0.
- *
- *    - Other C0/C1 control characters and DEL will lead to a return
- *      value of -1.
- *
- *    - Non-spacing and enclosing combining characters (general
- *      category code Mn or Me in the Unicode database) have a
- *      column width of 0.
- *
- *    - SOFT HYPHEN (U+00AD) has a column width of 1.
- *
- *    - Other format characters (general category code Cf in the Unicode
- *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
- *
- *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
- *      have a column width of 0.
- *
- *    - Spacing characters in the East Asian Wide (W) or East Asian
- *      Full-width (F) category as defined in Unicode Technical
- *      Report #11 have a column width of 2.
- *
- *    - All remaining characters (including all printable
- *      ISO 8859-1 and WGL4 characters, Unicode control characters,
- *      etc.) have a column width of 1.
- *
- * This implementation assumes that wchar_t characters are encoded
- * in ISO 10646.
- */
-
-int mk_wcwidth(wchar_t ucs)
-{
-  /* sorted list of non-overlapping intervals of non-spacing characters */
-  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
-  static const struct interval combining[] = {
-    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
-    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
-    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
-    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
-    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
-    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
-    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
-    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
-    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
-    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
-    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
-    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
-    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
-    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
-    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
-    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
-    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
-    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
-    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
-    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
-    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
-    { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
-    { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
-    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
-    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
-    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
-    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
-    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
-    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
-    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
-    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
-    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
-    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
-    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
-    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
-    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
-    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
-    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
-    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
-    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
-    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
-    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
-    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
-    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
-    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
-    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
-    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
-    { 0xE0100, 0xE01EF }
-  };
-
-  /* test for 8-bit control characters */
-  if (ucs == 0)
-    return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-    return -1;
-
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, combining,
-         sizeof(combining) / sizeof(struct interval) - 1))
-    return 0;
-
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
-  return 1 +
-    (ucs >= 0x1100 &&
-     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
-      ucs == 0x2329 || ucs == 0x232a ||
-      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-       ucs != 0x303f) ||                  /* CJK ... Yi */
-      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-      (ucs >= 0xffe0 && ucs <= 0xffe6)
-#ifndef CYGWIN
-                                       ||
-      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-      (ucs >= 0x30000 && ucs <= 0x3fffd)
-#endif
-     )
-    );
-}
-

From d0251642bc45c693092588bd751d3bf1540e9254 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 17:54:18 -0400
Subject: [PATCH 077/879] Tests: Removed redundant utf8 tests

---
 test/.gitignore     |  1 -
 test/CMakeLists.txt |  2 +-
 test/utf8.t.cpp     | 98 ---------------------------------------------
 3 files changed, 1 insertion(+), 100 deletions(-)
 delete mode 100644 test/utf8.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 4ea817725..c01a7b026 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -20,7 +20,6 @@ taskmod.t
 tdb2.t
 text.t
 uri.t
-utf8.t
 util.t
 variant_add.t
 variant_and.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d736af423..6514cd447 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 set (test_SRCS autocomplete.t col.t color.t config.t fs.t
-               msg.t nibbler.t t.t tdb2.t text.t utf8.t util.t view.t
+               msg.t nibbler.t t.t tdb2.t text.t util.t view.t
                lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
                variant_equal.t variant_exp.t variant_gt.t variant_gte.t
diff --git a/test/utf8.t.cpp b/test/utf8.t.cpp
deleted file mode 100644
index 07bfdcb86..000000000
--- a/test/utf8.t.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <utf8.h>
-#include <test.h>
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (33);
-
-  std::string ascii_text            = "This is a test";
-  std::string utf8_text             = "más sábado miércoles";
-  std::string utf8_wide_text        = "改变各种颜色";
-
-  std::string ascii_text_color      = "This is a test";
-  std::string utf8_text_color       = "más sábado miércoles";
-  std::string utf8_wide_text_color  = "改变各种颜色";
-
-  // unsigned int utf8_codepoint (const std::string&);
-  t.is ((int) utf8_codepoint ("\\u0020"),              32, "\\u0020 --> ' '");
-  t.is ((int) utf8_codepoint ("U+0020"),               32, "U+0020 --> ' '");
-
-  // TODO unsigned int utf8_next_char (const std::string&, std::string::size_type&);
-  // TODO std::string utf8_character (unsigned int);
-  // TODO int utf8_sequence (unsigned int);
-
-  // unsigned int utf8_length (const std::string&);
-  t.is ((int) utf8_length (ascii_text),                14, "ASCII utf8_length");
-  t.is ((int) utf8_length (utf8_text),                 20, "UTF8 utf8_length");
-  t.is ((int) utf8_length (utf8_wide_text),             6, "UTF8 wide utf8_length");
-
-  // unsigned int utf8_width (const std::string&);
-  t.is ((int) utf8_width (ascii_text),                 14, "ASCII utf8_width");
-  t.is ((int) utf8_width (utf8_text),                  20, "UTF8 utf8_width");
-  t.is ((int) utf8_width (utf8_wide_text),             12, "UTF8 wide utf8_width");
-
-  // unsigned int utf8_text_length (const std::string&);
-  t.is ((int) utf8_text_length (ascii_text_color),     14, "ASCII utf8_text_length");
-  t.is ((int) utf8_text_length (utf8_text_color),      20, "UTF8 utf8_text_length");
-  t.is ((int) utf8_text_length (utf8_wide_text_color),  6, "UTF8 wide utf8_text_length");
-
-  // unsigned int utf8_text_width (const std::string&);
-  t.is ((int) utf8_text_width (ascii_text_color),      14, "ASCII utf8_text_width");
-  t.is ((int) utf8_text_width (utf8_text_color),       20, "UTF8 utf8_text_width");
-  t.is ((int) utf8_text_width (utf8_wide_text_color),  12, "UTF8 wide utf8_text_width");
-
-  // const std::string utf8_substr (const std::string&, unsigned int, unsigned int length = 0);
-  t.is (utf8_substr (ascii_text, 0, 2),                    "Th", "ASCII utf8_substr");
-  t.is (utf8_substr (utf8_text, 0, 2),                     "má", "UTF8 utf8_substr");
-  t.is (utf8_substr (utf8_wide_text, 0, 2),                "改变", "UTF8 wide utf8_substr");
-
-  // int mk_wcwidth (wchar_t);
-  t.is (mk_wcwidth ('a'),                               1, "mk_wcwidth U+0061 --> 1");
-  t.is (mk_wcwidth (0x5149),                            2, "mk_wcwidth U+5149 --> 2");
-  t.is (mk_wcwidth (0x9a8c),                            2, "mk_wcwidth U+9a8c --> 2");
-  t.is (mk_wcwidth (0x4e70),                            2, "mk_wcwidth U+4e70 --> 2");
-  t.is (mk_wcwidth (0x94b1),                            2, "mk_wcwidth U+94b1 --> 2");
-  t.is (mk_wcwidth (0x5305),                            2, "mk_wcwidth U+5305 --> 2");
-  t.is (mk_wcwidth (0x91cd),                            2, "mk_wcwidth U+91cd --> 2");
-  t.is (mk_wcwidth (0x65b0),                            2, "mk_wcwidth U+65b0 --> 2");
-  t.is (mk_wcwidth (0x8bbe),                            2, "mk_wcwidth U+8bbe --> 2");
-  t.is (mk_wcwidth (0x8ba1),                            2, "mk_wcwidth U+8ba1 --> 2");
-  t.is (mk_wcwidth (0x5411),                            2, "mk_wcwidth U+5411 --> 2");
-  t.is (mk_wcwidth (0x4e0a),                            2, "mk_wcwidth U+4e0a --> 2");
-  t.is (mk_wcwidth (0x4e0b),                            2, "mk_wcwidth U+4e0b --> 2");
-  t.is (mk_wcwidth (0x7bad),                            2, "mk_wcwidth U+7bad --> 2");
-  t.is (mk_wcwidth (0x5934),                            2, "mk_wcwidth U+5934 --> 2");
-  t.is (mk_wcwidth (0xff0c),                            2, "mk_wcwidth U+ff0c --> 2"); // comma
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 5de313272f5687342ada8267bdd92c88d25a4b92 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 18:09:36 -0400
Subject: [PATCH 078/879] libshared: Added Table

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2638d2959..fbbd676aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ add_library (task CLI2.cpp CLI2.h
 add_library (libshared libshared/src/JSON.cpp          libshared/src/JSON.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
+                       libshared/src/Table.cpp         libshared/src/Table.h
                        libshared/src/unicode.cpp       libshared/src/unicode.h
                        libshared/src/utf8.cpp          libshared/src/utf8.h
                        libshared/src/wcwidth6.cpp)

From b6ef01059510877381c128a664ca2cc5822f9280 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Jun 2016 18:16:34 -0400
Subject: [PATCH 079/879] DOM: Eiminated Nibbler

---
 src/DOM.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index f938412c2..43fd96233 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <Variant.h>
 #include <Context.h>
-#include <Nibbler.h>
 #include <ISO8601.h>
 #include <text.h>
 #include <util.h>
@@ -60,7 +59,6 @@ bool getDOM (const std::string& name, Variant& value)
     return false;
 
   auto len = name.length ();
-  Nibbler n (name);
 
   // rc. --> context.config
   if (len > 3 &&

From 61763f278fb7496ee4b33889586a090ee8b61dfe Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Jun 2016 09:15:08 -0400
Subject: [PATCH 080/879] libshared: Integrated FS

---
 src/CMakeLists.txt |   4 +-
 src/FS.cpp         | 974 ---------------------------------------------
 src/FS.h           | 145 -------
 3 files changed, 2 insertions(+), 1121 deletions(-)
 delete mode 100644 src/FS.cpp
 delete mode 100644 src/FS.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbbd676aa..8170b9c17 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ add_library (task CLI2.cpp CLI2.h
                   Dates.cpp Dates.h
                   Eval.cpp Eval.h
                   Filter.cpp Filter.h
-                  FS.cpp FS.h
                   Hooks.cpp Hooks.h
                   ISO8601.cpp ISO8601.h
                   Lexer.cpp Lexer.h
@@ -37,7 +36,8 @@ add_library (task CLI2.cpp CLI2.h
                   text.cpp text.h
                   util.cpp util.h)
 
-add_library (libshared libshared/src/JSON.cpp          libshared/src/JSON.h
+add_library (libshared libshared/src/FS.cpp            libshared/src/FS.h
+                       libshared/src/JSON.cpp          libshared/src/JSON.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
                        libshared/src/Table.cpp         libshared/src/Table.h
diff --git a/src/FS.cpp b/src/FS.cpp
deleted file mode 100644
index 72bb9c72d..000000000
--- a/src/FS.cpp
+++ /dev/null
@@ -1,974 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <FS.h>
-#include <fstream>
-#include <glob.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <cstdio>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <text.h>
-#include <util.h>
-#include <i18n.h>
-
-#if defined SOLARIS || defined NETBSD || defined FREEBSD
-#include <limits.h>
-#endif
-
-#if defined __APPLE__
-#include <sys/syslimits.h>
-#endif
-
-// Fixes build with musl libc.
-#ifndef GLOB_TILDE
-#define GLOB_TILDE 0
-#endif
-
-#ifndef GLOB_BRACE
-#define GLOB_BRACE 0
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-Path::Path ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Path::Path (const Path& other)
-{
-  if (this != &other)
-  {
-    _original = other._original;
-    _data     = other._data;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Path::Path (const std::string& in)
-{
-  _original = in;
-  _data = expand (in);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Path& Path::operator= (const Path& other)
-{
-  if (this != &other)
-  {
-    this->_original = other._original;
-    this->_data     = other._data;
-  }
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::operator== (const Path& other)
-{
-  return _data == other._data;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Path& Path::operator+= (const std::string& dir)
-{
-  _data += "/" + dir;
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Path::operator std::string () const
-{
-  return _data;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Path::name () const
-{
-  if (_data.length ())
-  {
-    auto slash = _data.rfind ('/');
-    if (slash != std::string::npos)
-      return _data.substr (slash + 1, std::string::npos);
-  }
-
- return _data;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Path::parent () const
-{
-  if (_data.length ())
-  {
-    auto slash = _data.rfind ('/');
-    if (slash != std::string::npos)
-      return _data.substr (0, slash);
-  }
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Path::extension () const
-{
-  if (_data.length ())
-  {
-    auto dot = _data.rfind ('.');
-    if (dot != std::string::npos)
-      return _data.substr (dot + 1, std::string::npos);
-  }
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::exists () const
-{
-  return access (_data.c_str (), F_OK) ? false : true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::is_directory () const
-{
-  struct stat s {};
-  if (! stat (_data.c_str (), &s) &&
-      S_ISDIR (s.st_mode))
-    return true;
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::is_absolute () const
-{
-  if (_data.length () && _data[0] == '/')
-    return true;
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::is_link () const
-{
-  struct stat s {};
-  if (! lstat (_data.c_str (), &s) &&
-      S_ISLNK (s.st_mode))
-    return true;
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::readable () const
-{
-  return access (_data.c_str (), R_OK) ? false : true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::writable () const
-{
-  return access (_data.c_str (), W_OK) ? false : true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::executable () const
-{
-  return access (_data.c_str (), X_OK) ? false : true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Path::rename (const std::string& new_name)
-{
-  auto expanded = expand (new_name);
-  if (_data != expanded)
-  {
-    if (std::rename (_data.c_str (), expanded.c_str ()) == 0)
-    {
-      _data = expanded;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ~      --> /home/user
-// ~foo/x --> /home/foo/s
-// ~/x    --> /home/foo/x
-// ./x    --> $PWD/x
-// x      --> $PWD/x
-std::string Path::expand (const std::string& in)
-{
-  std::string copy = in;
-
-  auto tilde = copy.find ("~");
-  std::string::size_type slash;
-
-  if (tilde != std::string::npos)
-  {
-    const char *home = getenv("HOME");
-    if (home == nullptr)
-    {
-      struct passwd* pw = getpwuid (getuid ());
-      home = pw->pw_dir;
-    }
-
-    // Convert: ~ --> /home/user
-    if (copy.length () == 1)
-      copy = home;
-
-    // Convert: ~/x --> /home/user/x
-    else if (copy.length () > tilde + 1 &&
-             copy[tilde + 1] == '/')
-    {
-      copy.replace (tilde, 1, home);
-    }
-
-    // Convert: ~foo/x --> /home/foo/x
-    else if ((slash = copy.find  ("/", tilde)) != std::string::npos)
-    {
-      std::string name = copy.substr (tilde + 1, slash - tilde - 1);
-      struct passwd* pw = getpwnam (name.c_str ());
-      if (pw)
-        copy.replace (tilde, slash - tilde, pw->pw_dir);
-    }
-  }
-
-  // Relative paths
-  else if (in.length () > 2 &&
-           in.substr (0, 2) == "./")
-  {
-    copy = Directory::cwd () + in.substr (1);
-  }
-  else if (in.length () > 1 &&
-           in[0] != '.' &&
-           in[0] != '/')
-  {
-    copy = Directory::cwd () + "/" + in;
-  }
-
-  return copy;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> Path::glob (const std::string& pattern)
-{
-  std::vector <std::string> results;
-
-  glob_t g;
-#ifdef SOLARIS
-  if (!::glob (pattern.c_str (), GLOB_ERR, nullptr, &g))
-#else
-  if (!::glob (pattern.c_str (), GLOB_ERR | GLOB_BRACE | GLOB_TILDE, nullptr, &g))
-#endif
-    for (int i = 0; i < (int) g.gl_pathc; ++i)
-      results.push_back (g.gl_pathv[i]);
-
-  globfree (&g);
-  return results;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File::File ()
-: Path::Path ()
-, _fh (nullptr)
-, _h (-1)
-, _locked (false)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File::File (const Path& other)
-: Path::Path (other)
-, _fh (nullptr)
-, _h (-1)
-, _locked (false)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File::File (const File& other)
-: Path::Path (other)
-, _fh (nullptr)
-, _h (-1)
-, _locked (false)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File::File (const std::string& in)
-: Path::Path (in)
-, _fh (nullptr)
-, _h (-1)
-, _locked (false)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File::~File ()
-{
-  if (_fh)
-    close ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-File& File::operator= (const File& other)
-{
-  if (this != &other)
-    Path::operator= (other);
-
-  _locked = false;
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::create (int mode /* = 0640 */)
-{
-  if (open ())
-  {
-    fchmod (_h, mode);
-    close ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::remove () const
-{
-  return unlink (_data.c_str ()) == 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string File::removeBOM (const std::string& input)
-{
-  if (input[0] && input[0] == '\xEF' &&
-      input[1] && input[1] == '\xBB' &&
-      input[2] && input[2] == '\xBF')
-    return input.substr (3);
-
-  return input;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::open ()
-{
-  if (_data != "")
-  {
-    if (! _fh)
-    {
-      bool already_exists = exists ();
-      if (already_exists)
-        if (!readable () || !writable ())
-          throw std::string (format (STRING_FILE_PERMS, _data));
-
-      _fh = fopen (_data.c_str (), (already_exists ? "r+" : "w+"));
-      if (_fh)
-      {
-        _h = fileno (_fh);
-        _locked = false;
-        return true;
-      }
-    }
-    else
-      return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void File::close ()
-{
-  if (_fh)
-  {
-    if (_locked)
-      unlock ();
-
-    fclose (_fh);
-    _fh = nullptr;
-    _h = -1;
-    _locked = false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::lock ()
-{
-  _locked = false;
-  if (_fh && _h != -1)
-  {
-                    // l_type   l_whence  l_start  l_len  l_pid
-    struct flock fl = {F_WRLCK, SEEK_SET, 0,       0,     0 };
-    fl.l_pid = getpid ();
-    if (fcntl (_h, F_SETLKW, &fl) == 0)
-      _locked = true;
-  }
-
-  return _locked;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void File::unlock ()
-{
-  if (_locked)
-  {
-                    // l_type   l_whence  l_start  l_len  l_pid
-    struct flock fl = {F_UNLCK, SEEK_SET, 0,       0,     0 };
-    fl.l_pid = getpid ();
-
-    fcntl (_h, F_SETLK, &fl);
-    _locked = false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Opens if necessary.
-void File::read (std::string& contents)
-{
-  contents = "";
-  contents.reserve (size ());
-
-  std::ifstream in (_data.c_str ());
-  if (in.good ())
-  {
-    bool first = true;
-    std::string line;
-    line.reserve (512 * 1024);
-    while (getline (in, line))
-    {
-      // Detect forbidden BOM on first line.
-      if (first)
-      {
-        line = File::removeBOM (line);
-        first = false;
-      }
-
-      contents += line + "\n";
-    }
-
-    in.close ();
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Opens if necessary.
-void File::read (std::vector <std::string>& contents)
-{
-  contents.clear ();
-
-  std::ifstream in (_data.c_str ());
-  if (in.good ())
-  {
-    bool first = true;
-    std::string line;
-    line.reserve (512 * 1024);
-    while (getline (in, line))
-    {
-      // Detect forbidden BOM on first line.
-      if (first)
-      {
-        line = File::removeBOM (line);
-        first = false;
-      }
-
-      contents.push_back (line);
-    }
-
-    in.close ();
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Opens if necessary.
-void File::append (const std::string& line)
-{
-  if (!_fh)
-    open ();
-
-  if (_fh)
-  {
-    fseek (_fh, 0, SEEK_END);
-    fputs (line.c_str (), _fh);
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Opens if necessary.
-void File::append (const std::vector <std::string>& lines)
-{
-  if (!_fh)
-    open ();
-
-  if (_fh)
-  {
-    fseek (_fh, 0, SEEK_END);
-    for (auto& line : lines)
-      fputs (line.c_str (), _fh);
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void File::write_raw (const std::string& line)
-{
-  if (!_fh)
-    open ();
-
-  if (_fh)
-    fputs (line.c_str (), _fh);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void File::truncate ()
-{
-  if (!_fh)
-    open ();
-
-  if (_fh)
-    if (ftruncate (_h, 0))
-      throw format (STRING_FILE_TRUNCATE, errno, strerror (errno));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//  S_IFMT          0170000  type of file
-//         S_IFIFO  0010000  named pipe (fifo)
-//         S_IFCHR  0020000  character special
-//         S_IFDIR  0040000  directory
-//         S_IFBLK  0060000  block special
-//         S_IFREG  0100000  regular
-//         S_IFLNK  0120000  symbolic link
-//         S_IFSOCK 0140000  socket
-//         S_IFWHT  0160000  whiteout
-//  S_ISUID         0004000  set user id on execution
-//  S_ISGID         0002000  set group id on execution
-//  S_ISVTX         0001000  save swapped text even after use
-//  S_IRUSR         0000400  read permission, owner
-//  S_IWUSR         0000200  write permission, owner
-//  S_IXUSR         0000100  execute/search permission, owner
-mode_t File::mode ()
-{
-  struct stat s;
-  if (!stat (_data.c_str (), &s))
-    return s.st_mode;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-size_t File::size () const
-{
-  struct stat s;
-  if (!stat (_data.c_str (), &s))
-    return s.st_size;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-time_t File::mtime () const
-{
-  struct stat s;
-  if (!stat (_data.c_str (), &s))
-    return s.st_mtime;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-time_t File::ctime () const
-{
-  struct stat s;
-  if (!stat (_data.c_str (), &s))
-    return s.st_ctime;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-time_t File::btime () const
-{
-  struct stat s;
-  if (!stat (_data.c_str (), &s))
-#ifdef HAVE_ST_BIRTHTIME
-    return s.st_birthtime;
-#else
-    return s.st_ctime;
-#endif
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::create (const std::string& name, int mode /* = 0640 */)
-{
-  std::string full_name = expand (name);
-  std::ofstream out (full_name.c_str ());
-  if (out.good ())
-  {
-    out.close ();
-    chmod (full_name.c_str (), mode);
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::read (const std::string& name, std::string& contents)
-{
-  contents = "";
-
-  std::ifstream in (name.c_str ());
-  if (in.good ())
-  {
-    bool first = true;
-    std::string line;
-    line.reserve (1024);
-    while (getline (in, line))
-    {
-      // Detect forbidden BOM on first line.
-      if (first)
-      {
-        line = File::removeBOM (line);
-        first = false;
-      }
-
-      contents += line + "\n";
-    }
-
-    in.close ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::read (const std::string& name, std::vector <std::string>& contents)
-{
-  contents.clear ();
-
-  std::ifstream in (name.c_str ());
-  if (in.good ())
-  {
-    bool first = true;
-    std::string line;
-    line.reserve (1024);
-    while (getline (in, line))
-    {
-      // Detect forbidden BOM on first line.
-      if (first)
-      {
-        line = File::removeBOM (line);
-        first = false;
-      }
-
-      contents.push_back (line);
-    }
-
-    in.close ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::write (const std::string& name, const std::string& contents)
-{
-  std::ofstream out (expand (name).c_str (),
-                     std::ios_base::out | std::ios_base::trunc);
-  if (out.good ())
-  {
-    out << contents;
-    out.close ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::write (
-  const std::string& name,
-  const std::vector <std::string>& lines,
-  bool addNewlines /* = true */)
-{
-  std::ofstream out (expand (name).c_str (),
-                     std::ios_base::out | std::ios_base::trunc);
-  if (out.good ())
-  {
-    for (auto& line : lines)
-    {
-      out << line;
-
-      if (addNewlines)
-        out << "\n";
-    }
-
-    out.close ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::remove (const std::string& name)
-{
-  return unlink (expand (name).c_str ()) == 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::copy (const std::string& from, const std::string& to)
-{
-  // 'from' must exist.
-  if (! access (from.c_str (), F_OK))
-  {
-    std::ifstream src (from, std::ios::binary);
-    std::ofstream dst (to,   std::ios::binary);
-
-    dst << src.rdbuf ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool File::move (const std::string& from, const std::string& to)
-{
-  auto expanded = expand (to);
-  if (from != expanded)
-    if (std::rename (from.c_str (), to.c_str ()) == 0)
-      return true;
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory::Directory ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory::Directory (const Directory& other)
-: File::File (other)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory::Directory (const File& other)
-: File::File (other)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory::Directory (const Path& other)
-: File::File (other)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory::Directory (const std::string& in)
-: File::File (in)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Directory& Directory::operator= (const Directory& other)
-{
-  if (this != &other)
-    File::operator= (other);
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Directory::create (int mode /* = 0755 */)
-{
-  return mkdir (_data.c_str (), mode) == 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Directory::remove () const
-{
-  return remove_directory (_data);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Directory::remove_directory (const std::string& dir) const
-{
-  DIR* dp = opendir (dir.c_str ());
-  if (dp != nullptr)
-  {
-    struct dirent* de;
-    while ((de = readdir (dp)) != nullptr)
-    {
-      if (!strcmp (de->d_name, ".") ||
-          !strcmp (de->d_name, ".."))
-        continue;
-
-#if defined (SOLARIS) || defined (HAIKU)
-      struct stat s;
-      lstat ((dir + "/" + de->d_name).c_str (), &s);
-      if (S_ISDIR (s.st_mode))
-        remove_directory (dir + "/" + de->d_name);
-      else
-        unlink ((dir + "/" + de->d_name).c_str ());
-#else
-      if (de->d_type == DT_UNKNOWN)
-      {
-        struct stat s;
-        lstat ((dir + "/" + de->d_name).c_str (), &s);
-        if (S_ISDIR (s.st_mode))
-          de->d_type = DT_DIR;
-      }
-      if (de->d_type == DT_DIR)
-        remove_directory (dir + "/" + de->d_name);
-      else
-        unlink ((dir + "/" + de->d_name).c_str ());
-#endif
-    }
-
-    closedir (dp);
-  }
-
-  return rmdir (dir.c_str ()) ? false : true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> Directory::list ()
-{
-  std::vector <std::string> files;
-  list (_data, files, false);
-  return files;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> Directory::listRecursive ()
-{
-  std::vector <std::string> files;
-  list (_data, files, true);
-  return files;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Directory::cwd ()
-{
-#ifdef HAVE_GET_CURRENT_DIR_NAME
-  char *buf = get_current_dir_name ();
-  if (buf == nullptr)
-    throw std::bad_alloc ();
-  std::string result (buf);
-  free (buf);
-  return result;
-#else
-  char buf[PATH_MAX];
-  getcwd (buf, PATH_MAX - 1);
-  return std::string (buf);
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Directory::up ()
-{
-  if (_data == "/")
-    return false;
-
-  auto slash = _data.rfind ('/');
-  if (slash == 0)
-  {
-    _data = "/";  // Root dir should retain the slash.
-    return true;
-  }
-  else if (slash != std::string::npos)
-  {
-    _data = _data.substr (0, slash);
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Directory::cd () const
-{
-  return chdir (_data.c_str ()) == 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Directory::list (
-  const std::string& base,
-  std::vector <std::string>& results,
-  bool recursive)
-{
-  DIR* dp = opendir (base.c_str ());
-  if (dp != nullptr)
-  {
-    struct dirent* de;
-    while ((de = readdir (dp)) != nullptr)
-    {
-      if (!strcmp (de->d_name, ".") ||
-          !strcmp (de->d_name, ".."))
-        continue;
-
-#if defined (SOLARIS) || defined (HAIKU)
-      struct stat s;
-      stat ((base + "/" + de->d_name).c_str (), &s);
-      if (recursive && S_ISDIR (s.st_mode))
-        list (base + "/" + de->d_name, results, recursive);
-      else
-        results.push_back (base + "/" + de->d_name);
-#else
-      if (recursive && de->d_type == DT_UNKNOWN)
-      {
-        struct stat s;
-        lstat ((base + "/" + de->d_name).c_str (), &s);
-        if (S_ISDIR (s.st_mode))
-          de->d_type = DT_DIR;
-      }
-      if (recursive && de->d_type == DT_DIR)
-        list (base + "/" + de->d_name, results, recursive);
-      else
-        results.push_back (base + "/" + de->d_name);
-#endif
-    }
-
-    closedir (dp);
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/FS.h b/src/FS.h
deleted file mode 100644
index 3d14800e1..000000000
--- a/src/FS.h
+++ /dev/null
@@ -1,145 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_FS
-#define INCLUDED_FS
-
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include <sys/stat.h>
-
-class Path
-{
-public:
-  Path ();
-  explicit Path (const Path&);
-  Path (const std::string&);
-
-  Path& operator= (const Path&);
-  bool operator== (const Path&);
-  Path& operator+= (const std::string&);
-  operator std::string () const;
-
-  std::string name () const;
-  std::string parent () const;
-  std::string extension () const;
-  bool exists () const;
-  bool is_directory () const;
-  bool is_absolute () const;
-  bool is_link () const;
-  bool readable () const;
-  bool writable () const;
-  bool executable () const;
-  bool rename (const std::string&);
-
-  // Statics
-  static std::string expand (const std::string&);
-  static std::vector<std::string> glob (const std::string&);
-
-public:
-  std::string _original;
-  std::string _data;
-};
-
-class File : public Path
-{
-public:
-  File ();
-  explicit File (const Path&);
-  explicit File (const File&);
-  File (const std::string&);
-  virtual ~File ();
-
-  File& operator= (const File&);
-
-  virtual bool create (int mode = 0640);
-  virtual bool remove () const;
-
-  bool open ();
-  void close ();
-
-  bool lock ();
-  void unlock ();
-
-  void read (std::string&);
-  void read (std::vector <std::string>&);
-
-  void append (const std::string&);
-  void append (const std::vector <std::string>&);
-  void write_raw (const std::string&);
-
-  void truncate ();
-
-  virtual mode_t mode ();
-  virtual size_t size () const;
-  virtual time_t mtime () const;
-  virtual time_t ctime () const;
-  virtual time_t btime () const;
-
-  static bool create (const std::string&, int mode = 0640);
-  static bool read (const std::string&, std::string&);
-  static bool read (const std::string&, std::vector <std::string>&);
-  static bool write (const std::string&, const std::string&);
-  static bool write (const std::string&, const std::vector <std::string>&, bool addNewlines = true);
-  static bool remove (const std::string&);
-  static bool copy (const std::string&, const std::string&);
-  static bool move (const std::string&, const std::string&);
-  static std::string removeBOM (const std::string&);
-
-private:
-  FILE* _fh;
-  int   _h;
-  bool  _locked;
-};
-
-class Directory : public File
-{
-public:
-  Directory ();
-  explicit Directory (const Directory&);
-  explicit Directory (const File&);
-  explicit Directory (const Path&);
-  Directory (const std::string&);
-
-  Directory& operator= (const Directory&);
-
-  virtual bool create (int mode = 0755);
-  virtual bool remove () const;
-
-  std::vector <std::string> list ();
-  std::vector <std::string> listRecursive ();
-
-  static std::string cwd ();
-  bool up ();
-  bool cd () const;
-
-private:
-  void list (const std::string&, std::vector <std::string>&, bool);
-  bool remove_directory (const std::string&) const;
-};
-
-#endif

From 555dc98f5bc6c755247ed3b6588a2f3fb29b7c4d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Jun 2016 09:21:55 -0400
Subject: [PATCH 081/879] Tests: Removed redundant FS tests

---
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/fs.t.cpp       | 311 --------------------------------------------
 3 files changed, 1 insertion(+), 313 deletions(-)
 delete mode 100644 test/fs.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index c01a7b026..b7c6be1a1 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -9,7 +9,6 @@ color.t
 config.t
 dates.t
 eval.t
-fs.t
 iso8601d.t
 iso8601p.t
 lexer.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6514cd447..daf1442c0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t fs.t
+set (test_SRCS autocomplete.t col.t color.t config.t
                msg.t nibbler.t t.t tdb2.t text.t util.t view.t
                lexer.t iso8601d.t iso8601p.t eval.t dates.t
                variant_add.t variant_and.t variant_cast.t variant_divide.t
diff --git a/test/fs.t.cpp b/test/fs.t.cpp
deleted file mode 100644
index 2a573c545..000000000
--- a/test/fs.t.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <algorithm>
-#include <string>
-#include <stdlib.h>
-#include <Context.h>
-#include <FS.h>
-#include <test.h>
-
-Context context;
-
-int main (int, char**)
-{
-  UnitTest t (116);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  // Path ();
-  Path p0;
-  t.is (p0._data, "", "Path::Path");
-
-  // Path (const Path&);
-  Path p1 = Path ("foo");
-  t.is (p1._data, Directory::cwd () + "/foo", "Path::operator=");
-
-  // Path (const std::string&);
-  Path p2 ("~");
-  t.ok (p2._data != "~", "~ expanded to " + p2._data);
-
-  Path p3 ("/tmp");
-  t.ok (p3._data == "/tmp", "/tmp -> /tmp");
-
-  // operator==
-  t.notok (p2 == p3, "p2 != p3");
-
-  // Path& operator= (const Path&);
-  Path p3_copy (p3);
-  t.is (p3._data, p3_copy._data, "Path::Path (Path&)");
-
-  // operator (std::string) const;
-  t.is ((std::string) p3, "/tmp", "Path::operator (std::string) const");
-
-  // std::string name () const;
-  Path p4 ("/a/b/c/file.ext");
-  t.is (p4.name (), "file.ext",  "/a/b/c/file.ext name is file.ext");
-
-  // std::string parent () const;
-  t.is (p4.parent (), "/a/b/c",  "/a/b/c/file.ext parent is /a/b/c");
-
-  // std::string extension () const;
-  t.is (p4.extension (), "ext",  "/a/b/c/file.ext extension is ext");
-
-  // bool exists () const;
-  t.ok (p2.exists (), "~ exists");
-  t.ok (p3.exists (), "/tmp exists");
-
-  // bool is_directory () const;
-  t.ok (p2.is_directory (), "~ is_directory");
-  t.ok (p3.is_directory (), "/tmp is_directory");
-
-  // bool is_link () const;
-  t.notok (p2.is_link (), "~ !is_link");
-
-  // bool readable () const;
-  t.ok (p2.readable (), "~ readable");
-  t.ok (p3.readable (), "/tmp readable");
-
-  // bool writable () const;
-  t.ok (p2.writable (), "~ writable");
-  t.ok (p3.writable (), "/tmp writable");
-
-  // bool executable () const;
-  t.ok (p2.executable (), "~ executable");
-  t.ok (p3.executable (), "/tmp executable");
-
-  // static std::string expand (const std::string&);
-  t.ok (Path::expand ("~") != "~", "Path::expand ~ != ~");
-  t.ok (Path::expand ("~/") != "~/", "Path::expand ~/ != ~/");
-
-  // static std::vector <std::string> glob (const std::string&);
-  std::vector <std::string> out = Path::glob ("/tmp");
-  t.ok (out.size () == 1, "/tmp -> 1 result");
-  t.is (out[0], "/tmp", "/tmp -> /tmp");
-
-  out = Path::glob ("/t?p");
-  t.ok (out.size () == 1, "/t?p -> 1 result");
-  t.is (out[0], "/tmp", "/t?p -> /tmp");
-
-  out = Path::glob ("/[s-u]mp");
-  t.ok (out.size () == 1, "/[s-u]mp -> 1 result");
-  t.is (out[0], "/tmp", "/[s-u]mp -> /tmp");
-
-  // bool is_absolute () const;
-  t.notok (p0.is_absolute (), "'' !is_absolute");
-  t.ok    (p1.is_absolute (), "foo is_absolute");
-  t.ok    (p2.is_absolute (), "~ is_absolute (after expansion)");
-  t.ok    (p3.is_absolute (), "/tmp is_absolute");
-  t.ok    (p4.is_absolute (), "/a/b/c/file.ext is_absolute");
-
-  Path p5 ("~/file.ext");
-  t.notok (p5.name () == "~/file.ext", "~/file.ext --> ! ~/file.ext");
-
-  Directory tmp ("tmp");
-  tmp.create ();
-  t.ok (tmp.exists (), "tmp dir created.");
-
-  File::write ("tmp/file.t.txt", "This is a test\n");
-  File f6 ("tmp/file.t.txt");
-  t.ok (f6.size () == 15, "File::size tmp/file.t.txt good");
-  t.ok (f6.mode () & S_IRUSR, "File::mode tmp/file.t.txt good");
-  t.ok (File::remove ("tmp/file.t.txt"), "File::remove tmp/file.t.txt good");
-
-  // operator (std::string) const;
-  t.is ((std::string) f6, Directory::cwd () + "/tmp/file.t.txt", "File::operator (std::string) const");
-
-  t.ok (File::create ("tmp/file.t.create"), "File::create tmp/file.t.create good");
-  t.ok (File::remove ("tmp/file.t.create"), "File::remove tmp/file.t.create good");
-
-  // basename (std::string) const;
-  t.is (f6.name (), "file.t.txt", "File::basename tmp/file.t.txt --> file.t.txt");
-
-  // dirname (std::string) const;
-  t.is (f6.parent (), Directory::cwd () + "/tmp", "File::dirname tmp/file.t.txt --> tmp");
-
-  // bool rename (const std::string&);
-  File f7 ("tmp/file.t.2.txt");
-  f7.append ("something\n");
-  f7.close ();
-
-  t.ok (f7.rename ("tmp/file.t.3.txt"),  "File::rename did not fail");
-  t.is (f7._data, Directory::cwd () + "/tmp/file.t.3.txt",    "File::rename stored new name");
-  t.ok (f7.exists (),                    "File::rename new file exists");
-  t.ok (f7.remove (),                    "File::remove tmp/file.t.3.txt good");
-  t.notok (f7.exists (),                 "File::remove new file no longer exists");
-
-  // Test permissions.
-  File f8 ("tmp/file.t.perm.txt");
-  f8.create (0744);
-  t.ok (f8.exists (),                    "File::create perm file exists");
-  mode_t m = f8.mode ();
-  t.ok    (m & S_IFREG,                  "File::mode tmp/file.t.perm.txt S_IFREG good");
-  t.ok    (m & S_IRUSR,                  "File::mode tmp/file.t.perm.txt r-------- good");
-  t.ok    (m & S_IWUSR,                  "File::mode tmp/file.t.perm.txt -w------- good");
-  t.ok    (m & S_IXUSR,                  "File::mode tmp/file.t.perm.txt --x------ good");
-  t.ok    (m & S_IRGRP,                  "File::mode tmp/file.t.perm.txt ---r----- good");
-  t.notok (m & S_IWGRP,                  "File::mode tmp/file.t.perm.txt ----w---- good");
-  t.notok (m & S_IXGRP,                  "File::mode tmp/file.t.perm.txt -----x--- good");
-  t.ok    (m & S_IROTH,                  "File::mode tmp/file.t.perm.txt ------r-- good");
-  t.notok (m & S_IWOTH,                  "File::mode tmp/file.t.perm.txt -------w- good");
-  t.notok (m & S_IXOTH,                  "File::mode tmp/file.t.perm.txt --------x good");
-  f8.remove ();
-  t.notok (f8.exists (),                 "File::remove perm file no longer exists");
-
-  tmp.remove ();
-  t.notok (tmp.exists (),                "tmp dir removed.");
-  tmp.create ();
-  t.ok (tmp.exists (), "tmp dir created.");
-
-  // Directory (const File&);
-  // Directory (const Path&);
-  Directory d0 (Path ("tmp"));
-  Directory d1 (File ("tmp"));
-  Directory d2 (File (Path ("tmp")));
-  t.is (d0._data, d1._data, "Directory(std::string) == Directory (File&)");
-  t.is (d0._data, d2._data, "Directory(std::string) == Directory (File (Path &))");
-  t.is (d1._data, d2._data, "Directory(File&)) == Directory (File (Path &))");
-
-  // Directory (const Directory&);
-  Directory d3 (d2);
-  t.is (d3._data, Directory::cwd () + "/tmp", "Directory (Directory&)");
-
-  // Directory (const std::string&);
-  Directory d4 ("tmp/test_directory");
-
-  // Directory& operator= (const Directory&);
-  Directory d5 = d4;
-  t.is (d5._data, Directory::cwd () + "/tmp/test_directory", "Directory::operator=");
-
-  // operator (std::string) const;
-  t.is ((std::string) d3, Directory::cwd () + "/tmp", "Directory::operator (std::string) const");
-
-  // virtual bool create ();
-  t.ok (d5.create (), "Directory::create tmp/test_directory");
-  t.ok (d5.exists (), "Directory::exists tmp/test_directory");
-
-  Directory d6 (d5._data + "/dir");
-  t.ok (d6.create (), "Directory::create tmp/test_directory/dir");
-
-  File::create (d5._data + "/f0");
-  File::create (d6._data + "/f1");
-
-  // std::vector <std::string> list ();
-  std::vector <std::string> files = d5.list ();
-  std::sort (files.begin (), files.end ());
-  t.is ((int)files.size (), 2, "Directory::list 1 file");
-  t.is (files[0], Directory::cwd () + "/tmp/test_directory/dir", "file[0] is tmp/test_directory/dir");
-  t.is (files[1], Directory::cwd () + "/tmp/test_directory/f0", "file[1] is tmp/test_directory/f0");
-
-  // std::vector <std::string> listRecursive ();
-  files = d5.listRecursive ();
-  std::sort (files.begin (), files.end ());
-  t.is ((int)files.size (), 2, "Directory::list 1 file");
-  t.is (files[0], Directory::cwd () + "/tmp/test_directory/dir/f1", "file is tmp/test_directory/dir/f1");
-  t.is (files[1], Directory::cwd () + "/tmp/test_directory/f0", "file is tmp/test_directory/f0");
-
-  // virtual bool remove ();
-  t.ok (File::remove (d5._data + "/f0"), "File::remove tmp/test_directory/f0");
-  t.ok (File::remove (d6._data + "/f1"), "File::remove tmp/test_directory/dir/f1");
-
-  t.ok (d6.remove (), "Directory::remove tmp/test_directory/dir");
-  t.notok (d6.exists (), "Directory::exists tmp/test_directory/dir - no");
-
-  t.ok (d5.remove (), "Directory::remove tmp/test_directory");
-  t.notok (d5.exists (), "Directory::exists tmp/test_directory - no");
-
-  // bool remove (const std::string&);
-  Directory d7 ("tmp/to_be_removed");
-  t.ok (d7.create (), "Directory::create tmp/to_be_removed");
-  File::create (d7._data + "/f0");
-  Directory d8 (d7._data + "/another");
-  t.ok (d8.create (), "Directory::create tmp/to_be_removed/another");
-  File::create (d8._data + "/f1");
-  t.ok (d7.remove (), "Directory::remove tmp/to_be_removed");
-  t.notok (d7.exists (), "Directory tmp/to_be_removed gone");
-
-  // static std::string cwd ();
-  std::string cwd = Directory::cwd ();
-  t.ok (cwd.length () > 0, "Directory::cwd returned a value");
-
-  // bool parent (std::string&) const;
-  Directory d9 ("/one/two/three/four.txt");
-  t.ok (d9.up (),                   "parent /one/two/three/four.txt --> true");
-  t.is (d9._data, "/one/two/three", "parent /one/two/three/four.txt --> /one/two/three");
-  t.ok (d9.up (),                   "parent /one/two/three --> true");
-  t.is (d9._data, "/one/two",       "parent /one/two/three --> /one/two");
-  t.ok (d9.up (),                   "parent /one/two --> true");
-  t.is (d9._data, "/one",           "parent /one/two --> /one");
-  t.ok (d9.up (),                   "parent /one --> true");
-  t.is (d9._data, "/",              "parent /one --> /");
-  t.notok (d9.up (),                "parent / --> false");
-
-  // Test permissions.
-  umask (0022);
-  Directory d10 ("tmp/dir.perm");
-  d10.create (0750);
-  t.ok (d10.exists (),               "Directory::create perm file exists");
-  m = d10.mode ();
-  t.ok    (m & S_IFDIR,             "Directory::mode tmp/dir.perm S_IFDIR good");
-  t.ok    (m & S_IRUSR,             "Directory::mode tmp/dir.perm r-------- good");
-  t.ok    (m & S_IWUSR,             "Directory::mode tmp/dir.perm -w------- good");
-  t.ok    (m & S_IXUSR,             "Directory::mode tmp/dir.perm --x------ good");
-  t.ok    (m & S_IRGRP,             "Directory::mode tmp/dir.perm ---r----- good");
-  t.notok (m & S_IWGRP,             "Directory::mode tmp/dir.perm ----w---- good");
-  t.ok    (m & S_IXGRP,             "Directory::mode tmp/dir.perm -----x--- good");
-  t.notok (m & S_IROTH,             "Directory::mode tmp/dir.perm ------r-- good");
-  t.notok (m & S_IWOTH,             "Directory::mode tmp/dir.perm -------w- good");
-  t.notok (m & S_IXOTH,             "Directory::mode tmp/dir.perm --------x good");
-  d10.remove ();
-  t.notok (d10.exists (),           "Directory::remove temp/dir.perm file no longer exists");
-
-  // Directory::cd
-  Directory d11 ("/tmp");
-  t.ok (d11.cd (),                  "Directory::cd /tmp good");
-
-  tmp.remove ();
-  t.notok (tmp.exists (),           "tmp dir removed.");
-
-  // File::removeBOM
-  std::string line = "Should not be modified.";
-  t.is (File::removeBOM (line), line,  "File::removeBOM 'Should not be modified' --> 'Should not be modified'");
-
-  line = "no";
-  t.is (File::removeBOM (line), line,  "File::removeBOM 'no' --> 'no'");
-
-  line = "";
-  t.is (File::removeBOM (line), line,  "File::removeBOM '' --> ''");
-
-  line = {'\xEF', '\xBB', '\xBF', 'F', 'o', 'o'};
-  t.is (File::removeBOM (line), "Foo",  "File::removeBOM '<BOM>Foo' --> 'Foo'");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 04c068e5148e43fc3f2811f4e12e2dbff49c8dfb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 8 Jul 2016 23:09:17 -0400
Subject: [PATCH 082/879] Docs: ChangeLog had wrong bug id

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f36852b8b..bfec05ea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@
           pending tasks.
 - TW-1795 Calendar underline on Day padding
           (thanks to Renato Alves).
-- TW-1806 project:ide is not allowed
+- TW-1805 project:ide is not allowed
           (thanks to Slaven ʙanovic).
 - TW-1807 dateformat lacks a flag to display day of week
           (thanks to Ellington Santos).

From 1f2c5bfed7cdda0127722305bcbf7adaa5082d0f Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Tue, 2 Aug 2016 14:48:50 +0300
Subject: [PATCH 083/879] Scripts: Quoted regular expression to avoid bash glob
 expansion

The quote is needed, otherwise it is treated as a bash glob first, which
causes trouble if there actually happens to be matching files, and
fails entirely if `shopt -s failglob` is set.
---
 scripts/bash/task.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index e0c7fb039..ecb4fd528 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -72,7 +72,7 @@ _task_offer_contexts() {
     COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) )
 }
 
-_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2)
+_task_context_alias=$($taskcommand show | grep 'alias.*context' | cut -d' ' -f1 | cut -d. -f2)
 
 _task()
 {

From e0aea4a5f53f6a40e4df576c86f4405496df3628 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 2 Aug 2016 08:25:02 -0400
Subject: [PATCH 084/879] Docs: Added Ran Benita

---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 93f150806..8681889f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -130,6 +130,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Tom Sydney Kerckhove
   Lynoure Braakman
   Sebastien Badia
+  Ran Benita
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index bfec05ea8..e1b07e4db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
+- Fixed unquoted glob in bash completion script
+          (thanks to Ran Benita).
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 

From 98611888affec104d54978681649001a4f11de4d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 22 Aug 2016 09:19:18 -0400
Subject: [PATCH 085/879] L10N: Updated error message to not refer to only
 pending tasks

---
 src/l10n/eng-USA.h | 2 +-
 src/l10n/fra-FRA.h | 2 +-
 src/l10n/ita-ITA.h | 2 +-
 src/l10n/jpn-JPN.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 29575dad4..3a64918ba 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -480,7 +480,7 @@
 #define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed.  Could not connect to the Taskserver."
 #define STRING_CMD_SYNC_BAD_SERVER   "Sync failed.  Malformed configuration setting '{1}'"
 #define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your pending tasks to the Taskserver"
+#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
 #define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 46847ffa1..05d7e82e9 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -482,7 +482,7 @@
 #define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed.  Could not connect to the Taskserver."
 #define STRING_CMD_SYNC_BAD_SERVER   "Sync failed.  Malformed configuration setting '{1}'"
 #define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your pending tasks to the Taskserver"
+#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
 #define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 858b257da..d54af0588 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -481,7 +481,7 @@
 #define STRING_CMD_SYNC_FAIL_CONNECT "Sincronizzazione fallita.  Impossibile connettersi al Taskserver."
 #define STRING_CMD_SYNC_BAD_SERVER   "Sincronizzazione fallita.  Impostazione di configurazione '{1}' malformata"
 #define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your pending tasks to the Taskserver"
+#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
 #define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4f53cba27..ff27b30f3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -482,7 +482,7 @@
 #define STRING_CMD_SYNC_FAIL_CONNECT "同期失敗。 Taskserverに接続できない。"
 #define STRING_CMD_SYNC_BAD_SERVER   "同期失敗。 不正な形式の設定 '{1}'"
 #define STRING_CMD_SYNC_NO_TLS       "Taskwarrior はGnuTLSサポートなしで構成されています。同期は無効です。"
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your pending tasks to the Taskserver"
+#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
 #define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"

From c5d32c58f9ecec5a30c825aa9e0c9b89405e0786 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 31 Aug 2016 17:48:45 -0400
Subject: [PATCH 086/879] TW-1778: Unicode strings are truncated in task
 description

- Thanks to Andrew, bjonnh, OKOMPer, Vladimir.
---
 AUTHORS      | 4 ++++
 ChangeLog    | 2 ++
 src/text.cpp | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 8681889f3..52d43edde 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -131,6 +131,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Lynoure Braakman
   Sebastien Badia
   Ran Benita
+  Vladimir
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -296,3 +297,6 @@ suggestions:
   Ellington Santos
   george js
   E. Manuel Cerr'on Angeles
+  Andrew
+  bjonnh
+  OKOMper
diff --git a/ChangeLog b/ChangeLog
index e1b07e4db..ddd27b085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
+- TW-1778 Unicode strings are truncated in task description
+          (thanks to Andrew, bjonnh, OKOMPer, Vladimir).
 - TW-1788 Closing a reopened task does not update the end time
           (thanks to Ralph Bean).
 - TW-1791 taskrc(5) manpage: spurious "pri." in rule.precedence.color
diff --git a/src/text.cpp b/src/text.cpp
index f5e3496be..bc8353f73 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -248,7 +248,7 @@ bool extractLine (
     // Premature EOL.
     if (character == '\n')
     {
-      line = text.substr (offset, line_length);
+      line = text.substr (offset, prior_cursor - offset);
       offset = cursor;
       return true;
     }

From b7e71a1c3c5c91cdee4f3a03af29ca26aeed2ddf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 2 Sep 2016 08:08:12 -0400
Subject: [PATCH 087/879] Docs: Updated dev build instructions

---
 DEVELOPER | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index 10c24f159..545557b14 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -8,12 +8,13 @@ How to Build Taskwarrior
     - python 2.7 or 3 (optional, for running the test suite)
 
   Obtain and build code:
-    $ git clone https://git.tasktools.org/scm/tm/task.git task.git
+    $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
     $ git checkout 2.6.0                 # Latest dev branch
-    $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
+    $ git submodule update               # Update the libhsared.git submodule
+    $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs
-                                         # Alternately 'export MAKEFLAGS=-j 8'.
+                                         # Alternately 'export MAKEFLAGS=-j 8'
 
   Running Test Suite:
     $ cd tests

From 2e11c3c104b35a83bf42fcf06b50487b543f226a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Sep 2016 16:11:04 -0400
Subject: [PATCH 088/879] Config: Changed to 0/1 boolean values for the
 defaults.

- Deprecated use of alternate Boolean configuration settings. Use values "0" for
  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
  "yes", "y", "no", "n".
---
 ChangeLog           |   3 +
 NEWS                |   3 +
 doc/man/taskrc.5.in | 171 ++++++++++++++++++++++----------------------
 src/Config.cpp      |  88 +++++++++++------------
 4 files changed, 136 insertions(+), 129 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddd27b085..fa863ac94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
           (thanks to Ran Benita).
+- Deprecated use of alternate Boolean configuration settings. Use values "0" for
+  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
+  "yes", "y", "no", "n".
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
diff --git a/NEWS b/NEWS
index 3b35a1b08..1074aa75e 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ Newly Deprecated Features in Taskwarrior 2.5.2
     not needed.
   - The 'new-uuid' verbosity option is to be removed due to being redundant, its
     functionality will be merged with 'new-id' option.
+  - The use of alternate Boolean configuration settings is deprecated. Use values
+    "0" for off, and "1" for on.  Avoid used of "on", "off", "true", "t",
+    "false", "f", "yes", "y", "no", "n".
 
 Removed Features in 2.5.2
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 837e94858..28c149701 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -68,8 +68,8 @@ The entry must be on a single line, no continuations.
 Values support UTF8 as well as JSON encoding, such as \\uNNNN.
 
 Note that Taskwarrior is flexible about the values used to represent Boolean
-items. You can use "on", "yes", "y", "1" and "true".
-Anything else means "off".
+items. You can use "1" to enable, anything else is interpreted as disabled.
+The values "on", "yes", "y" and "true" are currently supported by deprecated.
 
 .RS
 include <file>
@@ -181,33 +181,33 @@ shell meta character, which will be properly expanded.
 Note that the TASKDATA environment variable overrides this setting.
 
 .TP
-.B locking=on
+.B locking=1
 Determines whether to use file locking when accessing the pending.data and
-completed.data files. Defaults to "on". Solaris users who store the data
-files on an NFS mount may need to set locking to "off". Note that there is
-danger in setting this value to "off" - another program (or another instance of
+completed.data files. Defaults to "1". Solaris users who store the data
+files on an NFS mount may need to set locking to "0". Note that there is
+danger in setting this value to "0" - another program (or another instance of
 task) may write to the task.pending file at the same time.
 
 .TP
-.B gc=on
+.B gc=1
 Can be used to temporarily suspend garbage collection (gc), so that task IDs
 don't change. Note that this should be used in the form of a command line
-override (task rc.gc=off ...), and not permanently used in the .taskrc file,
+override (task rc.gc=0 ...), and not permanently used in the .taskrc file,
 as this significantly affects performance in the long term.
 
 .TP
-.B hooks=on
+.B hooks=1
 This master control switch enables hook script processing. The default value
-is 'on', but certain extensions and environments may need to disable hooks.
+is '1', but certain extensions and environments may need to disable hooks.
 
 .TP
-.B exit.on.missing.db=no
-When set to 'yes' causes the program to exit if the database (~/.task or
-rc.data.location or TASKDATA override) is missing. Default value is 'no'.
+.B exit.on.missing.db=0
+When set to '1' causes the program to exit if the database (~/.task or
+rc.data.location or TASKDATA override) is missing. Default value is '0'.
 
 .SS TERMINAL
 .TP
-.B detection=on
+.B detection=1
 Determines whether to use ioctl to establish the size of the window you are
 using, for text wrapping.
 
@@ -225,14 +225,14 @@ to 24. If set to 0, it is interpreted as infinite height. This is useful when re
 charts to a file for subsequent handling.
 
 .TP
-.B avoidlastcolumn=no
+.B avoidlastcolumn=0
 Causes the width of the terminal minus one to be used as the full width. This
 avoids placing color codes in the last column which can cause problems for
-Cygwin users. Default value is 'no'.
+Cygwin users. Default value is '0'.
 
 .TP
-.B hyphenate=on
-Hyphenates lines when wrapping breaks occur mid-word. Default value is 'on'.
+.B hyphenate=1
+Hyphenates lines when wrapping breaks occur mid-word. Default value is '1'.
 
 .TP
 .B editor=vi
@@ -250,9 +250,9 @@ prompt. This is only referenced when 'limit:page' is used.
 .SS MISCELLANEOUS
 
 .TP
-.B verbose=on|off|nothing|list...
-When set to "on" (the default), helpful explanatory comments are added to all
-output from Taskwarrior. Setting this to "off" means that you would see regular
+.B verbose=1|0|nothing|list...
+When set to "1" (the default), helpful explanatory comments are added to all
+output from Taskwarrior. Setting this to "0" means that you would see regular
 output.
 
 The special value "nothing" can be used to eliminate all optional output, which
@@ -280,15 +280,15 @@ control specific occasions when output is generated. This list may contain:
 
 "affected", "new-id", "new-uuid" "project" and "unwait" imply "footnote".
 
-Note that the "on" setting is equivalent to all the tokens being specified,
+Note that the "1" setting is equivalent to all the tokens being specified,
 and the "nothing" setting is equivalent to none of the tokens being specified.
 
 Here are the shortcut equivalents:
 
-    verbose=on
+    verbose=1
     verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait
 
-    verbose=off
+    verbose=0
     verbose=blank,label,new-id,edit
 
     verbose=nothing
@@ -298,16 +298,16 @@ Those additional comments are sent to the standard error for header, footnote
 and project. The others are sent to standard output.
 
 .TP
-.B confirmation=yes
-May be "yes" or "no", and determines whether Taskwarrior will ask for
+.B confirmation=1
+May be "1" or "0", and determines whether Taskwarrior will ask for
 confirmation before deleting a task or performing the undo command. The default
-value is "yes". Consider leaving this setting as "yes", for safety.
+value is "1". Consider leaving this enabled, for safety.
 
 .TP
-.B allow.empty.filter=yes
+.B allow.empty.filter=1
 An empty filter combined with a write command is potentially a way to modify
 all tasks by mistake, and when this is detected, confirmation is required.
-Setting this to 'no' means that it is an error to use a write command with no
+Setting this to '0' means that it is an error to use a write command with no
 filter.
 
 .TP
@@ -344,47 +344,47 @@ Default value is: 'You have more urgent tasks'.
 It is a gentle reminder that you are contradicting your own urgency settings.
 
 .TP
-.B list.all.projects=no
-May be yes or no, and determines whether the 'projects' command lists all the project
+.B list.all.projects=0
+May be "1" or "0", and determines whether the 'projects' command lists all the project
 names you have used, or just the ones used in active tasks. The default value is
-"no".
+"0".
 
 .TP
-.B summary.all.projects=no
-If set to yes, shows all projects in the summary report, even if there are no
-pending tasks.  The default value is "no".
+.B summary.all.projects=0
+If set to "1", shows all projects in the summary report, even if there are no
+pending tasks.  The default value is "0".
 
 .TP
-.B complete.all.tags=yes
-May be yes or no, and determines whether the tab completion scripts consider all
+.B complete.all.tags=1
+May be "1" or "0", and determines whether the tab completion scripts consider all
 the tag names you have used, or just the ones used in active tasks. The default
-value is "no".
+value is "0".
 
 .TP
-.B list.all.tags=yes
-May be yes or no, and determines whether the 'tags' command lists all the tag
+.B list.all.tags=1
+May be "1" or "0", and determines whether the 'tags' command lists all the tag
 names you have used, or just the ones used in active tasks. The default value is
-"no".
+"0".
 
 .TP
-.B print.empty.columns=no
-May be yes or no, and determines whether columns with no data for any task are
-printed. Defaults to no.
+.B print.empty.columns=1
+May be "1" or "0", and determines whether columns with no data for any task are
+printed. Defaults to "0".
 
 .TP
-.B search.case.sensitive=yes
-May be yes or no, and determines whether keyword lookup and substitutions on the
-description and annotations are done in a case sensitive way. Defaults to yes on
-most platforms. Defaults to no on Cygwin due to older regex library problems with
+.B search.case.sensitive=1
+May be "1" or "0", and determines whether keyword lookup and substitutions on the
+description and annotations are done in a case sensitive way. Defaults to "1" on
+most platforms. Defaults to "0" on Cygwin due to older regex library problems with
 case-insensitivity.
 
 .TP
-.B regex=on
-Controls whether regular expression support is enabled. The default value is on.
+.B regex=1
+Controls whether regular expression support is enabled. The default value is "1".
 
 .TP
-.B xterm.title=no
-Sets the xterm window title when reports are run. Defaults to off.
+.B xterm.title=1
+Sets the xterm window title when reports are run. Defaults to "0".
 
 .TP
 .B expressions=infix|postfix
@@ -392,21 +392,21 @@ Sets a preference for infix expressions (1 + 2) or postfix expressions (1 2 +).
 Defaults to infix.
 
 .TP
-.B json.array=on
+.B json.array=1
 Determines whether the export command encloses the JSON output in '[...]' and
 adds ',' after each exported task object to create a properly-formed JSON
 array.
-With json.array=off, export writes raw JSON objects to STDOUT, one per line.
-Defaults to on.
+With json.array=0, export writes raw JSON objects to STDOUT, one per line.
+Defaults to "1".
 
 .TP
-.B json.depends.array=on
+.B json.depends.array=1
 Determines whether the export command encodes dependencies as an array of string
 UUIDs, or one comma-separated string.
-Defaults to on.
+Defaults to "1".
 
 .TP
-.B _forcecolor=no
+.B _forcecolor=1
 Taskwarrior shuts off color automatically when the output is not sent directly
 to a TTY. For example, this command:
 
@@ -422,6 +422,8 @@ $ task rc._forcecolor=yes list > file
 .RE
 .RE
 
+Defaults to "0".
+
 .TP
 .B active.indicator=*
 The character or string to show in the start.active column. Defaults to *.
@@ -439,9 +441,9 @@ The character or string to show in the depends.indicator column. Defaults to +.
 The character or string to show in the <uda>.indicator column. Defaults to U.
 
 .TP
-.B recurrence=yes
+.B recurrence=1
 Controls whether recurrence is enabled, and whether recurring tasks continue to
-generate new task instances. Defaults to 'yes'.
+generate new task instances. Defaults to "1".
 
 .TP
 .B recurrence.confirmation=prompt
@@ -475,7 +477,7 @@ Minimum length of any abbreviated command/value. This means that "ve", "ver",
 Default is 2.
 
 .TP
-.B debug=off
+.B debug=0
 Taskwarrior has a debug mode that causes diagnostic output to be displayed.
 Typically this is not something anyone would want, but when reporting a bug,
 debug output can be useful. It can also help explain how the command line is
@@ -483,7 +485,7 @@ being parsed, but the information is displayed in a developer-friendly, not a
 user-friendly way.
 
 Turning debug on automatically sets debug.hooks=1, debug.parser=1 and debug.tls=2
-if they do not already have assigned values.
+if they do not already have assigned values. Defaults to "0".
 
 .TP
 .B debug.hooks=0
@@ -647,8 +649,8 @@ field that is set. Otherwise, they are set to the corresponding values of
 .RE
 
 .TP
-.B date.iso=yes
-Enables ISO-8601 date support.  The default value is "yes".
+.B date.iso=1
+Enables ISO-8601 date support.  The default value is "1".
 
 .TP
 .B weekstart=Sunday
@@ -656,10 +658,10 @@ Determines the day a week starts. Valid values are Sunday or Monday only. The
 default value is "Sunday".
 
 .TP
-.B displayweeknumber=yes
+.B displayweeknumber=1
 Determines if week numbers are displayed when using the "task calendar" command.
 The week number is dependent on the day a week starts. The default value is
-"yes".
+"1".
 
 .TP
 .B due=7
@@ -681,9 +683,9 @@ The report to run when displaying the details of tasks with due dates when
 running the "task calendar" command. The default value is "list".
 
 .TP
-.B calendar.offset=off
-If "on" the first month in the calendar report is effectively changed by the
-offset value specified in calendar.offset.value. It defaults to "off".
+.B calendar.offset=0
+If "1" the first month in the calendar report is effectively changed by the
+offset value specified in calendar.offset.value. It defaults to "0".
 
 .TP
 .B calendar.offset.value=-1
@@ -699,15 +701,15 @@ and no details on the holidays will be displayed. The displaying of holidays is
 turned off by setting the variable to none. The default value is "none".
 
 .TP
-.B calendar.legend=yes
-Determines whether the calendar legend is displayed. The default value is "yes".
+.B calendar.legend=1
+Determines whether the calendar legend is displayed. The default value is "1".
 
 .SS JOURNAL ENTRIES
 
 .TP
-.B journal.time=no
-May be yes or no, and determines whether the 'start' and 'stop' commands should
-record an annotation when being executed. The default value is "no". The text of
+.B journal.time=0
+May be "1" or "0", and determines whether the 'start' and 'stop' commands should
+record an annotation when being executed. The default value is "0". The text of
 the corresponding annotations is controlled by:
 
 .TP
@@ -721,9 +723,9 @@ The text of the annotation that is recorded when executing the stop command and
 having set journal.time.
 
 .TP
-.B journal.info=on
+.B journal.info=1
 When enabled, this setting causes a change log of each task to be displayed by
-the 'info' command. Default value is "on".
+the 'info' command. Default value is "1".
 
 .SS HOLIDAYS
 Holidays are entered either directly in the .taskrc file or via an include file
@@ -782,22 +784,22 @@ specified, Taskwarrior will only show as many that will fit.
 .SS DEPENDENCIES
 
 .TP
-.B dependency.reminder=on
+.B dependency.reminder=1
 Determines whether dependency chain violations generate reminders.
 
 .TP
-.B dependency.confirmation=yes
+.B dependency.confirmation=1
 Determines whether dependency chain repair requires confirmation.
 
 .SS COLOR CONTROLS
 
 .TP
-.B color=on
-May be "on" or "off". Determines whether Taskwarrior uses color. When "off",
+.B color=1
+May be "1" or "0". Determines whether Taskwarrior uses color. When "0",
 will use dashes (-----) to underline column headings.
 
 .TP
-.B fontunderline=on
+.B fontunderline=1
 Determines if font underlines or ASCII dashes should be used to underline
 headers, even when color is enabled.
 .RE
@@ -880,12 +882,11 @@ desired. In such cases, use the following option to disable this behaviour:
 .RE
 
 .TP
-.B rule.color.merge=yes
-Can be "yes" or "no". When "no", disables merging of colors produced by
+.B rule.color.merge=1
+Can be "1" or "0". When "0", disables merging of colors produced by
 different color rules. Use if your color scheme produces unpleasing
 foreground and background combinations.
 
-
 See the task-color(5) man pages for color details.
 .RE
 
@@ -1151,7 +1152,7 @@ The coefficients reflect the relative importance of the various terms in the
 urgency calculation. These are default values, and may be modified to suit your
 preferences, but it is important that you carefully consider any modifications.
 
-.B urgency.inherit=off
+.B urgency.inherit=0
 .RS
 Not actually a coefficient. When enabled, blocking tasks inherit
 the highest urgency value found in the tasks they block. This is
diff --git a/src/Config.cpp b/src/Config.cpp
index 92e9ff146..c82e1b813 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -61,45 +61,45 @@ std::string Config::_defaults =
   "\n"
   "# Files\n"
   "data.location=~/.task\n"
-  "locking=on                                     # Use file-level locking\n"
-  "gc=on                                          # Garbage-collect data files - DO NOT CHANGE unless you are sure\n"
-  "exit.on.missing.db=no                          # Whether to exit if ~/.task is not found\n"
-  "hooks=on                                       # Master control switch for hooks\n"
+  "locking=1                                      # Use file-level locking\n"
+  "gc=1                                           # Garbage-collect data files - DO NOT CHANGE unless you are sure\n"
+  "exit.on.missing.db=0                           # Whether to exit if ~/.task is not found\n"
+  "hooks=1                                        # Master control switch for hooks\n"
   "\n"
   "# Terminal\n"
-  "detection=on                                   # Detects terminal width\n"
+  "detection=1                                    # Detects terminal width\n"
   "defaultwidth=80                                # Without detection, assumed width\n"
   "defaultheight=24                               # Without detection, assumed height\n"
-  "avoidlastcolumn=no                             # Fixes Cygwin width problem\n"
-  "hyphenate=on                                   # Hyphenates lines wrapped on non-word-breaks\n"
+  "avoidlastcolumn=0                              # Fixes Cygwin width problem\n"
+  "hyphenate=1                                    # Hyphenates lines wrapped on non-word-breaks\n"
   "#editor=vi                                     # Preferred text editor\n"
   "reserved.lines=1                               # Assume a 1-line prompt\n"
   "\n"
   "# Miscellaneous\n"
   "#                                              # Comma-separated list.  May contain any subset of:\n"
   "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,recur\n"
-  "confirmation=yes                               # Confirmation on delete, big changes\n"
-  "recurrence=yes                                 # Enable recurrence\n"
+  "confirmation=1                                 # Confirmation on delete, big changes\n"
+  "recurrence=1                                   # Enable recurrence\n"
   "recurrence.confirmation=prompt                 # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
-  "allow.empty.filter=yes                         # An empty filter gets a warning and requires confirmation\n"
+  "allow.empty.filter=1                           # An empty filter gets a warning and requires confirmation\n"
   "indent.annotation=2                            # Indent spaces for annotations\n"
   "indent.report=0                                # Indent spaces for whole report\n"
   "row.padding=0                                  # Left and right padding for each row of report\n"
   "column.padding=1                               # Spaces between each column in a report\n"
   "bulk=3                                         # 3 or more tasks considered a bulk change and is confirmed\n"
   "nag=You have more urgent tasks.                # Nag message to keep you honest\n"                      // TODO
-  "search.case.sensitive=yes                      # Setting to no allows case insensitive searches\n"
+  "search.case.sensitive=1                        # Setting to no allows case insensitive searches\n"
   "active.indicator=*                             # What to show as an active task indicator\n"
   "tag.indicator=+                                # What to show as a tag indicator\n"
   "dependency.indicator=D                         # What to show as a dependency indicator\n"
   "recurrence.indicator=R                         # What to show as a task recurrence indicator\n"
   "recurrence.limit=1                             # Number of future recurring pending tasks\n"
   "undo.style=side                                # Undo style - can be 'side', or 'diff'\n"
-  "regex=yes                                      # Assume all search/filter strings are regexes\n"
-  "xterm.title=no                                 # Sets xterm title for some commands\n"
+  "regex=1                                        # Assume all search/filter strings are regexes\n"
+  "xterm.title=0                                  # Sets xterm title for some commands\n"
   "expressions=infix                              # Prefer infix over postfix expressions\n"
-  "json.array=on                                  # Enclose JSON output in [ ]\n"
-  "json.depends.array=off                         # Encode dependencies as a JSON array\n"
+  "json.array=1                                   # Enclose JSON output in [ ]\n"
+  "json.depends.array=0                           # Encode dependencies as a JSON array\n"
   "abbreviation.minimum=2                         # Shortest allowed abbreviation\n"
   "\n"
   "# Dates\n"
@@ -109,31 +109,31 @@ 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"
-  "date.iso=yes                                   # Enable ISO date support\n"
+  "date.iso=1                                     # Enable ISO date support\n"
   "weekstart="
              STRING_DATE_SUNDAY
                   "                               # Sunday or Monday only\n"
-  "displayweeknumber=yes                          # Show week numbers on calendar\n"
+  "displayweeknumber=1                            # Show week numbers on calendar\n"
   "due=7                                          # Task is considered due in 7 days\n"
   "\n"
   "# Calendar controls\n"
-  "calendar.legend=yes                            # Display the legend on calendar\n"
+  "calendar.legend=1                              # Display the legend on calendar\n"
   "calendar.details=sparse                        # Calendar shows information for tasks w/due dates: full, sparse or none\n"
   "calendar.details.report=list                   # Report to use when showing task information in cal\n"
-  "calendar.offset=no                             # Apply an offset value to control the first month of the calendar\n"
+  "calendar.offset=0                              # Apply an offset value to control the first month of the calendar\n"
   "calendar.offset.value=-1                       # The number of months the first month of the calendar is moved\n"
   "calendar.holidays=none                         # Show public holidays on calendar:full, sparse or none\n"
   "#monthsperline=3                               # Number of calendar months on a line\n"
   "\n"
   "# Journal controls\n"
-  "journal.time=no                                # Record start/stop commands as annotation\n"
+  "journal.time=0                                 # Record start/stop commands as annotation\n"
   "journal.time.start.annotation=Started task     # Annotation description for the start journal entry\n"
   "journal.time.stop.annotation=Stopped task      # Annotation description for the stop  journal entry\n"
-  "journal.info=on                                # Display task journal with info command\n"
+  "journal.info=1                                 # Display task journal with info command\n"
   "\n"
   "# Dependency controls\n"
-  "dependency.reminder=on                         # Nags on dependency chain violations\n"
-  "dependency.confirmation=on                     # Should dependency chain repair be confirmed?\n"
+  "dependency.reminder=1                          # Nags on dependency chain violations\n"
+  "dependency.confirmation=1                      # Should dependency chain repair be confirmed?\n"
   "\n"
   "# Urgency Coefficients\n"
   "urgency.user.tag.next.coefficient=15.0         # Urgency coefficient for 'next' special tag\n"
@@ -147,7 +147,7 @@ std::string Config::_defaults =
   "urgency.project.coefficient=1.0                # Urgency coefficient for projects\n"
   "urgency.blocked.coefficient=-5.0               # Urgency coefficient for blocked tasks\n"
   "urgency.waiting.coefficient=-3.0               # Urgency coefficient for waiting status\n"
-  "urgency.inherit=off                            # Recursively inherit highest urgency value from blocked tasks\n"
+  "urgency.inherit=0                              # Recursively inherit highest urgency value from blocked tasks\n"
   "urgency.age.max=365                            # Maximum age in days\n"
   "\n"
   "#urgency.user.project.foo.coefficient=5.0      # Urgency coefficients for 'foo' project\n"
@@ -155,12 +155,12 @@ std::string Config::_defaults =
   "#urgency.uda.foo.coefficient=5.0               # Urgency coefficients for UDA 'foo'\n"
   "\n"
   "# Color controls.\n"
-  "color=on                                       # Enable color\n"
+  "color=1                                        # Enable color\n"
   "\n"
   "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
   "\n"
   "# General decoration\n"
-  "rule.color.merge=yes\n"
+  "rule.color.merge=1\n"
   "color.label=\n"
   "color.label.sort=\n"
   "color.alternate=on gray2\n"
@@ -249,23 +249,23 @@ std::string Config::_defaults =
   "#default.due=eom                               # Default due date for 'add' command\n"
   "default.command=next                           # When no arguments are specified\n"
   "\n"
-  "_forcecolor=no                                 # Forces color to be on, even for non TTY output\n"
-  "complete.all.tags=no                           # Include old tag names in '_ags' command\n"
-  "list.all.projects=no                           # Include old project names in 'projects' command\n"
-  "summary.all.projects=no                        # Include old project names in 'summary' 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"
-  "sugar=yes                                      # Syntactic sugar\n"
-  "obfuscate=no                                   # Obfuscate data for error reporting\n"
-  "fontunderline=yes                              # Uses underlines rather than -------\n"
+  "_forcecolor=0                                  # Forces color to be on, even for non TTY output\n"
+  "complete.all.tags=0                            # Include old tag names in '_ags' command\n"
+  "list.all.projects=0                            # Include old project names in 'projects' command\n"
+  "summary.all.projects=0                         # Include old project names in 'summary' command\n"
+  "list.all.tags=0                                # Include old tag names in 'tags' command\n"
+  "print.empty.columns=0                          # Print columns which have no data for any task\n"
+  "debug=0                                        # Display diagnostics\n"
+  "sugar=1                                        # Syntactic sugar\n"
+  "obfuscate=0                                    # Obfuscate data for error reporting\n"
+  "fontunderline=1                                # Uses underlines rather than -------\n"
   "\n"
   "# WARNING: Please read the documentation (man task-sync) before setting up\n"
   "#          Taskwarrior for Taskserver synchronization.\n"
-  "#taskd.ca <certificate file>\n"
-  "#taskd.certificate <certificate file>\n"
-  "#taskd.credentials <organization>/<name>/<password>\n"
-  "#taskd.server      <server>:<port>\n"
+  "#taskd.ca=<certificate file>\n"
+  "#taskd.certificate=<certificate file>\n"
+  "#taskd.credentials=<organization>/<name>/<password>\n"
+  "#taskd.server=<server>:<port>\n"
   "taskd.trust=strict\n"
   "#taskd.trust=ignore hostname\n"
   "#taskd.trust=allow all\n"
@@ -594,12 +594,12 @@ bool Config::getBoolean (const std::string& key)
   {
     std::string value = Lexer::lowerCase ((*this)[key]);
     if (value == "t"      ||  // TODO Deprecate
-        value == "true"   ||
+        value == "true"   ||  // TODO Deprecate
         value == "1"      ||
         value == "+"      ||  // TODO Deprecate
-        value == "y"      ||
-        value == "yes"    ||
-        value == "on"     ||
+        value == "y"      ||  // TODO Deprecate
+        value == "yes"    ||  // TODO Deprecate
+        value == "on"     ||  // TODO Deprecate
         value == "enable" ||  // TODO Deprecate
         value == "enabled")   // TODO Deprecate
       return true;

From 43e1a2c991b71ebbe10677b65a4d74f8b51efef3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Sep 2016 16:13:23 -0400
Subject: [PATCH 089/879] Tests: Updated to non-deprecated Boolean values

---
 test/annotate.t                |  4 ++--
 test/basetest/task.py          |  2 +-
 test/bulk.t                    | 34 +++++++++++++++++-----------------
 test/encoding.t                |  2 +-
 test/enpassant.t               |  4 ++--
 test/exec.t                    |  2 +-
 test/feature.559.t             |  2 +-
 test/feature.default.project.t |  2 +-
 test/gc.t                      |  6 +++---
 test/hyphenate.t               |  4 ++--
 test/import.t                  |  6 +++---
 test/project.t                 |  2 +-
 test/rc.override.t             |  8 ++++----
 test/recurrence.t              |  6 +++---
 test/show.t                    |  2 +-
 test/special.t                 |  2 +-
 test/start.t                   |  4 ++--
 test/substitute.t              |  4 ++--
 test/sugar.t                   |  4 ++--
 test/tdb2.t.cpp                |  4 ++--
 test/urgency.t                 |  2 +-
 test/urgency_inherit.t         |  6 +++---
 test/verbose.t                 |  2 +-
 23 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/test/annotate.t b/test/annotate.t
index 630397667..1424b8260 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -81,7 +81,7 @@ class TestAnnotate(TestCase):
         self.t.config("report.rrr.columns",     "id,description")
         self.t.config("report.rrr.sort",        "id+")
         self.t.config("dateformat",             "m/d/Y")
-        self.t.config("color",                  "off")
+        self.t.config("color",                  "0")
 
         code, out, err = self.t("rrr")
 
@@ -154,7 +154,7 @@ class TestAnnotation(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
-        self.t.config("confirmation", "yes")
+        self.t.config("confirmation", "1")
 
     def test_blank_annotation(self):
         """Verify blank annotations are prevented"""
diff --git a/test/basetest/task.py b/test/basetest/task.py
index 35d0af84f..f83bb0358 100644
--- a/test/basetest/task.py
+++ b/test/basetest/task.py
@@ -72,7 +72,7 @@ class Task(object):
     def activate_hooks(self):
         """Enable self.hooks functionality and activate hooks on config
         """
-        self.config("hooks", "on")
+        self.config("hooks", "1")
         self.hooks = Hooks(self.datadir)
 
     def reset_env(self):
diff --git a/test/bulk.t b/test/bulk.t
index a6b88d707..38f276e96 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -47,50 +47,50 @@ class TestBulk(TestCase):
         self.t("add three")
 
     def test_bulk_confirmations_single_confirmation_off(self):
-        """not bulk delete 1 tasks with confirmation:off deletes it"""
+        """not bulk delete 1 tasks with confirmation:0 deletes it"""
 
         # Test with 1 task.  1 is a special case.
-        code, out, err = self.t("1 delete rc.confirmation:off")
+        code, out, err = self.t("1 delete rc.confirmation:0")
         self.assertNotIn("(yes/no)", out)
         self.assertNotIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
 
     def test_bulk_confirmations_single_confirmation_on(self):
-        """not bulk delete 1 task with confirmation:on and input >y deletes it"""
+        """not bulk delete 1 task with confirmation:1 and input >y deletes it"""
 
         # Test with 1 task.  1 is a special case.
-        code, out, err = self.t("2 delete rc.confirmation:on", input="y\n")
+        code, out, err = self.t("2 delete rc.confirmation:1", input="y\n")
         self.assertIn("(yes/no)", out)
         self.assertNotIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 2", out)
 
     def test_bulk_confirmations_double_confirmation_off(self):
-        """not bulk delete 2 tasks with confirmation:off deletes them"""
+        """not bulk delete 2 tasks with confirmation:0 deletes them"""
 
         # Test with 2 tasks.  2 is greater than 1 and less than bulk.
-        code, out, err = self.t("1-2 delete rc.confirmation:off")
+        code, out, err = self.t("1-2 delete rc.confirmation:0")
         self.assertNotIn("(yes/no)", out)
         self.assertNotIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
         self.assertIn("Deleting task 2", out)
 
     def test_bulk_confirmations_double_confirmation_on(self):
-        """not bulk delete 2 tasks with confirmation:on and input >y >y deletes them"""
+        """not bulk delete 2 tasks with confirmation:1 and input >y >y deletes them"""
 
         # Test with 2 tasks.  2 is greater than 1 and less than bulk.
-        code, out, err = self.t("1-2 delete rc.confirmation:on", input="y\ny\n")
+        code, out, err = self.t("1-2 delete rc.confirmation:1", input="y\ny\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
         self.assertIn("Deleting task 2", out)
 
     def test_bulk_confirmations_bulk_confirmation_off(self):
-        """bulk delete 3 tasks with confirmation:off always prompts"""
+        """bulk delete 3 tasks with confirmation:0 always prompts"""
 
         # Test with 3 tasks.  3 is considered bulk. rc.confirmation has no effect on bulk
 
         # Delete task 1 'one'? (yes/no/all/quit) --> timeout
-        code, out, err = self.t.runError("1-3 delete rc.confirmation:off")
+        code, out, err = self.t.runError("1-3 delete rc.confirmation:0")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertNotIn("Deleting task", out)
@@ -102,7 +102,7 @@ class TestBulk(TestCase):
         # Delete task 2 'two'? (yes/no/all/quit) Deleting task 2 'two'.
         # Delete task 3 'three'? (yes/no/all/quit) Deleting task 3 'three'.
         # Deleted 3 tasks.
-        code, out, err = self.t("1-3 delete rc.confirmation:off", input="y\ny\ny\n")
+        code, out, err = self.t("1-3 delete rc.confirmation:0", input="y\ny\ny\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
@@ -113,7 +113,7 @@ class TestBulk(TestCase):
         """bulk delete 3 tasks with confirmation:on and input >y >y >y deletes them"""
 
         # Test with 3 tasks.  3 is considered bulk. rc.confirmation has no effect on bulk
-        code, out, err = self.t("1-3 delete rc.confirmation:on", input="y\ny\ny\n")
+        code, out, err = self.t("1-3 delete rc.confirmation:1", input="y\ny\ny\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
@@ -124,14 +124,14 @@ class TestBulk(TestCase):
         """bulk delete >no deletes nothing"""
 
         # Test with 1 task, denying delete.
-        code, out, err = self.t.runError("1 delete rc.confirmation:on", input="n\n")
+        code, out, err = self.t.runError("1 delete rc.confirmation:1", input="n\n")
         self.assertIn("(yes/no)", out)
         self.assertNotIn("(yes/no/all/quit)", out)
         self.assertNotIn("Deleted task 1", out)
         self.assertNotIn("Deleting task", out)
 
         # Test with 2 tasks, denying delete.
-        code, out, err = self.t.runError("1-2 delete rc.confirmation:on", input="n\nn\n")
+        code, out, err = self.t.runError("1-2 delete rc.confirmation:1", input="n\nn\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertNotIn("Deleted task 1", out)
@@ -139,7 +139,7 @@ class TestBulk(TestCase):
         self.assertNotIn("Deleting task", out)
 
         # Test with 3 tasks, denying delete.
-        code, out, err = self.t.runError("1-3 delete rc.confirmation:on", input="n\nn\nn\n")
+        code, out, err = self.t.runError("1-3 delete rc.confirmation:1", input="n\nn\nn\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertNotIn("Deleted task 1", out)
@@ -150,7 +150,7 @@ class TestBulk(TestCase):
     def test_bulk_delete_all_tests(self):
         """bulk delete >all deletes everything"""
 
-        code, out, err = self.t("1-3 delete rc.confirmation:on", input="all\n")
+        code, out, err = self.t("1-3 delete rc.confirmation:1", input="all\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertIn("Deleting task 1", out)
@@ -161,7 +161,7 @@ class TestBulk(TestCase):
     def test_bulk_delete_quit_tests(self):
         """bulk delete >quit deletes nothing"""
 
-        code, out, err = self.t.runError("1-3 delete rc.confirmation:on", input="quit\n")
+        code, out, err = self.t.runError("1-3 delete rc.confirmation:1", input="quit\n")
         self.assertNotIn("(yes/no)", out)
         self.assertIn("(yes/no/all/quit)", out)
         self.assertIn("Deleted 0 tasks", out)
diff --git a/test/encoding.t b/test/encoding.t
index 94921dcfd..6fa8e84b1 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -63,7 +63,7 @@ class TestUtf8(TestCase):
         """Text alignment in reports with wide utf8 characters"""
         # Originally Bug #455 - Text alignment in reports is broken when text
         #                       contains wide utf8 characters
-        self.t.config("print.empty.columns", "no")
+        self.t.config("print.empty.columns", "0")
 
         self.t(("add", "abc", "pro:Bar\u263a"))
         self.t("add def pro:Foo")
diff --git a/test/enpassant.t b/test/enpassant.t
index 9b9923a93..493ef07df 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -40,7 +40,7 @@ class BaseTestEnpassant(TestCase):
         """Executed before each test in the class"""
         self.t = Task()
         # No journal log which may contain the words we are looking for
-        self.t.config("journal.info", "off")
+        self.t.config("journal.info", "0")
 
 
 class TestEnpassantMultiple(BaseTestEnpassant):
@@ -84,7 +84,7 @@ class TestEnpassant(BaseTestEnpassant):
     def setUp(self):
         super(TestEnpassant, self).setUp()
 
-        self.t.config("confirmation", "off")
+        self.t.config("confirmation", "0")
 
         self.t("add one")
         self.t("add two")
diff --git a/test/exec.t b/test/exec.t
index 1a2772449..9eac88756 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -40,7 +40,7 @@ class TestBug1414(TestCase):
     def setUp(self):
         self.t = Task()
         self.t.config("default.command", "exec echo hello")
-        self.t.config("verbose", "no")
+        self.t.config("verbose", "0")
 
     def test_execute(self):
         """use execute"""
diff --git a/test/feature.559.t b/test/feature.559.t
index b248916d0..3b342a013 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -40,7 +40,7 @@ class TestFeature559(TestCase):
     def setUp(self):
         self.t = Task()
 
-        self.t.config("exit.on.missing.db", "yes")
+        self.t.config("exit.on.missing.db", "1")
 
         # NOTE the framework uses TASKDATA and TASKRC to tell taskwarrior where
         # data is stored. Since these env variables take precedence over
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index f997d1747..b0aca793b 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -131,7 +131,7 @@ class TestDefaultProject(TestCase):
     def test_time_default_project(self):
         """default.project is not applied when start/stop'ing a task"""
         # Allow keeping track of time spent on task
-        self.t.config("journal.time", "yes")
+        self.t.config("journal.time", "1")
 
         self.t("add foobar")
         code, out, err = self.t("1 info")
diff --git a/test/gc.t b/test/gc.t
index 49d7c2e84..436e174d1 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -47,14 +47,14 @@ class TestGC(TestCase):
 
     def test_gc_off_id(self):
         """ID retained when GC off"""
-        self.t.config("gc", "off")
+        self.t.config("gc", "0")
         self.t("1 done")
         code, out, err = self.t("gctest")
         self.assertRegexpMatches(out, "1\s+one", "should still have ID")
 
     def test_gc_off_mod(self):
         """mod by ID after done with gc off"""
-        self.t.config("gc", "off")
+        self.t.config("gc", "0")
         self.t("1 done")
         self.t("gctest")
         self.t("2 mod +TWO")
@@ -63,7 +63,7 @@ class TestGC(TestCase):
 
     def test_gc_on_id(self):
         """IDs reshuffle after report when GC on"""
-        self.t.config("gc", "on")
+        self.t.config("gc", "1")
         self.t("1 done")
         self.t("2 mod +TWO")
         code, out, err = self.t("gctest")
diff --git a/test/hyphenate.t b/test/hyphenate.t
index a62482c98..15dfb4fae 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -40,7 +40,7 @@ class TestHyphenation(TestCase):
         """Executed before each test in the class"""
         self.t = Task()
         self.t.config("defaultwidth", "20")
-        self.t.config("detection",    "off")
+        self.t.config("detection",    "0")
         self.t.config("verbose",      "nothing")
 
     def test_hyphenation_on_space(self):
@@ -63,7 +63,7 @@ class TestBug804(TestCase):
 
     def test_hyphenation(self):
         """Verify hyphenation is controllable"""
-        self.t.config("print.empty.columns",     "yes")
+        self.t.config("print.empty.columns",     "1")
         self.t.config("report.unittest.labels",  "ID,Project,Pri,Description")
         self.t.config("report.unittest.columns", "id,project,priority,description")
         self.t.config("report.unittest.filter",  "status:pending")
diff --git a/test/import.t b/test/import.t
index 1318f72a2..311a126ff 100755
--- a/test/import.t
+++ b/test/import.t
@@ -192,7 +192,7 @@ class TestImport(TestCase):
         _data = """{"uuid":"a0000000-a000-a000-a000-a00000000000","depends":"a1111111-a111-a111-a111-a11111111111","description":"zero","project":"A","status":"pending","entry":"1234567889"}"""
         self.t("import", input=self.data1)
         self.t("import", input=_data)
-        self.t.config("json.depends.array", "off")
+        self.t.config("json.depends.array", "0")
         _t = self.t.export("a0000000-a000-a000-a000-a00000000000")[0]
         self.assertEqual(_t["depends"], "a1111111-a111-a111-a111-a11111111111")
 
@@ -242,8 +242,8 @@ class TestImportExportRoundtrip(TestCase):
         self.t2 = Task()
 
         for client in (self.t1, self.t2):
-            client.config("dateformat", "m/d/Y")
-            client.config("verbose", "off")
+            client.config("dateformat",   "m/d/Y")
+            client.config("verbose",      "0")
             client.config("defaultwidth", "100")
 
     def _validate_data(self, client):
diff --git a/test/project.t b/test/project.t
index 6bdfcb7ad..12d6aca03 100755
--- a/test/project.t
+++ b/test/project.t
@@ -397,7 +397,7 @@ class TestBug899(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
-        self.t.config("verbose", "on")
+        self.t.config("verbose", "1")
 
     def test_log_project(self):
         """899: Verify task log behaves correctly when logging into a project"""
diff --git a/test/rc.override.t b/test/rc.override.t
index 38a208590..89d457451 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -40,16 +40,16 @@ class TestOverride(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
-        self.t.config("regex",   "off")
+        self.t.config("regex",   "0")
         self.t.config("verbose", "nothing")
 
     def test_override(self):
         """Verify override is displayed in 'show' command"""
         code, out, err = self.t("show regex")
-        self.assertRegexpMatches(out, r"regex +off")
+        self.assertRegexpMatches(out, r"regex +0")
 
-        code, out, err = self.t("rc.regex:on show regex")
-        self.assertRegexpMatches(out, r"regex +on")
+        code, out, err = self.t("rc.regex:1 show regex")
+        self.assertRegexpMatches(out, r"regex +1")
 
 
 class TestRCSegfault(TestCase):
diff --git a/test/recurrence.t b/test/recurrence.t
index 7e8fbfc5b..1895df312 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -77,7 +77,7 @@ class TestRecurrenceDisabled(TestCase):
         disabled.
         """
 
-        self.t.config("recurrence", "no")
+        self.t.config("recurrence", "0")
         self.t("add due:today recur:daily Recurrent task.")
 
         # Trigger GC, expect no match and therefore non-zero code
@@ -325,7 +325,7 @@ class TestBug955(TestCase):
         """
 
         # With confirmation:off the first "n\n" has no effect.
-        self.t.config("confirmation", "off")
+        self.t.config("confirmation", "0")
         code, out, err = self.t("2 delete", input="n\ny\n")
         self.assertIn("Deleting task 2", out)
         self.assertIn("Deleted 1 task", out)
@@ -351,7 +351,7 @@ class TestBug955(TestCase):
         """
 
         # With confirmation:on the first "n\n" is obeyed.
-        self.t.config("confirmation", "on")
+        self.t.config("confirmation", "1")
         code, out, err = self.t.runError("2 delete", input="n\ny\n")
         self.assertIn("Deleted 0 tasks.", out)
 
diff --git a/test/show.t b/test/show.t
index 1631d3b55..75d831df4 100755
--- a/test/show.t
+++ b/test/show.t
@@ -80,7 +80,7 @@ class TestShowHelperCommand(TestCase):
     def test_show_helper_no_arg(self):
         """Verify _show command lists all with no arg provided"""
         code, out, err = self.t("_show")
-        self.assertIn("debug=no\n", out)
+        self.assertIn("debug=0\n", out)
         self.assertIn("verbose=", out)
 
 
diff --git a/test/special.t b/test/special.t
index bc5cd5f65..496bd4ce4 100755
--- a/test/special.t
+++ b/test/special.t
@@ -47,7 +47,7 @@ class TestSpecialTags(TestCase):
         cls.t.config("color.pri.H",       "")
         cls.t.config("color.completed",   "")
         cls.t.config("nag",               "NAG")
-        cls.t.config("color",             "on")
+        cls.t.config("color",             "1")
         cls.t.config("_forcecolor",       "1")
 
     def test_nocolor(self):
diff --git a/test/start.t b/test/start.t
index 63befe283..cb439d0aa 100755
--- a/test/start.t
+++ b/test/start.t
@@ -69,7 +69,7 @@ class TestStart(TestCase):
 
     def test_journal_time(self):
         """Verify journal.time tracks state"""
-        self.t.config("journal.time", "on")
+        self.t.config("journal.time", "1")
 
         self.t("add one")
         self.t("1 start")
@@ -82,7 +82,7 @@ class TestStart(TestCase):
 
     def test_journal_annotations(self):
         """Verify journal start/stop annotations are used"""
-        self.t.config("journal.time",                  "on")
+        self.t.config("journal.time",                  "1")
         self.t.config("journal.time.start.annotation", "Nu kör vi")
         self.t.config("journal.time.stop.annotation",  "Nu stannar vi")
 
diff --git a/test/substitute.t b/test/substitute.t
index 0836ac182..bc527508c 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -43,7 +43,7 @@ class TestSubstitutions(TestCase):
 
     def test_substitution(self):
         """Verify substitution for task description"""
-        self.t.config("regex", "off")
+        self.t.config("regex", "0")
 
         self.t("add foo foo foo")
         self.t("1 modify /foo/FOO/")
@@ -78,7 +78,7 @@ class TestSubstitutions(TestCase):
 
     def test_substitution_regex(self):
         """Verify regex substitution for task description"""
-        self.t.config("regex", "on")
+        self.t.config("regex", "1")
         self.t("add aaa bbb")
         self.t("1 modify /b{3}/BbB/")
         code, out, err = self.t("_get 1.description")
diff --git a/test/sugar.t b/test/sugar.t
index 9154baf36..bb7b950ad 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -50,7 +50,7 @@ class TestSugar(TestCase):
         self.assertIn("two", out)
         self.assertNotIn("three", out)
 
-        self.t.config("sugar", "off")
+        self.t.config("sugar", "0")
         code, out, err = self.t("1 2 count")
         self.assertEqual(0, int(out))
 
@@ -64,7 +64,7 @@ class TestSugar(TestCase):
         self.assertIn("three", out)
 
         # sugar off: WYSIWYG parsing.
-        self.t.config("sugar", "off")
+        self.t.config("sugar", "0")
         code, out, err = self.t("3 and '( 2 three )' count")
         self.assertEqual(0, int(out))
 
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index 933a6fe84..afcb6d2af 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -52,8 +52,8 @@ int main (int, char**)
     unlink ("./backlog.data");
 
     // Set the context to allow GC.
-    context.config.set ("gc", "on");
-    context.config.set ("debug", "on");
+    context.config.set ("gc", 1);
+    context.config.set ("debug", 1);
 
     context.tdb2.set_location (".");
 
diff --git a/test/urgency.t b/test/urgency.t
index e7e6f7b8d..ae7ab5cf3 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -54,7 +54,7 @@ class TestUrgency(TestCase):
         cls.t.config("urgency.user.tag.next.coefficient",        "10")
         cls.t.config("urgency.user.project.PROJECT.coefficient", "10")
         cls.t.config("urgency.user.tag.TAG.coefficient",         "10")
-        cls.t.config("confirmation",                             "off")
+        cls.t.config("confirmation",                             "0")
 
         cls.t("add control")                     # 1
 
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index 66e3eee77..fe8058d4d 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -62,16 +62,16 @@ class TestUrgencyInherit(TestCase):
 
     def test_urgency_inherit_off(self):
         """No urgency inheritance when switched off"""
-        self.t.config("urgency.inherit", "off")
+        self.t.config("urgency.inherit", "0")
         tl = self.get_tasks()
         self.assertTrue(tl[1]["urgency"] <= tl[2]["urgency"] < tl[3]["urgency"])
 
     def test_gc_off_mod(self):
         """Biggest urgency is inherited recursively"""
-        self.t.config("urgency.inherit", "off")
+        self.t.config("urgency.inherit", "0")
         tl = self.get_tasks()
         oldmax = max(tl[1]["urgency"], tl[2]["urgency"], tl[3]["urgency"])
-        self.t.config("urgency.inherit", "on")
+        self.t.config("urgency.inherit", "1")
         tl = self.get_tasks()
         self.assertTrue(oldmax <= tl[3]["urgency"])
         self.assertTrue(tl[1]["urgency"] >= tl[2]["urgency"] >= tl[3]["urgency"])
diff --git a/test/verbose.t b/test/verbose.t
index eb3607500..27378528d 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -41,7 +41,7 @@ from basetest import Task, TestCase
 class TestVerbosity(TestCase):
     def setUp(self):
         self.t = Task()
-        self.t.config("print.empty.columns", "yes")
+        self.t.config("print.empty.columns", "1")
 
         self.t("add Sample")
 

From 1fad357f267d10b56cc28ba89be6a36c87dfe7c0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 5 Sep 2016 08:52:17 -0400
Subject: [PATCH 090/879] Docs: Removed old reference to support forums

---
 INSTALL | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1c6a5e862..0c4ec138c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -192,8 +192,7 @@ CMake with no reported problems, and the build will fail later.  This is
 almost always because CMake is mistaken about some assumption.
 
 If a build does not succeed, please send the contents of the 'CMakeCache.txt'
-and 'CMakeFiles/CMakeOutput.log' files to support@taskwarrior.org, or post a
-message in the support forums at taskwarrior.org along with the information.
+and 'CMakeFiles/CMakeOutput.log' files to support@taskwarrior.org.
 
 If CMake runs but Taskwarrior does not build, please send the contents of the
 above files as well as a transcript from the build, which is not written to a

From f04cc0c9e6e185e51634f40b30ac79a16def8b15 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 9 Sep 2016 21:37:37 -0400
Subject: [PATCH 091/879] Build: Eliminated compiler warning

---
 src/ISO8601.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
index 8a94621b5..0830c21fd 100644
--- a/src/ISO8601.cpp
+++ b/src/ISO8601.cpp
@@ -707,9 +707,12 @@ bool ISO8601d::parse_date_time_ext (Nibbler& n)
         parse_time_ext (n))
     {
       if (n.skip ('Z'))
+      {
         _utc = true;
+      }
       else if (parse_off_ext (n))
-        ;
+      {
+      }
 
       if (! Lexer::isDigit (n.next ()))
         return true;

From 4f003cdb607b07339acaa1eb3aba61c6f04e0a94 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 18:58:31 -0400
Subject: [PATCH 092/879] ColDescription: Don't use string literals when
 character literals are needed

---
 src/columns/ColDescription.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index fdd1eba2e..82e6721fa 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -61,15 +61,15 @@ ColumnDescription::ColumnDescription ()
   std::string a3 = STRING_COLUMN_EXAMPLES_ANNO3;
   std::string a4 = STRING_COLUMN_EXAMPLES_ANNO4;
 
-  _examples = {d + "\n  " + t + " " + a1
-                 + "\n  " + t + " " + a2
-                 + "\n  " + t + " " + a3
-                 + "\n  " + t + " " + a4,
+  _examples = {d + "\n  " + t + ' ' + a1
+                 + "\n  " + t + ' ' + a2
+                 + "\n  " + t + ' ' + a3
+                 + "\n  " + t + ' ' + a4,
                d,
-               d + " " + t + " " + a1
-                 + " " + t + " " + a2
-                 + " " + t + " " + a3
-                 + " " + t + " " + a4,
+               d + ' ' + t + ' ' + a1
+                 + ' ' + t + ' ' + a2
+                 + ' ' + t + ' ' + a3
+                 + ' ' + t + ' ' + a4,
                d.substr (0, 20) + "...",
                d + " [4]",
                d.substr (0, 20) + "... [4]"};

From d9b528351caed634ffd162b8d1048b8ff3a0c4d8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 19:01:46 -0400
Subject: [PATCH 093/879] ColDue: Removed unused includes

---
 src/columns/ColDue.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 1b9b04901..2cf64a79e 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -26,15 +26,13 @@
 
 #include <cmake.h>
 #include <ColDue.h>
-#include <stdlib.h>
-#include <text.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDue::ColumnDue ()
 {
-  _name      = "due";
-  _label     = STRING_COLUMN_LABEL_DUE;
+  _name  = "due";
+  _label = STRING_COLUMN_LABEL_DUE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 7ad546504c64e94d09ebef7ff45ab45a1bbe968b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 19:02:06 -0400
Subject: [PATCH 094/879] ColIMask: Removed unused includes

---
 src/columns/ColIMask.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index eaf3871af..97ef05143 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -26,7 +26,6 @@
 
 #include <cmake.h>
 #include <ColIMask.h>
-#include <math.h>
 #include <text.h>
 #include <i18n.h>
 

From 67d4510e9b4536f6f69f91c23aeb57e939dcfe66 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 19:02:17 -0400
Subject: [PATCH 095/879] ColMask: Removed unused includes

---
 src/columns/ColMask.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 3e8459ebe..a00d7b8a8 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -26,7 +26,6 @@
 
 #include <cmake.h>
 #include <ColMask.h>
-#include <math.h>
 #include <text.h>
 #include <i18n.h>
 

From b3fe15dc413d77fafa70d30cd6ca12d3ec64ca52 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 19:02:28 -0400
Subject: [PATCH 096/879] ColParent: Removed unused includes

---
 src/columns/ColParent.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index ac7c0300b..3d1622c0b 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -26,7 +26,6 @@
 
 #include <cmake.h>
 #include <ColParent.h>
-#include <math.h>
 #include <text.h>
 #include <i18n.h>
 

From 1ebf75e7d09dd14d1fb6b6665d77d3d35ee16245 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 19:02:46 -0400
Subject: [PATCH 097/879] ColScheduled: Removed unused includes

---
 src/columns/ColScheduled.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 87cd7f223..bd3beeb13 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -26,8 +26,6 @@
 
 #include <cmake.h>
 #include <ColScheduled.h>
-#include <stdlib.h>
-#include <text.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////

From 99a7cfceac7f89fe06d8d8077e090d4f4601bcf8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 20:51:19 -0400
Subject: [PATCH 098/879] libshared: Updated to
 d84d1bc70b14c85af771bb5cc7299c290d5372b5

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 144d37263..d84d1bc70 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 144d37263c52aef3e0959e1b891785da3911ece5
+Subproject commit d84d1bc70b14c85af771bb5cc7299c290d5372b5

From 35e518cbc22e1947771f32094561ed7036f78169 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 22:27:34 -0400
Subject: [PATCH 099/879] Cleanup: Don't use string literals when character
 literals are needed

---
 src/CLI2.cpp                    |  22 +++---
 src/Color.cpp                   |   2 +-
 src/Config.cpp                  |   4 +-
 src/Context.cpp                 |  42 ++++++------
 src/DOM.cpp                     |   2 +-
 src/TLSClient.cpp               |   2 +-
 src/Task.cpp                    |   4 +-
 src/Timer.cpp                   |   2 +-
 src/calc.cpp                    |  28 ++++----
 src/columns/ColDescription.cpp  |   4 +-
 src/commands/CmdAdd.cpp         |   8 +--
 src/commands/CmdAliases.cpp     |   2 +-
 src/commands/CmdAnnotate.cpp    |   2 +-
 src/commands/CmdAppend.cpp      |   2 +-
 src/commands/CmdAttributes.cpp  |   2 +-
 src/commands/CmdBurndown.cpp    |  10 +--
 src/commands/CmdCalc.cpp        |   4 +-
 src/commands/CmdCalendar.cpp    |  12 ++--
 src/commands/CmdColor.cpp       | 100 +++++++++++++--------------
 src/commands/CmdColumns.cpp     |   6 +-
 src/commands/CmdCommands.cpp    |   6 +-
 src/commands/CmdConfig.cpp      |  10 +--
 src/commands/CmdContext.cpp     |  16 ++---
 src/commands/CmdCount.cpp       |   2 +-
 src/commands/CmdCustom.cpp      |   2 +-
 src/commands/CmdDelete.cpp      |   4 +-
 src/commands/CmdDenotate.cpp    |   4 +-
 src/commands/CmdDiagnostics.cpp |  90 ++++++++++++-------------
 src/commands/CmdDone.cpp        |   4 +-
 src/commands/CmdDuplicate.cpp   |  10 +--
 src/commands/CmdEdit.cpp        | 116 ++++++++++++++++----------------
 src/commands/CmdExport.cpp      |   4 +-
 src/commands/CmdGet.cpp         |   2 +-
 src/commands/CmdHelp.cpp        |   9 ++-
 src/commands/CmdHistory.cpp     |  30 ++++-----
 src/commands/CmdIDs.cpp         |  18 ++---
 src/commands/CmdImport.cpp      |  10 +--
 src/commands/CmdInfo.cpp        |  14 ++--
 src/commands/CmdLog.cpp         |   2 +-
 src/commands/CmdLogo.cpp        |   2 +-
 src/commands/CmdModify.cpp      |   2 +-
 src/commands/CmdPrepend.cpp     |   2 +-
 src/commands/CmdProjects.cpp    |   8 +--
 src/commands/CmdReports.cpp     |   2 +-
 src/commands/CmdShow.cpp        |  24 +++----
 src/commands/CmdStart.cpp       |   4 +-
 src/commands/CmdStop.cpp        |   4 +-
 src/commands/CmdSummary.cpp     |   4 +-
 src/commands/CmdSync.cpp        |  16 ++---
 src/commands/CmdTags.cpp        |   4 +-
 src/commands/CmdTimesheet.cpp   |  18 ++---
 src/commands/CmdUDAs.cpp        |   8 +--
 src/commands/CmdUnique.cpp      |   2 +-
 src/commands/CmdUrgency.cpp     |   2 +-
 src/commands/CmdVersion.cpp     |  20 +++---
 src/commands/Command.cpp        |   2 +-
 src/dependency.cpp              |   7 +-
 src/feedback.cpp                |   2 +-
 58 files changed, 372 insertions(+), 374 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index a6c1305b7..c8a2d06db 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -213,7 +213,7 @@ const std::string A2::dump () const
     else                             tags += "\033[32m"                + tag + "\033[0m ";
   }
 
-  return output + " " + atts + tags;
+  return output + ' ' + atts + tags;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -632,7 +632,7 @@ void CLI2::prepareFilter ()
       if (a.hasTag ("FILTER"))
       {
         if (combined != "")
-          combined += " ";
+          combined += ' ';
 
         combined += a.attribute ("raw");
       }
@@ -657,7 +657,7 @@ const std::vector <std::string> CLI2::getWords ()
     Color colorOrigArgs ("gray10 on gray4");
     std::string message = " ";
     for (const auto& word : words)
-      message += colorOrigArgs.colorize (word) + " ";
+      message += colorOrigArgs.colorize (word) + ' ';
     context.debug ("CLI2::getWords" + message);
   }
 
@@ -737,13 +737,13 @@ const std::string CLI2::dump (const std::string& title) const
       out << colorFilter.colorize (i->attribute ("raw"));
   }
 
-  out << "\n";
+  out << '\n';
 
   if (_args.size ())
   {
     out << "  _args\n";
     for (const auto& a : _args)
-      out << "    " << a.dump () << "\n";
+      out << "    " << a.dump () << '\n';
   }
 
   if (_id_ranges.size ())
@@ -752,21 +752,21 @@ const std::string CLI2::dump (const std::string& title) const
     for (const auto& range : _id_ranges)
     {
       if (range.first != range.second)
-        out << colorArgs.colorize (range.first + "-" + range.second) << " ";
+        out << colorArgs.colorize (range.first + "-" + range.second) << ' ';
       else
-        out << colorArgs.colorize (range.first) << " ";
+        out << colorArgs.colorize (range.first) << ' ';
     }
 
-    out << "\n";
+    out << '\n';
   }
 
   if (_uuid_list.size ())
   {
     out << "  _uuid_list\n    ";
     for (const auto& uuid : _uuid_list)
-      out << colorArgs.colorize (uuid) << " ";
+      out << colorArgs.colorize (uuid) << ' ';
 
-    out << "\n";
+    out << '\n';
   }
 
   return out.str ();
@@ -1242,7 +1242,7 @@ void CLI2::desugarFilterAttributes ()
       std::vector <A2> values = lexExpression (value);
       if (context.config.getInteger ("debug.parser") >= 2)
       {
-        context.debug ("CLI2::lexExpression " + name + ":" + value);
+        context.debug ("CLI2::lexExpression " + name + ':' + value);
         for (auto& v : values)
           context.debug ("  " + v.dump ());
         context.debug (" ");
diff --git a/src/Color.cpp b/src/Color.cpp
index 05be8acd0..557fdfea6 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -308,7 +308,7 @@ Color::operator std::string () const
     if (_value & _COLOR_BRIGHT)
       description += std::string (description.length () ? " " : "") + "bright";
 
-    description += " " + bg ();
+    description += ' ' + bg ();
   }
 
   return description;
diff --git a/src/Config.cpp b/src/Config.cpp
index c82e1b813..3cbe612af 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -489,7 +489,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
   std::stringstream contents;
   contents << "# [Created by "
            << PACKAGE_STRING
-           << " "
+           << ' '
            << now.toString ("m/d/Y H:N:S")
            << "]\n"
            << _defaults.substr (0, loc + 14)
@@ -509,7 +509,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
            << "#include " << TASK_RCDIR << "/solarized-dark-256.theme\n"
            << "#include " << TASK_RCDIR << "/solarized-light-256.theme\n"
            << "#include " << TASK_RCDIR << "/no-color.theme\n"
-           << "\n";
+           << '\n';
 
   // Write out the new file.
   if (! File::write (rc, contents.str ()))
diff --git a/src/Context.cpp b/src/Context.cpp
index 98edcd635..3d8c3e34e 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -273,9 +273,9 @@ int Context::initialize (int argc, const char** argv)
     {
       for (auto& d : debugMessages)
         if (color ())
-          std::cerr << colorizeDebug (d) << "\n";
+          std::cerr << colorizeDebug (d) << '\n';
         else
-          std::cerr << d << "\n";
+          std::cerr << d << '\n';
     }
 
     // Dump all headers, controlled by 'header' verbosity token.
@@ -283,9 +283,9 @@ int Context::initialize (int argc, const char** argv)
     {
       for (auto& h : headers)
         if (color ())
-          std::cerr << colorizeHeader (h) << "\n";
+          std::cerr << colorizeHeader (h) << '\n';
         else
-          std::cerr << h << "\n";
+          std::cerr << h << '\n';
     }
 
     // Dump all footnotes, controlled by 'footnote' verbosity token.
@@ -293,18 +293,18 @@ int Context::initialize (int argc, const char** argv)
     {
       for (auto& f : footnotes)
         if (color ())
-          std::cerr << colorizeFootnote (f) << "\n";
+          std::cerr << colorizeFootnote (f) << '\n';
         else
-          std::cerr << f << "\n";
+          std::cerr << f << '\n';
     }
 
     // Dump all errors, non-maskable.
     // Colorized as footnotes.
     for (auto& e : errors)
       if (color ())
-        std::cerr << colorizeFootnote (e) << "\n";
+        std::cerr << colorizeFootnote (e) << '\n';
       else
-        std::cerr << e << "\n";
+        std::cerr << e << '\n';
   }
 
   timer_init.stop ();
@@ -329,13 +329,13 @@ int Context::run ()
     std::stringstream s;
     s << "Perf "
       << PACKAGE_STRING
-      << " "
+      << ' '
 #ifdef HAVE_COMMIT
       << COMMIT
 #else
-      << "-"
+      << '-'
 #endif
-      << " "
+      << ' '
       << ISO8601d ().toISO ()
 
       << " init:"   << timer_init.total ()
@@ -356,7 +356,7 @@ int Context::run ()
                        timer_render.total () -
                        timer_hooks.total ()
       << " total:"  << timer_total.total ()
-      << "\n";
+      << '\n';
     debug (s.str ());
   }
 
@@ -383,9 +383,9 @@ int Context::run ()
   {
     for (auto& d : debugMessages)
       if (color ())
-        std::cerr << colorizeDebug (d) << "\n";
+        std::cerr << colorizeDebug (d) << '\n';
       else
-        std::cerr << d << "\n";
+        std::cerr << d << '\n';
   }
 
   // Dump all headers, controlled by 'header' verbosity token.
@@ -393,9 +393,9 @@ int Context::run ()
   {
     for (auto& h : headers)
       if (color ())
-        std::cerr << colorizeHeader (h) << "\n";
+        std::cerr << colorizeHeader (h) << '\n';
       else
-        std::cerr << h << "\n";
+        std::cerr << h << '\n';
   }
 
   // Dump the report output.
@@ -406,18 +406,18 @@ int Context::run ()
   {
     for (auto& f : footnotes)
       if (color ())
-        std::cerr << colorizeFootnote (f) << "\n";
+        std::cerr << colorizeFootnote (f) << '\n';
       else
-        std::cerr << f << "\n";
+        std::cerr << f << '\n';
   }
 
   // Dump all errors, non-maskable.
   // Colorized as footnotes.
   for (auto& e : errors)
     if (color ())
-      std::cerr << colorizeError (e) << "\n";
+      std::cerr << colorizeError (e) << '\n';
     else
-      std::cerr << e << "\n";
+      std::cerr << e << '\n';
 
   return rc;
 }
@@ -819,7 +819,7 @@ void Context::updateXtermTitle ()
       title += a->attribute ("raw");
     }
 
-    std::cout << "]0;task " << command << " " << title << "";
+    std::cout << "]0;task " << command << ' ' << title << "";
   }
 }
 
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 43fd96233..f1b06bbd9 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -90,7 +90,7 @@ bool getDOM (const std::string& name, Variant& value)
       for (auto& arg : context.cli2._original_args)
       {
         if (commandLine != "")
-           commandLine += " ";
+           commandLine += ' ';
 
         commandLine += arg.attribute("raw");
       }
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index cb87d1d46..512de5bf1 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -56,7 +56,7 @@ static int verify_certificate_callback (gnutls_session_t);
 ////////////////////////////////////////////////////////////////////////////////
 static void gnutls_log_function (int level, const char* message)
 {
-  std::cout << "c: " << level << " " << message;
+  std::cout << "c: " << level << ' ' << message;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Task.cpp b/src/Task.cpp
index 6a9e10f13..f8a0165b7 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -2144,12 +2144,12 @@ void Task::modify (modType type, bool text_required /* = false */)
 
     case modPrepend:
       context.debug (label + "description <-- '" + text + "' + description");
-      set ("description", text + " " + get ("description"));
+      set ("description", text + ' ' + get ("description"));
       break;
 
     case modAppend:
       context.debug (label + "description <-- description + '" + text + "'");
-      set ("description", get ("description") + " " + text);
+      set ("description", get ("description") + ' ' + text);
       break;
 
     case modAnnotate:
diff --git a/src/Timer.cpp b/src/Timer.cpp
index 0455903a5..ed41c55c9 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -55,7 +55,7 @@ Timer::~Timer ()
   std::stringstream s;
   s << "Timer "
     << _description
-    << " "
+    << ' '
     << std::setprecision (6)
     << std::fixed
     << _total / 1000000.0
diff --git a/src/calc.cpp b/src/calc.cpp
index 681f6af00..cf50b8695 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -57,7 +57,7 @@ int main (int argc, char** argv)
 
   try
   {
-    bool infix     = true;
+    bool infix {true};
 
     // Add a source for constants.
     Eval e;
@@ -69,29 +69,29 @@ int main (int argc, char** argv)
     for (int i = 1; i < argc; i++)
       if (!strcmp (argv[i], "-h") || ! strcmp (argv[i], "--help"))
       {
-        std::cout << "\n"
+        std::cout << '\n'
                   << "Usage: " << argv[0] << " [options] '<expression>'\n"
-                  << "\n"
+                  << '\n'
                   << "Options:\n"
                   << "  -h|--help         Display this usage\n"
                   << "  -d|--debug        Debug mode\n"
                   << "  -i|--infix        Infix expression (default)\n"
                   << "  -p|--postfix      Postfix expression\n"
-                  << "\n";
+                  << '\n';
         exit (1);
       }
       else if (!strcmp (argv[i], "-v") || !strcmp (argv[i], "--version"))
       {
-        std::cout << "\n"
+        std::cout << '\n'
                   << format (STRING_CMD_VERSION_BUILT, "calc", VERSION)
                   << osName ()
-                  << "\n"
+                  << '\n'
                   << STRING_CMD_VERSION_COPY
-                  << "\n"
-                  << "\n"
+                  << '\n'
+                  << '\n'
                   << STRING_CMD_VERSION_MIT
-                  << "\n"
-                  << "\n";
+                  << '\n'
+                  << '\n';
 
         exit (1);
       }
@@ -102,7 +102,7 @@ int main (int argc, char** argv)
       else if (!strcmp (argv[i], "-p") || !strcmp (argv[i], "--postfix"))
         infix = false;
       else
-        expression += std::string (argv[i]) + " ";
+        expression += std::string (argv[i]) + ' ';
 
     Variant result;
     if (infix)
@@ -112,16 +112,16 @@ int main (int argc, char** argv)
 
     // Show any debug output.
     for (auto& i : context.debugMessages)
-      std::cout << i << "\n";
+      std::cout << i << '\n';
 
     // Show the result in string form.
     std::cout << (std::string) result
-              << "\n";
+              << '\n';
   }
 
   catch (const std::string& error)
   {
-    std::cerr << error << "\n";
+    std::cerr << error << '\n';
     status = -1;
   }
 
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 82e6721fa..700d71cf3 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -182,7 +182,7 @@ void ColumnDescription::render (
       for (const auto& i : annos)
       {
         ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
-        description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second;
+        description += '\n' + std::string (_indent, ' ') + dt.toString (_dateformat) + ' ' + i.second;
       }
     }
 
@@ -213,7 +213,7 @@ void ColumnDescription::render (
       for (const auto& i : annos)
       {
         ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
-        description += " " + dt.toString (_dateformat) + " " + i.second;
+        description += ' ' + dt.toString (_dateformat) + ' ' + i.second;
       }
     }
 
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index bc85dbe03..efca8d798 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -63,19 +63,19 @@ int CmdAdd::execute (std::string& output)
   if (context.verbose ("new-id") &&
       (status == Task::pending ||
        status == Task::waiting))
-    output += format (STRING_CMD_ADD_FEEDBACK, task.id) + "\n";
+    output += format (STRING_CMD_ADD_FEEDBACK, task.id) + '\n';
 
   else if (context.verbose ("new-id") &&
            status == Task::recurring)
-    output += format (STRING_CMD_ADD_RECUR, task.id) + "\n";
+    output += format (STRING_CMD_ADD_RECUR, task.id) + '\n';
 
   else if (context.verbose ("new-uuid") &&
            status != Task::recurring)
-    output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + "\n";
+    output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + '\n';
 
   else if (context.verbose ("new-uuid") &&
            status == Task::recurring)
-    output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + "\n";
+    output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + '\n';
 
   if (context.verbose ("project"))
     context.footnote (onProjectChange (task));
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 75963044b..a46b01bde 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -53,7 +53,7 @@ int CmdCompletionAliases::execute (std::string& output)
 {
   for (auto& alias : context.config)
     if (alias.first.substr (0, 6) == "alias.")
-      output += alias.first.substr (6) + "\n";
+      output += alias.first.substr (6) + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index b7e632209..932ee027b 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -118,7 +118,7 @@ int CmdAnnotate::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_ANNO_NO << "\n";
+      std::cout << STRING_CMD_ANNO_NO << '\n';
       rc = 1;
       if (_permission_quit)
         break;
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index dbc811e9d..5be95aee9 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -118,7 +118,7 @@ int CmdAppend::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_APPEND_NO << "\n";
+      std::cout << STRING_CMD_APPEND_NO << '\n';
       rc = 1;
       if (_permission_quit)
         break;
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index dfd621090..f83743d31 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -60,7 +60,7 @@ int CmdZshAttributes::execute (std::string& output)
 
   std::stringstream out;
   for (auto& col : columns)
-    out << col << ":" << col << "\n";
+    out << col << ":" << col << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 5151b3712..7fca5be75 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -405,13 +405,13 @@ std::string Chart::render ()
   if (_graph_height < 5 ||     // a 4-line graph is essentially unreadable.
       _graph_width < 2)        // A single-bar graph is useless.
   {
-    return std::string (STRING_CMD_BURN_TOO_SMALL) + "\n";
+    return std::string (STRING_CMD_BURN_TOO_SMALL) + '\n';
   }
 
   else if (_graph_height > 1000 || // each line is a string allloc
            _graph_width  > 1000)
   {
-    return std::string (STRING_CMD_BURN_TOO_LARGE) + "\n";
+    return std::string (STRING_CMD_BURN_TOO_LARGE) + '\n';
   }
 
   if (_max_value == 0)
@@ -420,7 +420,7 @@ std::string Chart::render ()
   // Create a grid, folded into a string.
   _grid = "";
   for (int i = 0; i < _height; ++i)
-    _grid += std::string (_width, ' ') + "\n";
+    _grid += std::string (_width, ' ') + '\n';
 
   // Title.
   std::string full_title;
@@ -437,7 +437,7 @@ std::string Chart::render ()
   {
     if (full_title.length () + 1 + _title.length () < (unsigned) _width)
     {
-      full_title += " " + _title;
+      full_title += ' ' + _title;
       _grid.replace (LOC (0, (_width - full_title.length ()) / 2), full_title.length (), full_title);
     }
     else
@@ -494,7 +494,7 @@ std::string Chart::render ()
       _grid.replace (LOC (_height - 5, _max_label + 3 + ((_actual_bars - bar._offset - 1) * 3)), bar._minor_label.length (), bar._minor_label);
 
       if (_major_label != bar._major_label)
-        _grid.replace (LOC (_height - 4, _max_label + 2 + ((_actual_bars - bar._offset - 1) * 3)), bar._major_label.length (), " " + bar._major_label);
+        _grid.replace (LOC (_height - 4, _max_label + 2 + ((_actual_bars - bar._offset - 1) * 3)), bar._major_label.length (), ' ' + bar._major_label);
 
       _major_label = bar._major_label;
     }
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 20c50f79c..bd16c6daf 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -69,7 +69,7 @@ int CmdCalc::execute (std::string& output)
   // Compile all the args into one expression.
   std::string expression;
   for (auto& word : context.cli2.getWords ())
-    expression += word + " ";
+    expression += word + ' ';
 
   // Evaluate according to preference.
   Variant result;
@@ -78,7 +78,7 @@ int CmdCalc::execute (std::string& output)
   else
     e.evaluatePostfixExpression (expression, result);
 
-  output = (std::string) result + "\n";
+  output = (std::string) result + '\n';
   return 0;
 }
 
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 36a9823ad..f71e6e8c2 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -225,7 +225,7 @@ int CmdCalendar::execute (std::string& output)
   int details_mFrom = mFrom;
 
   std::stringstream out;
-  out << "\n";
+  out << '\n';
 
   while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
   {
@@ -269,10 +269,10 @@ int CmdCalendar::execute (std::string& output)
       }
     }
 
-    out << "\n"
+    out << '\n'
         << optionalBlankLine ()
         << renderMonths (mFrom, yFrom, today, tasks, monthsPerLine)
-        << "\n";
+        << '\n';
 
     mFrom += monthsPerLine;
     if (mFrom > 12)
@@ -306,9 +306,9 @@ int CmdCalendar::execute (std::string& output)
         << color_holiday.colorize ("holiday")
         << ", "
         << color_weeknumber.colorize ("weeknumber")
-        << "."
+        << '.'
         << optionalBlankLine ()
-        << "\n";
+        << '\n';
 
   if (context.config.get ("calendar.details") == "full" || context.config.get ("calendar.holidays") == "full")
   {
@@ -409,7 +409,7 @@ int CmdCalendar::execute (std::string& output)
 
       out << optionalBlankLine ()
           << holTable.render ()
-          << "\n";
+          << '\n';
     }
   }
 
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 6fe0e3b2e..7262c614c 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -71,7 +71,7 @@ int CmdColor::execute (std::string& output)
     // use.
     if (legend)
     {
-      out << "\n" << STRING_CMD_COLOR_HERE << "\n";
+      out << '\n' << STRING_CMD_COLOR_HERE << '\n';
 
       ViewText view;
       view.width (context.getWidth ());
@@ -94,7 +94,7 @@ int CmdColor::execute (std::string& output)
       }
 
       out << view.render ()
-          << "\n";
+          << '\n';
     }
 
     // If there is something in the description, then assume that is a color,
@@ -112,26 +112,26 @@ int CmdColor::execute (std::string& output)
       for (auto word = words.begin (); word != words.end (); ++word)
       {
         if (word != words.begin ())
-          swatch += " ";
+          swatch += ' ';
 
         swatch += *word;
       }
 
       Color sample (swatch);
 
-      out << "\n"
-          << STRING_CMD_COLOR_EXPLANATION                                          << "\n"
+      out << '\n'
+          << STRING_CMD_COLOR_EXPLANATION                                          << '\n'
           << "\n\n"
-          << STRING_CMD_COLOR_16                                                   << "\n"
-          << "  " << one.colorize ("task color black on bright yellow")            << "\n"
-          << "  " << two.colorize ("task color underline cyan on bright blue")     << "\n"
-          << "\n"
-          << STRING_CMD_COLOR_256                                                  << "\n"
-          << "  " << three.colorize ("task color color214 on color202")            << "\n"
-          << "  " << four.colorize ("task color rgb150 on rgb020")                 << "\n"
-          << "  " << five.colorize ("task color underline grey10 on grey3")        << "\n"
-          << "  " << six.colorize ("task color red on color173")                   << "\n"
-          << "\n"
+          << STRING_CMD_COLOR_16                                                   << '\n'
+          << "  " << one.colorize ("task color black on bright yellow")            << '\n'
+          << "  " << two.colorize ("task color underline cyan on bright blue")     << '\n'
+          << '\n'
+          << STRING_CMD_COLOR_256                                                  << '\n'
+          << "  " << three.colorize ("task color color214 on color202")            << '\n'
+          << "  " << four.colorize ("task color rgb150 on rgb020")                 << '\n'
+          << "  " << five.colorize ("task color underline grey10 on grey3")        << '\n'
+          << "  " << six.colorize ("task color red on color173")                   << '\n'
+          << '\n'
           << STRING_CMD_COLOR_YOURS                                                << "\n\n"
           << "  " << sample.colorize ("task color " + swatch)                      << "\n\n";
     }
@@ -139,41 +139,41 @@ int CmdColor::execute (std::string& output)
     // Show all supported colors.  Possibly show some unsupported ones too.
     else
     {
-      out << "\n"
+      out << '\n'
           << STRING_CMD_COLOR_BASIC
-          << "\n"
-          << " " << Color::colorize (" black ",   "black")
-          << " " << Color::colorize (" red ",     "red")
-          << " " << Color::colorize (" blue ",    "blue")
-          << " " << Color::colorize (" green ",   "green")
-          << " " << Color::colorize (" magenta ", "magenta")
-          << " " << Color::colorize (" cyan ",    "cyan")
-          << " " << Color::colorize (" yellow ",  "yellow")
-          << " " << Color::colorize (" white ",   "white")
-          << "\n"
-          << " " << Color::colorize (" black ",   "white on black")
-          << " " << Color::colorize (" red ",     "white on red")
-          << " " << Color::colorize (" blue ",    "white on blue")
-          << " " << Color::colorize (" green ",   "black on green")
-          << " " << Color::colorize (" magenta ", "black on magenta")
-          << " " << Color::colorize (" cyan ",    "black on cyan")
-          << " " << Color::colorize (" yellow ",  "black on yellow")
-          << " " << Color::colorize (" white ",   "black on white")
+          << '\n'
+          << ' ' << Color::colorize (" black ",   "black")
+          << ' ' << Color::colorize (" red ",     "red")
+          << ' ' << Color::colorize (" blue ",    "blue")
+          << ' ' << Color::colorize (" green ",   "green")
+          << ' ' << Color::colorize (" magenta ", "magenta")
+          << ' ' << Color::colorize (" cyan ",    "cyan")
+          << ' ' << Color::colorize (" yellow ",  "yellow")
+          << ' ' << Color::colorize (" white ",   "white")
+          << '\n'
+          << ' ' << Color::colorize (" black ",   "white on black")
+          << ' ' << Color::colorize (" red ",     "white on red")
+          << ' ' << Color::colorize (" blue ",    "white on blue")
+          << ' ' << Color::colorize (" green ",   "black on green")
+          << ' ' << Color::colorize (" magenta ", "black on magenta")
+          << ' ' << Color::colorize (" cyan ",    "black on cyan")
+          << ' ' << Color::colorize (" yellow ",  "black on yellow")
+          << ' ' << Color::colorize (" white ",   "black on white")
           << "\n\n";
 
       out << STRING_CMD_COLOR_EFFECTS
-          << "\n"
-          << " " << Color::colorize (" red ",               "red")
-          << " " << Color::colorize (" bold red ",          "bold red")
-          << " " << Color::colorize (" underline on blue ", "underline on blue")
-          << " " << Color::colorize (" on green ",          "black on green")
-          << " " << Color::colorize (" on bright green ",   "black on bright green")
-          << " " << Color::colorize (" inverse ",           "inverse")
+          << '\n'
+          << ' ' << Color::colorize (" red ",               "red")
+          << ' ' << Color::colorize (" bold red ",          "bold red")
+          << ' ' << Color::colorize (" underline on blue ", "underline on blue")
+          << ' ' << Color::colorize (" on green ",          "black on green")
+          << ' ' << Color::colorize (" on bright green ",   "black on bright green")
+          << ' ' << Color::colorize (" inverse ",           "inverse")
           << "\n\n";
 
       // 16 system colors.
       out << "color0 - color15"
-          << "\n"
+          << '\n'
           << "  0 1 2 . . .\n";
       for (int r = 0; r < 2; ++r)
       {
@@ -185,7 +185,7 @@ int CmdColor::execute (std::string& output)
           out << Color::colorize ("  ", s.str ());
         }
 
-        out << "\n";
+        out << '\n';
       }
 
       out << "          . . . 15\n\n";
@@ -200,21 +200,21 @@ int CmdColor::execute (std::string& output)
           << Color::colorize ("5", "bold green")
           << Color::colorize ("5", "bold blue")
           << " (also color16 - color231)"
-          << "\n"
+          << '\n'
           << "  " << Color::colorize ("0            "
                                       "1            "
                                       "2            "
                                       "3            "
                                       "4            "
                                       "5", "bold red")
-          << "\n"
+          << '\n'
           << "  " << Color::colorize ("0 1 2 3 4 5  "
                                       "0 1 2 3 4 5  "
                                       "0 1 2 3 4 5  "
                                       "0 1 2 3 4 5  "
                                       "0 1 2 3 4 5  "
                                       "0 1 2 3 4 5", "bold blue")
-          << "\n";
+          << '\n';
 
       char label [12];
       for (int g = 0; g < 6; ++g)
@@ -230,13 +230,13 @@ int CmdColor::execute (std::string& output)
             out << Color::colorize ("  ", s.str ());
           }
 
-          out << " ";
+          out << ' ';
         }
 
-        out << "\n";
+        out << '\n';
       }
 
-      out << "\n";
+      out << '\n';
 
       // Grey ramp.
       out << STRING_CMD_COLOR_RAMP
@@ -257,7 +257,7 @@ int CmdColor::execute (std::string& output)
   }
   else
   {
-    out << STRING_CMD_COLOR_OFF << "\n";
+    out << STRING_CMD_COLOR_OFF << '\n';
     rc = 1;
   }
 
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 759c4ed17..3696bb802 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -119,9 +119,9 @@ int CmdColumns::execute (std::string& output)
 
   output = optionalBlankLine ()
          + formats.render ()
-         + "\n"
+         + '\n'
          + STRING_CMD_COLUMNS_NOTE
-         + "\n";
+         + '\n';
 
   return 0;
 }
@@ -154,7 +154,7 @@ int CmdCompletionColumns::execute (std::string& output)
 
   // Render only the column names.
   for (auto& name : names)
-    output += name + "\n";
+    output += name + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 9875481a8..cb6a51dc7 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -119,7 +119,7 @@ int CmdCommands::execute (std::string& output)
   output = optionalBlankLine ()
          + view.render ()
          + optionalBlankLine ()
-         + "\n";
+         + '\n';
 
   return 0;
 }
@@ -154,7 +154,7 @@ int CmdCompletionCommands::execute (std::string& output)
 
   std::stringstream out;
   for (auto& c : commands)
-    out << c << "\n";
+    out << c << '\n';
 
   output = out.str ();
   return 0;
@@ -226,7 +226,7 @@ int CmdZshCommands::execute (std::string& output)
   for (auto& zc : commands)
     out << zc._command << ":"
         << Command::categoryNames.at (zc._category) << ":"
-        << zc._description << "\n";
+        << zc._description << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 8f9a6f8f4..932cc7136 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -77,7 +77,7 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
           confirm (format (STRING_CMD_CONFIG_CONFIRM, name, context.config.get (name), value)))
       {
         if (comment != std::string::npos)
-          line = name + "=" + json::encode (value) + " " + line.substr (comment);
+          line = name + "=" + json::encode (value) + ' ' + line.substr (comment);
         else
           line = name + "=" + json::encode (value);
 
@@ -178,7 +178,7 @@ int CmdConfig::execute (std::string& output)
       for (unsigned int i = 1; i < words.size (); ++i)
       {
         if (i > 1)
-          value += " ";
+          value += ' ';
 
         value += words[i];
       }
@@ -214,10 +214,10 @@ int CmdConfig::execute (std::string& output)
       {
         out << format (STRING_CMD_CONFIG_FILE_MOD,
                        context.config._original_file._data)
-            << "\n";
+            << '\n';
       }
       else
-        out << STRING_CMD_CONFIG_NO_CHANGE << "\n";
+        out << STRING_CMD_CONFIG_NO_CHANGE << '\n';
     }
     else
       throw std::string (STRING_CMD_CONFIG_NO_NAME);
@@ -254,7 +254,7 @@ int CmdCompletionConfig::execute (std::string& output)
   std::sort (configs.begin (), configs.end ());
 
   for (auto& config : configs)
-    output += config + "\n";
+    output += config + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index e507f4036..eae0dbdd1 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -94,7 +94,7 @@ std::string CmdContext::joinWords (const std::vector <std::string>& words, unsig
   for (unsigned int i = from; i < to; ++i)
   {
     if (i > from)
-      value += " ";
+      value += ' ';
 
     value += words[i];
   }
@@ -163,7 +163,7 @@ void CmdContext::defineContext (const std::vector <std::string>& words, std::str
     if (!success)
       throw format (STRING_CMD_CONTEXT_DEF_FAIL, words[1]);
 
-    out << format (STRING_CMD_CONTEXT_DEF_SUCC, words[1]) << "\n";
+    out << format (STRING_CMD_CONTEXT_DEF_SUCC, words[1]) << '\n';
   }
   else
     throw std::string (STRING_CMD_CONTEXT_DEF_USAG);
@@ -197,7 +197,7 @@ void CmdContext::deleteContext (const std::vector <std::string>& words, std::str
     if (rc != 0)
       throw format (STRING_CMD_CONTEXT_DEL_FAIL, words[1]);
 
-    out << format (STRING_CMD_CONTEXT_DEL_SUCC, words[1]) << "\n";
+    out << format (STRING_CMD_CONTEXT_DEL_SUCC, words[1]) << '\n';
   }
   else
     throw std::string(STRING_CMD_CONTEXT_DEL_USAG);
@@ -279,7 +279,7 @@ void CmdContext::setContext (const std::vector <std::string>& words, std::string
   if (! success)
     throw format (STRING_CMD_CONTEXT_SET_FAIL, value);
 
-  out << format (STRING_CMD_CONTEXT_SET_SUCC, value) << "\n";
+  out << format (STRING_CMD_CONTEXT_SET_SUCC, value) << '\n';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -295,11 +295,11 @@ void CmdContext::showContext (std::stringstream& out)
   auto currentContext = context.config.get ("context");
 
   if (currentContext == "")
-    out << STRING_CMD_CONTEXT_SHOW_EMPT << "\n";
+    out << STRING_CMD_CONTEXT_SHOW_EMPT << '\n';
   else
   {
     std::string currentFilter = context.config.get ("context." + currentContext);
-    out << format (STRING_CMD_CONTEXT_SHOW, currentContext, currentFilter) << "\n";
+    out << format (STRING_CMD_CONTEXT_SHOW, currentContext, currentFilter) << '\n';
   }
 }
 
@@ -318,7 +318,7 @@ void CmdContext::unsetContext (std::stringstream& out)
   if (CmdConfig::unsetConfigVariable ("context", false))
     throw std::string(STRING_CMD_CONTEXT_NON_FAIL);
 
-  out << STRING_CMD_CONTEXT_NON_SUCC << "\n";
+  out << STRING_CMD_CONTEXT_NON_SUCC << '\n';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -341,7 +341,7 @@ CmdCompletionContext::CmdCompletionContext ()
 int CmdCompletionContext::execute (std::string& output)
 {
   for (auto& contet : CmdContext::getContexts ())
-    output += contet + "\n";
+    output += contet + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 275c8230f..a9e5d2043 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -62,7 +62,7 @@ int CmdCount::execute (std::string& output)
     if (task.getStatus () != Task::recurring)
       ++count;
 
-  output = format (count) + "\n";
+  output = format (count) + '\n';
   return 0;
 }
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 6e55fcf0b..1c78dd2ca 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -225,7 +225,7 @@ int CmdCustom::execute (std::string& output)
         out << ", "
             << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header);
 
-      out << "\n";
+      out << '\n';
     }
   }
   else
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index a67ecbdde..1697483b8 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -159,7 +159,7 @@ int CmdDelete::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DELETE_NO << "\n";
+        std::cout << STRING_CMD_DELETE_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
@@ -170,7 +170,7 @@ int CmdDelete::execute (std::string&)
       std::cout << format (STRING_CMD_DELETE_NOT_DEL,
                            task.identifier (true),
                            task.get ("description"))
-          << "\n";
+          << '\n';
       rc = 1;
     }
   }
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index f84c01ce5..1f958f8fa 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -140,7 +140,7 @@ int CmdDenotate::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DENO_NO << "\n";
+        std::cout << STRING_CMD_DENO_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
@@ -148,7 +148,7 @@ int CmdDenotate::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_DENO_NOMATCH, pattern) << "\n";
+      std::cout << format (STRING_CMD_DENO_NOMATCH, pattern) << '\n';
       rc = 1;
     }
   }
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index a71fa5190..80ce794d5 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -75,19 +75,19 @@ int CmdDiagnostics::execute (std::string& output)
     bold = Color ("bold");
 
   std::stringstream out;
-  out << "\n"
+  out << '\n'
       << bold.colorize (PACKAGE_STRING)
-      << "\n";
+      << '\n';
 
   out << "   " << STRING_CMD_DIAG_PLATFORM << ": " << osName ()
       << "\n\n";
 
   // Compiler.
   out << bold.colorize (STRING_CMD_DIAG_COMPILER)
-      << "\n"
+      << '\n'
 #ifdef __VERSION__
       << "    " << STRING_CMD_DIAG_VERSION << ": "
-      << __VERSION__ << "\n"
+      << __VERSION__ << '\n'
 #endif
       << "       " << STRING_CMD_DIAG_CAPS << ":"
 #ifdef __STDC__
@@ -116,7 +116,7 @@ int CmdDiagnostics::execute (std::string& output)
       << " +l"      << 8 * sizeof (long)
       << " +vp"     << 8 * sizeof (void*)
       << " +time_t" << 8 * sizeof (time_t)
-      << "\n";
+      << '\n';
 
   // Compiler compliance level.
   std::string compliance = "non-compliant";
@@ -129,20 +129,20 @@ int CmdDiagnostics::execute (std::string& output)
   else
     compliance = format (level);
 #endif
-  out << " " << STRING_CMD_DIAG_COMPLIANCE
+  out << ' ' << STRING_CMD_DIAG_COMPLIANCE
       << ": "
       << compliance
       << "\n\n";
 
   out << bold.colorize (STRING_CMD_DIAG_FEATURES)
-      << "\n"
+      << '\n'
 
   // Build date.
-      << "      " << STRING_CMD_DIAG_BUILT << ": " << __DATE__ << " " << __TIME__ << "\n"
+      << "      " << STRING_CMD_DIAG_BUILT << ": " << __DATE__ << ' ' << __TIME__ << '\n'
 #ifdef HAVE_COMMIT
-      << "     " << STRING_CMD_DIAG_COMMIT << ": " << COMMIT << "\n"
+      << "     " << STRING_CMD_DIAG_COMMIT << ": " << COMMIT << '\n'
 #endif
-      << "      CMake: " << CMAKE_VERSION << "\n";
+      << "      CMake: " << CMAKE_VERSION << '\n';
 
   out << "    libuuid: "
 #ifdef HAVE_UUID_UNPARSE_LOWER
@@ -150,7 +150,7 @@ int CmdDiagnostics::execute (std::string& output)
 #else
       << "libuuid, no uuid_unparse_lower"
 #endif
-      << "\n";
+      << '\n';
 
   out << "  libgnutls: "
 #ifdef HAVE_LIBGNUTLS
@@ -162,7 +162,7 @@ int CmdDiagnostics::execute (std::string& output)
 #else
       << "n/a"
 #endif
-      << "\n";
+      << '\n';
 
   out << " Build type: "
 #ifdef CMAKE_BUILD_TYPE
@@ -174,20 +174,20 @@ int CmdDiagnostics::execute (std::string& output)
 
   // Config: .taskrc found, readable, writable
   out << bold.colorize (STRING_CMD_DIAG_CONFIG)
-      << "\n"
-      << "       File: " << context.config._original_file._data << " "
+      << '\n'
+      << "       File: " << context.config._original_file._data << ' '
       << (context.config._original_file.exists ()
            ? STRING_CMD_DIAG_FOUND
            : STRING_CMD_DIAG_MISSING)
-      << ", " << context.config._original_file.size () << " " << "bytes"
+      << ", " << context.config._original_file.size () << ' ' << "bytes"
       << ", mode "
       << std::setbase (8)
       << context.config._original_file.mode ()
-      << "\n";
+      << '\n';
 
   // Config: data.location found, readable, writable
   File location (context.config.get ("data.location"));
-  out << "       Data: " << location._data << " "
+  out << "       Data: " << location._data << ' '
       << (location.exists ()
            ? STRING_CMD_DIAG_FOUND
            : STRING_CMD_DIAG_MISSING)
@@ -195,44 +195,44 @@ int CmdDiagnostics::execute (std::string& output)
       << ", mode "
       << std::setbase (8)
       << location.mode ()
-      << "\n";
+      << '\n';
 
   char* env = getenv ("TASKRC");
   if (env)
     out << "     TASKRC: "
         << env
-        << "\n";
+        << '\n';
 
   env = getenv ("TASKDATA");
   if (env)
     out << "   TASKDATA: "
         << env
-        << "\n";
+        << '\n';
 
   out << "    Locking: "
       << (context.config.getBoolean ("locking")
            ? STRING_CMD_DIAG_ENABLED
            : STRING_CMD_DIAG_DISABLED)
-      << "\n";
+      << '\n';
 
   out << "         GC: "
       << (context.config.getBoolean ("gc")
            ? STRING_CMD_DIAG_ENABLED
            : STRING_CMD_DIAG_DISABLED)
-      << "\n";
+      << '\n';
 
   // Determine rc.editor/$EDITOR/$VISUAL.
   char* peditor;
   if (context.config.get ("editor") != "")
-    out << "  rc.editor: " << context.config.get ("editor") << "\n";
+    out << "  rc.editor: " << context.config.get ("editor") << '\n';
   else if ((peditor = getenv ("VISUAL")) != NULL)
-    out << "    $VISUAL: " << peditor << "\n";
+    out << "    $VISUAL: " << peditor << '\n';
   else if ((peditor = getenv ("EDITOR")) != NULL)
-    out << "    $EDITOR: " << peditor << "\n";
+    out << "    $EDITOR: " << peditor << '\n';
 
   out << "     Server: "
       << context.config.get ("taskd.server")
-      << "\n";
+      << '\n';
 
   if (context.config.get ("taskd.ca") != "")
     out << "         CA: "
@@ -246,7 +246,7 @@ int CmdDiagnostics::execute (std::string& output)
   if (trust_value == "strict" ||
       trust_value == "ignore hostname" ||
       trust_value == "allow all")
-    out << "      Trust: " << trust_value << "\n";
+    out << "      Trust: " << trust_value << '\n';
   else
     out << "      Trust: Bad value - see 'man taskrc'\n";
 
@@ -266,7 +266,7 @@ int CmdDiagnostics::execute (std::string& output)
 
   out << "    Ciphers: "
       << context.config.get ("taskd.ciphers")
-      << "\n";
+      << '\n';
 
   // Get credentials, but mask out the key.
   std::string credentials = context.config.get ("taskd.credentials");
@@ -285,13 +285,13 @@ int CmdDiagnostics::execute (std::string& output)
   hookLocation += "hooks";
 
   out << bold.colorize (STRING_CMD_DIAG_HOOKS)
-      << "\n"
+      << '\n'
       << "     System: "
       << (context.config.getBoolean ("hooks") ? STRING_CMD_DIAG_HOOK_ENABLE : STRING_CMD_DIAG_HOOK_DISABLE)
-      << "\n"
+      << '\n'
       << "   Location: "
       << static_cast <std::string> (hookLocation)
-      << "\n";
+      << '\n';
 
   auto hooks = context.hooks.list ();
   if (hooks.size ())
@@ -323,13 +323,13 @@ int CmdDiagnostics::execute (std::string& output)
           out << std::left << name
               << format (" ({1})", STRING_CMD_DIAG_HOOK_EXEC)
               << (p.is_link () ? format (" ({1})", STRING_CMD_DIAG_HOOK_SYMLINK) : "")
-              << "\n";
+              << '\n';
         }
       }
     }
 
     if (! count)
-      out << "\n";
+      out << '\n';
 
     out << "   Inactive: ";
     count = 0;
@@ -356,22 +356,22 @@ int CmdDiagnostics::execute (std::string& output)
                    name.substr (0, 9) == "on-modify" ||
                    name.substr (0, 9) == "on-launch" ||
                    name.substr (0, 7) == "on-exit") ? "" : format (" ({1})", STRING_CMD_DIAG_HOOK_NAME))
-              << "\n";
+              << '\n';
         }
       }
     }
 
     if (! count)
-      out << "\n";
+      out << '\n';
   }
   else
     out << format ("             ({1})\n", STRING_CMD_DIAG_NONE);
 
-  out << "\n";
+  out << '\n';
 
   // Verify UUIDs are all unique.
   out << bold.colorize (STRING_CMD_DIAG_TESTS)
-      << "\n";
+      << '\n';
 
   // Determine terminal details.
   const char* term = getenv ("TERM");
@@ -399,17 +399,17 @@ int CmdDiagnostics::execute (std::string& output)
 
   out << "       Dups: "
       << format (STRING_CMD_DIAG_UUID_SCAN, all.size ())
-      << "\n";
+      << '\n';
 
   if (dups.size ())
   {
     for (auto& d : dups)
-      out << "             " << format (STRING_CMD_DIAG_UUID_DUP, d) << "\n";
+      out << "             " << format (STRING_CMD_DIAG_UUID_DUP, d) << '\n';
   }
   else
   {
     out << "             " << STRING_CMD_DIAG_UUID_NO_DUP
-        << "\n";
+        << '\n';
   }
 
 
@@ -418,7 +418,7 @@ int CmdDiagnostics::execute (std::string& output)
   bool noBrokenRefs = true;
   out << " Broken ref: "
       << format (STRING_CMD_DIAG_REF_SCAN, all.size ())
-      << "\n";
+      << '\n';
 
   for (auto& task : all)
   {
@@ -432,7 +432,7 @@ int CmdDiagnostics::execute (std::string& output)
       {
         out << "             "
             << format (STRING_CMD_DIAG_MISS_DEP, task.get ("uuid"), uuid)
-            << "\n";
+            << '\n';
         noBrokenRefs = false;
       }
     }
@@ -444,16 +444,16 @@ int CmdDiagnostics::execute (std::string& output)
     {
       out << "             "
           << format (STRING_CMD_DIAG_MISS_PAR, task.get ("uuid"), parentUUID)
-          << "\n";
+          << '\n';
       noBrokenRefs = false;
     }
   }
 
   if (noBrokenRefs)
     out << "             " << STRING_CMD_DIAG_REF_OK
-        << "\n";
+        << '\n';
 
-  out << "\n";
+  out << '\n';
   output = out.str ();
   return 0;
 }
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 657949239..253ffb4b4 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -112,7 +112,7 @@ int CmdDone::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DONE_NO << "\n";
+        std::cout << STRING_CMD_DONE_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
@@ -123,7 +123,7 @@ int CmdDone::execute (std::string&)
       std::cout << format (STRING_CMD_DONE_NOTPEND,
                            task.identifier (true),
                            task.get ("description"))
-                << "\n";
+                << '\n';
       rc = 1;
     }
   }
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 9f0cc84f7..350dacabc 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -89,7 +89,7 @@ int CmdDuplicate::execute (std::string&)
       dup.remove ("until");
       dup.remove ("imask");
       std::cout << format (STRING_CMD_DUPLICATE_NON_REC, task.identifier ())
-          << "\n";
+          << '\n';
     }
 
     // When duplicating a parent task, create a new parent task.
@@ -97,7 +97,7 @@ int CmdDuplicate::execute (std::string&)
     {
       dup.remove ("mask");
       std::cout << format (STRING_CMD_DUPLICATE_REC, task.identifier ())
-          << "\n";
+          << '\n';
     }
 
     dup.setStatus (Task::pending); // Does not inherit status.
@@ -118,18 +118,18 @@ int CmdDuplicate::execute (std::string&)
       if (context.verbose ("new-id") &&
           (status == Task::pending ||
            status == Task::waiting))
-        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.id) + "\n";
+        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.id) + '\n';
 
       else if (context.verbose ("new-uuid") &&
                status != Task::recurring)
-        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.get ("uuid")) + "\n";
+        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.get ("uuid")) + '\n';
 
       if (context.verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task);
     }
     else
     {
-      std::cout << STRING_CMD_DUPLICATE_NO << "\n";
+      std::cout << STRING_CMD_DUPLICATE_NO << '\n';
       rc = 1;
       if (_permission_quit)
         break;
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 82265887a..36d1d8093 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -102,7 +102,7 @@ std::string CmdEdit::findValue (
   auto found = text.find (name);
   if (found != std::string::npos)
   {
-    auto eol = text.find ("\n", found + 1);
+    auto eol = text.find ('\n', found + 1);
     if (eol != std::string::npos)
     {
       std::string value = text.substr (
@@ -149,7 +149,7 @@ std::vector <std::string> CmdEdit::findValues (
     found = text.find (name, found + 1);
     if (found != std::string::npos)
     {
-      auto eol = text.find ("\n", found + 1);
+      auto eol = text.find ('\n', found + 1);
       if (eol != std::string::npos)
       {
         std::string value = text.substr (
@@ -203,30 +203,30 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   bool verbose = context.verbose ("edit");
 
   if (verbose)
-    before << "# " << STRING_EDIT_HEADER_1 << "\n"
-           << "# " << STRING_EDIT_HEADER_2 << "\n"
-           << "# " << STRING_EDIT_HEADER_3 << "\n"
-           << "# " << STRING_EDIT_HEADER_4 << "\n"
-           << "# " << STRING_EDIT_HEADER_5 << "\n"
-           << "# " << STRING_EDIT_HEADER_6 << "\n"
+    before << "# " << STRING_EDIT_HEADER_1 << '\n'
+           << "# " << STRING_EDIT_HEADER_2 << '\n'
+           << "# " << STRING_EDIT_HEADER_3 << '\n'
+           << "# " << STRING_EDIT_HEADER_4 << '\n'
+           << "# " << STRING_EDIT_HEADER_5 << '\n'
+           << "# " << STRING_EDIT_HEADER_6 << '\n'
            << "#\n"
-           << "# " << STRING_EDIT_HEADER_7 << "\n"
-           << "# " << STRING_EDIT_HEADER_8 << "\n"
-           << "# " << STRING_EDIT_HEADER_9 << "\n"
+           << "# " << STRING_EDIT_HEADER_7 << '\n'
+           << "# " << STRING_EDIT_HEADER_8 << '\n'
+           << "# " << STRING_EDIT_HEADER_9 << '\n'
            << "#\n"
-           << "# " << STRING_EDIT_HEADER_10 << "\n"
-           << "# " << STRING_EDIT_HEADER_11 << "\n"
-           << "# " << STRING_EDIT_HEADER_12 << "\n"
+           << "# " << STRING_EDIT_HEADER_10 << '\n'
+           << "# " << STRING_EDIT_HEADER_11 << '\n'
+           << "# " << STRING_EDIT_HEADER_12 << '\n'
            << "#\n";
 
-  before << "# " << STRING_EDIT_TABLE_HEADER_1 << "\n"
-         << "# " << STRING_EDIT_TABLE_HEADER_2 << "\n"
-         << "# ID:                " << task.id                                                 << "\n"
-         << "# UUID:              " << task.get ("uuid")                                       << "\n"
-         << "# Status:            " << Lexer::ucFirst (Task::statusToText (task.getStatus ())) << "\n"
-         << "# Mask:              " << task.get ("mask")                                       << "\n"
-         << "# iMask:             " << task.get ("imask")                                      << "\n"
-         << "  Project:           " << task.get ("project")                                    << "\n";
+  before << "# " << STRING_EDIT_TABLE_HEADER_1 << '\n'
+         << "# " << STRING_EDIT_TABLE_HEADER_2 << '\n'
+         << "# ID:                " << task.id                                                 << '\n'
+         << "# UUID:              " << task.get ("uuid")                                       << '\n'
+         << "# Status:            " << Lexer::ucFirst (Task::statusToText (task.getStatus ())) << '\n'
+         << "# Mask:              " << task.get ("mask")                                       << '\n'
+         << "# iMask:             " << task.get ("imask")                                      << '\n'
+         << "  Project:           " << task.get ("project")                                    << '\n';
 
   std::vector <std::string> tags;
   task.getTags (tags);
@@ -234,25 +234,25 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   join (allTags, " ", tags);
 
   if (verbose)
-    before << "# " << STRING_EDIT_TAG_SEP << "\n";
+    before << "# " << STRING_EDIT_TAG_SEP << '\n';
 
-  before << "  Tags:              " << allTags                                          << "\n"
-         << "  Description:       " << task.get ("description")                         << "\n"
-         << "  Created:           " << formatDate (task, "entry", dateformat)           << "\n"
-         << "  Started:           " << formatDate (task, "start", dateformat)           << "\n"
-         << "  Ended:             " << formatDate (task, "end", dateformat)             << "\n"
-         << "  Scheduled:         " << formatDate (task, "scheduled", dateformat)       << "\n"
-         << "  Due:               " << formatDate (task, "due", dateformat)             << "\n"
-         << "  Until:             " << formatDate (task, "until", dateformat)           << "\n"
-         << "  Recur:             " << task.get ("recur")                               << "\n"
-         << "  Wait until:        " << formatDate (task, "wait", dateformat)            << "\n"
-         << "# Modified:          " << formatDate (task, "modified", dateformat)        << "\n"
-         << "  Parent:            " << task.get ("parent")                              << "\n";
+  before << "  Tags:              " << allTags                                          << '\n'
+         << "  Description:       " << task.get ("description")                         << '\n'
+         << "  Created:           " << formatDate (task, "entry", dateformat)           << '\n'
+         << "  Started:           " << formatDate (task, "start", dateformat)           << '\n'
+         << "  Ended:             " << formatDate (task, "end", dateformat)             << '\n'
+         << "  Scheduled:         " << formatDate (task, "scheduled", dateformat)       << '\n'
+         << "  Due:               " << formatDate (task, "due", dateformat)             << '\n'
+         << "  Until:             " << formatDate (task, "until", dateformat)           << '\n'
+         << "  Recur:             " << task.get ("recur")                               << '\n'
+         << "  Wait until:        " << formatDate (task, "wait", dateformat)            << '\n'
+         << "# Modified:          " << formatDate (task, "modified", dateformat)        << '\n'
+         << "  Parent:            " << task.get ("parent")                              << '\n';
 
   if (verbose)
-    before << "# " << STRING_EDIT_HEADER_13 << "\n"
-           << "# " << STRING_EDIT_HEADER_14 << "\n"
-           << "# " << STRING_EDIT_HEADER_15 << "\n";
+    before << "# " << STRING_EDIT_HEADER_13 << '\n'
+           << "# " << STRING_EDIT_HEADER_14 << '\n'
+           << "# " << STRING_EDIT_HEADER_15 << '\n';
 
   std::map <std::string, std::string> annotations;
   task.getAnnotations (annotations);
@@ -260,7 +260,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   {
     ISO8601d dt (strtol (anno.first.substr (11).c_str (), NULL, 10));
     before << "  Annotation:        " << dt.toString (dateformat)
-           << " -- "                  << json::encode (anno.second) << "\n";
+           << " -- "                  << json::encode (anno.second) << '\n';
   }
 
   ISO8601d now;
@@ -285,9 +285,9 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   }
 
   if (verbose)
-    before << "# " << STRING_EDIT_DEP_SEP << "\n";
+    before << "# " << STRING_EDIT_DEP_SEP << '\n';
 
-  before << "  Dependencies:      " << allDeps.str () << "\n";
+  before << "  Dependencies:      " << allDeps.str () << '\n';
 
   // UDAs
   std::vector <std::string> udas;
@@ -297,7 +297,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   if (udas.size ())
   {
-    before << "# " << STRING_EDIT_UDA_SEP << "\n";
+    before << "# " << STRING_EDIT_UDA_SEP << '\n';
     std::sort (udas.begin (), udas.end ());
     for (auto& uda : udas)
     {
@@ -307,12 +307,12 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
         padding = std::string (pad, ' ');
 
       std::string type = context.config.get ("uda." + uda + ".type");
-      if (type == "string" || type == "numeric")    
-        before << "  UDA " << uda << ": " << padding << task.get (uda) << "\n";
+      if (type == "string" || type == "numeric")
+        before << "  UDA " << uda << ": " << padding << task.get (uda) << '\n';
       else if (type == "date")
-        before << "  UDA " << uda << ": " << padding << formatDate (task, uda, dateformat) << "\n";
+        before << "  UDA " << uda << ": " << padding << formatDate (task, uda, dateformat) << '\n';
       else if (type == "duration")
-        before << "  UDA " << uda << ": " << padding << formatDuration (task, uda) << "\n";
+        before << "  UDA " << uda << ": " << padding << formatDuration (task, uda) << '\n';
     }
   }
 
@@ -322,7 +322,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   if (orphans.size ())
   {
-    before << "# " << STRING_EDIT_UDA_ORPHAN_SEP << "\n";
+    before << "# " << STRING_EDIT_UDA_ORPHAN_SEP << '\n';
     std::sort (orphans.begin (), orphans.end ());
     for (auto& orphan : orphans)
     {
@@ -331,11 +331,11 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
       if (pad > 0)
         padding = std::string (pad, ' ');
 
-      before << "  UDA Orphan " << orphan << ": " << padding << task.get (orphan) << "\n";
+      before << "  UDA Orphan " << orphan << ": " << padding << task.get (orphan) << '\n';
     }
   }
 
-  before << "# " << STRING_EDIT_END << "\n";
+  before << "# " << STRING_EDIT_END << '\n';
   return before.str ();
 }
 
@@ -633,7 +633,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     found += 14;  // Length of "\n  Annotation:".
 
-    auto eol = after.find ("\n", found + 1);
+    auto eol = after.find ('\n', found + 1);
     if (eol != std::string::npos)
     {
       std::string value = Lexer::trim (after.substr (
@@ -797,22 +797,22 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   if (editor == "") editor = "vi";
 
   // Complete the command line.
-  editor += " ";
+  editor += ' ';
   editor += "\"" + file.str () + "\"";
 
 ARE_THESE_REALLY_HARMFUL:
   bool changes = false; // No changes made.
 
   // Launch the editor.
-  std::cout << format (STRING_EDIT_LAUNCHING, editor) << "\n";
+  std::cout << format (STRING_EDIT_LAUNCHING, editor) << '\n';
   int exitcode = system (editor.c_str ());
   if (0 == exitcode)
-    std::cout << STRING_EDIT_COMPLETE << "\n";
+    std::cout << STRING_EDIT_COMPLETE << '\n';
   else
   {
-    std::cout << format (STRING_EDIT_FAILED, exitcode) << "\n";
+    std::cout << format (STRING_EDIT_FAILED, exitcode) << '\n';
     if (-1 == exitcode)
-      std::cout << std::strerror (errno) << "\n";
+      std::cout << std::strerror (errno) << '\n';
     return CmdEdit::editResult::error;
   }
 
@@ -824,7 +824,7 @@ ARE_THESE_REALLY_HARMFUL:
   // if changes were made.
   if (before_orig != after)
   {
-    std::cout << STRING_EDIT_CHANGES << "\n";
+    std::cout << STRING_EDIT_CHANGES << '\n';
     std::string problem = "";
     bool oops = false;
 
@@ -841,7 +841,7 @@ ARE_THESE_REALLY_HARMFUL:
 
     if (oops)
     {
-      std::cerr << STRING_ERROR_PREFIX << problem << "\n";
+      std::cerr << STRING_ERROR_PREFIX << problem << '\n';
 
       // Preserve the edits.
       before = after;
@@ -855,7 +855,7 @@ ARE_THESE_REALLY_HARMFUL:
   }
   else
   {
-    std::cout << STRING_EDIT_NO_CHANGES << "\n";
+    std::cout << STRING_EDIT_NO_CHANGES << '\n';
     changes = false;
   }
 
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 2bffb7861..c406bf2b8 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -85,7 +85,7 @@ int CmdExport::execute (std::string& output)
     {
       if (json_array)
         output += ",";
-      output += "\n";
+      output += '\n';
     }
 
     output += task.composeJSON (true);
@@ -96,7 +96,7 @@ int CmdExport::execute (std::string& output)
   }
 
   if (filtered.size ())
-    output += "\n";
+    output += '\n';
 
   if (json_array)
     output += "]\n";
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 83e374f33..363574a66 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -91,7 +91,7 @@ int CmdGet::execute (std::string& output)
     throw std::string (STRING_CMD_GET_NO_DOM);
 
   join (output, " ", results);
-  output += "\n";
+  output += '\n';
   return 0;
 }
 
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 371c0801a..de0d9af85 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -32,7 +32,6 @@
 #include <i18n.h>
 #include <text.h>
 #include <util.h>
-#include <iostream> // TODO Remove
 
 extern Context context;
 
@@ -57,13 +56,13 @@ int CmdHelp::execute (std::string& output)
 {
   auto words = context.cli2.getWords ();
   if (words.size () == 1 && closeEnough ("usage", words[0]))
-    output = "\n"
+    output = '\n'
            + composeUsage ()
-           + "\n";
+           + '\n';
   else
-    output = "\n"
+    output = '\n'
            + composeUsage ()
-           + "\n"
+           + '\n'
            + STRING_CMD_HELP_TEXT;
 
   return 0;
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index bca8a7259..2cec28d86 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -174,7 +174,7 @@ int CmdHistoryMonthly::execute (std::string& output)
   if (view.rows ())
   {
     row = view.addRow ();
-    view.set (row, 0, " ");
+    view.set (row, 0, ' ');
     row = view.addRow ();
 
     Color row_color;
@@ -192,7 +192,7 @@ int CmdHistoryMonthly::execute (std::string& output)
   if (view.rows ())
     out << optionalBlankLine ()
         << view.render ()
-        << "\n";
+        << '\n';
   else
   {
     context.footnote (STRING_FEEDBACK_NO_TASKS);
@@ -354,7 +354,7 @@ int CmdHistoryAnnual::execute (std::string& output)
   if (view.rows ())
     out << optionalBlankLine ()
         << view.render ()
-        << "\n";
+        << '\n';
   else
   {
     context.footnote (STRING_FEEDBACK_NO_TASKS);
@@ -498,7 +498,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
         {
           aBar = format (addedGroup[i.first]);
           while (aBar.length () < addedBar)
-            aBar = " " + aBar;
+            aBar = ' ' + aBar;
         }
 
         std::string cBar = "";
@@ -506,7 +506,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
         {
           cBar = format (completedGroup[i.first]);
           while (cBar.length () < completedBar)
-            cBar = " " + cBar;
+            cBar = ' ' + cBar;
         }
 
         std::string dBar = "";
@@ -514,7 +514,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
         {
           dBar = format (deletedGroup[i.first]);
           while (dBar.length () < deletedBar)
-            dBar = " " + dBar;
+            dBar = ' ' + dBar;
         }
 
         bar += std::string (leftOffset - aBar.length (), ' ');
@@ -542,7 +542,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
   {
     out << optionalBlankLine ()
         << view.render ()
-        << "\n";
+        << '\n';
 
     if (context.color ())
       out << format (STRING_CMD_HISTORY_LEGEND,
@@ -550,10 +550,10 @@ int CmdGHistoryMonthly::execute (std::string& output)
                      color_done.colorize (STRING_CMD_HISTORY_COMP),
                      color_delete.colorize (STRING_CMD_HISTORY_DEL))
           << optionalBlankLine ()
-          << "\n";
+          << '\n';
     else
       out << STRING_CMD_HISTORY_LEGEND_A
-          << "\n";
+          << '\n';
   }
   else
   {
@@ -696,7 +696,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
         {
           aBar = format (addedGroup[i.first]);
           while (aBar.length () < addedBar)
-            aBar = " " + aBar;
+            aBar = ' ' + aBar;
         }
 
         std::string cBar = "";
@@ -704,7 +704,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
         {
           cBar = format (completedGroup[i.first]);
           while (cBar.length () < completedBar)
-            cBar = " " + cBar;
+            cBar = ' ' + cBar;
         }
 
         std::string dBar = "";
@@ -712,7 +712,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
         {
           dBar = format (deletedGroup[i.first]);
           while (dBar.length () < deletedBar)
-            dBar = " " + dBar;
+            dBar = ' ' + dBar;
         }
 
         bar += std::string (leftOffset - aBar.length (), ' ');
@@ -739,7 +739,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
   {
     out << optionalBlankLine ()
         << view.render ()
-        << "\n";
+        << '\n';
 
     if (context.color ())
       out << format (STRING_CMD_HISTORY_LEGEND,
@@ -747,10 +747,10 @@ int CmdGHistoryAnnual::execute (std::string& output)
                      color_done.colorize (STRING_CMD_HISTORY_COMP),
                      color_delete.colorize (STRING_CMD_HISTORY_DEL))
           << optionalBlankLine ()
-          << "\n";
+          << '\n';
     else
       out << STRING_CMD_HISTORY_LEGEND_A
-          << "\n";
+          << '\n';
   }
   else
   {
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index b8cc6021a..abb84eecd 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -70,7 +70,7 @@ int CmdIDs::execute (std::string& output)
       ids.push_back (task.id);
 
   std::sort (ids.begin (), ids.end ());
-  output = compressIds (ids) + "\n";
+  output = compressIds (ids) + '\n';
 
   context.headers.clear ();
   return 0;
@@ -100,7 +100,7 @@ std::string CmdIDs::compressIds (const std::vector <int>& ids)
     if (i + 1 == ids.size ())
     {
       if (result.str ().length ())
-        result << " ";
+        result << ' ';
 
       if (range_start < range_end)
         result << ids[range_start] << "-" << ids[range_end];
@@ -116,7 +116,7 @@ std::string CmdIDs::compressIds (const std::vector <int>& ids)
       else
       {
         if (result.str ().length ())
-          result << " ";
+          result << ' ';
 
         if (range_start < range_end)
           result << ids[range_start] << "-" << ids[range_end];
@@ -164,7 +164,7 @@ int CmdCompletionIds::execute (std::string& output)
 
   std::sort (ids.begin (), ids.end ());
   join (output, "\n", ids);
-  output += "\n";
+  output += '\n';
 
   context.headers.clear ();
   return 0;
@@ -200,9 +200,9 @@ int CmdZshCompletionIds::execute (std::string& output)
     if (task.getStatus () != Task::deleted &&
         task.getStatus () != Task::completed)
       out << task.id
-          << ":"
+          << ':'
           << str_replace(task.get ("description"), ":", zshColonReplacement)
-          << "\n";
+          << '\n';
 
   output = out.str ();
 
@@ -241,7 +241,7 @@ int CmdUUIDs::execute (std::string& output)
 
   std::sort (uuids.begin (), uuids.end ());
   join (output, " ", uuids);
-  output += "\n";
+  output += '\n';
 
   context.headers.clear ();
   return 0;
@@ -278,7 +278,7 @@ int CmdCompletionUuids::execute (std::string& output)
 
   std::sort (uuids.begin (), uuids.end ());
   join (output, "\n", uuids);
-  output += "\n";
+  output += '\n';
 
   context.headers.clear ();
   return 0;
@@ -314,7 +314,7 @@ int CmdZshCompletionUuids::execute (std::string& output)
     out << task.get ("uuid")
         << ":"
         << str_replace (task.get ("description"), ":", zshColonReplacement)
-        << "\n";
+        << '\n';
 
   output = out.str ();
 
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index b8687f3b4..ae893ac51 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -64,12 +64,12 @@ int CmdImport::execute (std::string&)
   std::vector <std::string> words = context.cli2.getWords ();
   if (! words.size () || (words.size () == 1 && words[0] == "-"))
   {
-    std::cout << format (STRING_CMD_IMPORT_FILE, "STDIN") << "\n";
+    std::cout << format (STRING_CMD_IMPORT_FILE, "STDIN") << '\n';
 
     std::string json;
     std::string line;
     while (std::getline (std::cin, line))
-      json += line + "\n";
+      json += line + '\n';
 
     if (nontrivial (json))
       count = import (json);
@@ -83,7 +83,7 @@ int CmdImport::execute (std::string&)
       if (! incoming.exists ())
         throw format (STRING_CMD_IMPORT_MISSING, word);
 
-      std::cout << format (STRING_CMD_IMPORT_FILE, word) << "\n";
+      std::cout << format (STRING_CMD_IMPORT_FILE, word) << '\n';
 
       // Load the file.
       std::string json;
@@ -224,9 +224,9 @@ void CmdImport::importSingleTask (json::object* obj)
   }
 
   std::cout << task.get ("uuid")
-            << " "
+            << ' '
             << task.get ("description")
-            << "\n";
+            << '\n';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 92445a58f..13b603398 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -130,10 +130,10 @@ int CmdInfo::execute (std::string& output)
     std::map <std::string, std::string> annotations;
     task.getAnnotations (annotations);
     for (auto& anno : annotations)
-      description += "\n"
+      description += '\n'
                    + std::string (indent, ' ')
                    + ISO8601d (anno.first.substr (11)).toString (dateformatanno)
-                   + " "
+                   + ' '
                    + anno.second;
 
     row = view.addRow ();
@@ -161,7 +161,7 @@ int CmdInfo::execute (std::string& output)
       {
         std::stringstream message;
         for (auto& block : blocked)
-          message << block.id << " " << block.get ("description") << "\n";
+          message << block.id << ' ' << block.get ("description") << '\n';
 
         row = view.addRow ();
         view.set (row, 0, STRING_CMD_INFO_BLOCKED);
@@ -177,7 +177,7 @@ int CmdInfo::execute (std::string& output)
       {
         std::stringstream message;
         for (auto& block : blocking)
-          message << block.id << " " << block.get ("description") << "\n";
+          message << block.id << ' ' << block.get ("description") << '\n';
 
         row = view.addRow ();
         view.set (row, 0, STRING_CMD_INFO_BLOCKING);
@@ -558,15 +558,15 @@ int CmdInfo::execute (std::string& output)
 
     out << optionalBlankLine ()
         << view.render ()
-        << "\n";
+        << '\n';
 
     if (urgencyDetails.rows () > 0)
       out << urgencyDetails.render ()
-          << "\n";
+          << '\n';
 
     if (journal.rows () > 0)
       out << journal.render ()
-          << "\n";
+          << '\n';
   }
 
   output = out.str ();
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 7e0816c22..886507578 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -72,7 +72,7 @@ int CmdLog::execute (std::string& output)
     context.footnote (onProjectChange (task));
 
   if (context.verbose ("new-uuid"))
-    output = format (STRING_CMD_LOG_LOGGED, task.get ("uuid")) + "\n";
+    output = format (STRING_CMD_LOG_LOGGED, task.get ("uuid")) + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 744c7e641..1c25fbc06 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -127,7 +127,7 @@ int CmdLogo::execute (std::string& output)
       }
     }
 
-    output += "\n";
+    output += '\n';
   }
 
   output += optionalBlankLine ();
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index d2a71d3ff..db203e180 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -92,7 +92,7 @@ int CmdModify::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_MODIFY_NO << "\n";
+        std::cout << STRING_CMD_MODIFY_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 4e2b04ce2..c0ead57f1 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -118,7 +118,7 @@ int CmdPrepend::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_PREPEND_NO << "\n";
+      std::cout << STRING_CMD_PREPEND_NO << '\n';
       rc = 1;
       if (_permission_quit)
         break;
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 6b632a3ba..b1ecb8a25 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -147,15 +147,15 @@ int CmdProjects::execute (std::string& output)
         << (number_projects == 1
               ? format (STRING_CMD_PROJECTS_SUMMARY,  number_projects)
               : format (STRING_CMD_PROJECTS_SUMMARY2, number_projects))
-        << " "
+        << ' '
         << (quantity == 1
               ? format (STRING_CMD_PROJECTS_TASK,  quantity)
               : format (STRING_CMD_PROJECTS_TASKS, quantity))
-        << "\n";
+        << '\n';
   }
   else
   {
-    out << STRING_CMD_PROJECTS_NO << "\n";
+    out << STRING_CMD_PROJECTS_NO << '\n';
     rc = 1;
   }
 
@@ -203,7 +203,7 @@ int CmdCompletionProjects::execute (std::string& output)
 
   for (auto& project : unique)
     if (project.first.length ())
-      output += project.first + "\n";
+      output += project.first + '\n';
 
   return 0;
 }
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 6cb5ae1e5..4474f96bd 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -111,7 +111,7 @@ int CmdReports::execute (std::string& output)
       << view.render ()
       << optionalBlankLine ()
       << format (STRING_CMD_REPORTS_SUMMARY, reports.size ())
-      << "\n";
+      << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index cfda33f4b..56d848ac5 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -222,7 +222,7 @@ int CmdShow::execute (std::string& output)
   {
     // Disallow partial matches by tacking a leading and trailing space on each
     // variable name.
-    std::string pattern = " " + i.first + " ";
+    std::string pattern = ' ' + i.first + ' ';
     if (recognized.find (pattern) == std::string::npos)
     {
       // These are special configuration variables, because their name is
@@ -320,14 +320,14 @@ int CmdShow::execute (std::string& output)
     }
   }
 
-  out << "\n"
+  out << '\n'
       << view.render ()
       << (view.rows () == 0 ? STRING_CMD_SHOW_NONE : "")
       << (view.rows () == 0 ? "\n\n" : "\n");
 
   if (issue_warning)
   {
-    out << STRING_CMD_SHOW_DIFFER << "\n";
+    out << STRING_CMD_SHOW_DIFFER << '\n';
 
     if (context.color () && warning.nontrivial ())
       out << "  "
@@ -338,13 +338,13 @@ int CmdShow::execute (std::string& output)
   // Display the unrecognized variables.
   if (issue_error)
   {
-    out << STRING_CMD_SHOW_UNREC << "\n";
+    out << STRING_CMD_SHOW_UNREC << '\n';
 
     for (auto& i : unrecognized)
-      out << "  " << i << "\n";
+      out << "  " << i << '\n';
 
     if (context.color () && error.nontrivial ())
-      out << "\n" << format (STRING_CMD_SHOW_DIFFER_COLOR, error.colorize ("color"));
+      out << '\n' << format (STRING_CMD_SHOW_DIFFER_COLOR, error.colorize ("color"));
 
     out << "\n\n";
   }
@@ -361,7 +361,7 @@ int CmdShow::execute (std::string& output)
       calendardetails != "sparse" &&
       calendardetails != "none")
     out << format (STRING_CMD_SHOW_CONFIG_ERROR, "calendar.details", calendardetails)
-        << "\n";
+        << '\n';
 
   // Check for bad values in rc.calendar.holidays.
   std::string calendarholidays = context.config.get ("calendar.holidays");
@@ -369,14 +369,14 @@ int CmdShow::execute (std::string& output)
       calendarholidays != "sparse" &&
       calendarholidays != "none")
     out << format (STRING_CMD_SHOW_CONFIG_ERROR, "calendar.holidays", calendarholidays)
-        << "\n";
+        << '\n';
 
   // Verify installation.  This is mentioned in the documentation as the way
   // to ensure everything is properly installed.
 
   if (context.config.size () == 0)
   {
-    out << STRING_CMD_SHOW_EMPTY << "\n";
+    out << STRING_CMD_SHOW_EMPTY << '\n';
     rc = 1;
   }
   else
@@ -384,10 +384,10 @@ int CmdShow::execute (std::string& output)
     Directory location (context.config.get ("data.location"));
 
     if (location._data == "")
-      out << STRING_CMD_SHOW_NO_LOCATION << "\n";
+      out << STRING_CMD_SHOW_NO_LOCATION << '\n';
 
     if (! location.exists ())
-      out << STRING_CMD_SHOW_LOC_EXIST << "\n";
+      out << STRING_CMD_SHOW_LOC_EXIST << '\n';
   }
 
   output = out.str ();
@@ -418,7 +418,7 @@ int CmdShowRaw::execute (std::string& output)
   // Display them all.
   std::stringstream out;
   for (auto& i : all)
-    out << i << '=' << context.config.get (i) << "\n";
+    out << i << '=' << context.config.get (i) << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index dbad4c2d0..34f2df484 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -109,7 +109,7 @@ int CmdStart::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_START_NO << "\n";
+        std::cout << STRING_CMD_START_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
@@ -120,7 +120,7 @@ int CmdStart::execute (std::string&)
       std::cout << format (STRING_CMD_START_ALREADY,
                            task.id,
                            task.get ("description"))
-                << "\n";
+                << '\n';
       rc = 1;
     }
   }
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 7ce117cd5..40dc5e33a 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -99,7 +99,7 @@ int CmdStop::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_STOP_NO << "\n";
+        std::cout << STRING_CMD_STOP_NO << '\n';
         rc = 1;
         if (_permission_quit)
           break;
@@ -110,7 +110,7 @@ int CmdStop::execute (std::string&)
       std::cout << format (STRING_CMD_STOP_ALREADY,
                            task.identifier (true),
                            task.get ("description"))
-                << "\n";
+                << '\n';
       rc = 1;
     }
   }
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 04e06ce4b..99783e2c5 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -212,11 +212,11 @@ int CmdSummary::execute (std::string& output)
         << view.render ()
         << optionalBlankLine ();
 
-    out << format (STRING_CMD_PROJECTS_SUMMARY2, view.rows ()) << "\n";
+    out << format (STRING_CMD_PROJECTS_SUMMARY2, view.rows ()) << '\n';
   }
   else
   {
-    out << STRING_CMD_PROJECTS_NO << "\n";
+    out << STRING_CMD_PROJECTS_NO << '\n';
     rc = 1;
   }
 
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index c791a6928..52d425761 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -138,7 +138,7 @@ int CmdSync::execute (std::string& output)
     auto all_tasks = context.tdb2.all_tasks ();
     for (auto& i : all_tasks)
     {
-      payload += i.composeJSON () + "\n";
+      payload += i.composeJSON () + '\n';
       ++upload_count;
     }
   }
@@ -150,7 +150,7 @@ int CmdSync::execute (std::string& output)
       if (i[0] == '{')
         ++upload_count;
 
-      payload += i + "\n";
+      payload += i + '\n';
     }
   }
 
@@ -172,7 +172,7 @@ int CmdSync::execute (std::string& output)
 
   if (context.verbose ("sync"))
     out << format (STRING_CMD_SYNC_PROGRESS, connection)
-        << "\n";
+        << '\n';
 
   // Ignore harmful signals.
   signal (SIGHUP,    SIG_IGN);
@@ -227,7 +227,7 @@ int CmdSync::execute (std::string& output)
                        format (STRING_CMD_SYNC_MOD,
                                uuid,
                                from_server.get ("description")))
-                  << "\n";
+                  << '\n';
             context.tdb2.modify (from_server, false);
           }
           else
@@ -238,7 +238,7 @@ int CmdSync::execute (std::string& output)
                        format (STRING_CMD_SYNC_ADD,
                                uuid,
                                from_server.get ("description")))
-                  << "\n";
+                  << '\n';
             context.tdb2.add (from_server, false);
           }
         }
@@ -259,7 +259,7 @@ int CmdSync::execute (std::string& output)
         context.tdb2.backlog._file.truncate ();
         context.tdb2.backlog.clear_tasks ();
         context.tdb2.backlog.clear_lines ();
-        context.tdb2.backlog.add_line (sync_key + "\n");
+        context.tdb2.backlog.add_line (sync_key + '\n');
 
         // Present a clear status message.
         if (upload_count == 0 && download_count == 0)
@@ -326,7 +326,7 @@ int CmdSync::execute (std::string& output)
   }
 
   if (context.verbose ("sync"))
-    out << "\n";
+    out << '\n';
   output = out.str ();
 
   // Restore signal handling.
@@ -373,7 +373,7 @@ bool CmdSync::send (
     client.ciphers (context.config.get ("taskd.ciphers"));
     client.init (ca, certificate, key);
     client.connect (server, port);
-    client.send (request.serialize () + "\n");
+    client.send (request.serialize () + '\n');
 
     std::string incoming;
     client.recv (incoming);
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 0f2fc82e6..95eedbb9a 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -134,7 +134,7 @@ int CmdTags::execute (std::string& output)
     else
       context.footnote (format (STRING_FEEDBACK_TASKS_PLURAL, quantity));
 
-    out << "\n";
+    out << '\n';
   }
   else
   {
@@ -224,7 +224,7 @@ int CmdCompletionTags::execute (std::string& output)
 
   std::stringstream out;
   for (auto& it : unique)
-    out << it.first << "\n";
+    out << it.first << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index f2e5ae752..15d25ba55 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -97,9 +97,9 @@ int CmdTimesheet::execute (std::string& output)
     if (context.color ())
       bold = Color ("bold");
 
-    out << "\n"
+    out << '\n'
         << bold.colorize (title)
-        << "\n";
+        << '\n';
 
     // Render the completed table.
     ViewText completed;
@@ -145,10 +145,10 @@ int CmdTimesheet::execute (std::string& output)
           std::map <std::string, std::string> annotations;
           task.getAnnotations (annotations);
           for (auto& ann : annotations)
-            description += "\n"
+            description += '\n'
                          + std::string (indent, ' ')
                          + ISO8601d (ann.first.substr (11)).toString (context.config.get ("dateformat"))
-                         + " "
+                         + ' '
                          + ann.second;
 
           completed.set (row, 3, description, c);
@@ -156,11 +156,11 @@ int CmdTimesheet::execute (std::string& output)
       }
     }
 
-    out << "  " << format (STRING_CMD_TIMESHEET_DONE, completed.rows ()) << "\n";
+    out << "  " << format (STRING_CMD_TIMESHEET_DONE, completed.rows ()) << '\n';
 
     if (completed.rows ())
       out << completed.render ()
-          << "\n";
+          << '\n';
 
     // Now render the started table.
     ViewText started;
@@ -201,10 +201,10 @@ int CmdTimesheet::execute (std::string& output)
           std::map <std::string, std::string> annotations;
           task.getAnnotations (annotations);
           for (auto& ann : annotations)
-            description += "\n"
+            description += '\n'
                          + std::string (indent, ' ')
                          + ISO8601d (ann.first.substr (11)).toString (context.config.get ("dateformat"))
-                         + " "
+                         + ' '
                          + ann.second;
 
           started.set (row, 3, description, c);
@@ -212,7 +212,7 @@ int CmdTimesheet::execute (std::string& output)
       }
     }
 
-    out << "  " << format (STRING_CMD_TIMESHEET_STARTED, started.rows ()) << "\n";
+    out << "  " << format (STRING_CMD_TIMESHEET_STARTED, started.rows ()) << '\n';
 
     if (started.rows ())
       out << started.render ()
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index bb057aacc..e3d8a0b0d 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -128,11 +128,11 @@ int CmdUDAs::execute (std::string& output)
         << (udas.size () == 1
               ? format (STRING_CMD_UDAS_SUMMARY,  udas.size ())
               : format (STRING_CMD_UDAS_SUMMARY2, udas.size ()))
-        << "\n";
+        << '\n';
   }
   else
   {
-    out << STRING_CMD_UDAS_NO << "\n";
+    out << STRING_CMD_UDAS_NO << '\n';
     rc = 1;
   }
 
@@ -173,7 +173,7 @@ int CmdUDAs::execute (std::string& output)
         << (udas.size () == 1
               ? format (STRING_CMD_UDAS_ORPHAN,  orphans.size ())
               : format (STRING_CMD_UDAS_ORPHANS, orphans.size ()))
-        << "\n";
+        << '\n';
   }
 
   output = out.str ();
@@ -215,7 +215,7 @@ int CmdCompletionUDAs::execute (std::string& output)
   {
     std::sort (udas.begin (), udas.end ());
     join (output, "\n", udas);
-    output += "\n";
+    output += '\n';
   }
 
   return 0;
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index de364c3d0..8b28f9020 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -87,7 +87,7 @@ int CmdUnique::execute (std::string& output)
 
   // Generate list of unique values.
   for (auto& value : values)
-    output += value + "\n";
+    output += value + '\n';
 
   context.headers.clear ();
   return 0;
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 31e6cd71a..4d45a65bf 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -74,7 +74,7 @@ int CmdUrgency::execute (std::string& output)
     out << format (STRING_CMD_URGENCY_RESULT,
                    task.identifier (),
                    Lexer::trim (format (task.urgency (), 6, 3)))
-        << "\n";
+        << '\n';
   }
 
   output = out.str ();
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index 30724c779..ce1432fb2 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -76,7 +76,7 @@ int CmdVersion::execute (std::string& output)
   if (context.color ())
     bold = Color ("bold");
 
-  out << "\n"
+  out << '\n'
       << format (STRING_CMD_VERSION_BUILT, bold.colorize (PACKAGE), bold.colorize (VERSION))
 
 #if defined (DARWIN)
@@ -104,23 +104,23 @@ int CmdVersion::execute (std::string& output)
 #endif
 
 #if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA
-      << " "
+      << ' '
       << STRING_LOCALIZATION_DESC
 #endif
 
-      << "\n"
+      << '\n'
       << STRING_CMD_VERSION_COPY
-      << "\n"
-      << "\n"
+      << '\n'
+      << '\n'
       << disclaimer.render ()
-      << "\n"
+      << '\n'
       << link.render ()
-      << "\n";
+      << '\n';
 
 #if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA
   out << STRING_LOCALIZATION_AUTHOR
-      << "\n"
-      << "\n";
+      << '\n'
+      << '\n';
 #endif
 
   output = out.str ();
@@ -154,7 +154,7 @@ int CmdCompletionVersion::execute (std::string& output)
 #else
   output = VERSION;
 #endif
-  output += "\n";
+  output += '\n';
   return 0;
 }
 
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 4783afc68..86a276f83 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -350,7 +350,7 @@ bool Command::permission (
     return true;
 
   if (context.verbose ("blank") && !_first_iteration)
-    std::cout << "\n";
+    std::cout << '\n';
   int answer = confirm4 (question);
   _first_iteration = false;
   switch (answer)
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 124610d6f..a1cc51e6a 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -67,7 +67,6 @@ void dependencyGetBlocking (const Task& task, std::vector <Task>& blocking)
 // Returns true if the supplied task adds a cycle to the dependency chain.
 bool dependencyIsCircular (const Task& task)
 {
-
   // A new task has no UUID assigned yet, and therefore cannot be part of any
   // dependency chain.
   if (task.has ("uuid"))
@@ -163,7 +162,7 @@ void dependencyChainOnComplete (Task& task)
                 << "\n";
 
       for (auto& b : blocking)
-        std::cout << "  " << b.id << " " << b.get ("description") << "\n";
+        std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
     }
 
     // If there are both blocking and blocked tasks, the chain is broken.
@@ -175,7 +174,7 @@ void dependencyChainOnComplete (Task& task)
                   << "\n";
 
         for (auto& b : blocked)
-          std::cout << "  " << b.id << " " << b.get ("description") << "\n";
+          std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
       }
 
       if (!context.config.getBoolean ("dependency.confirmation") ||
@@ -218,7 +217,7 @@ void dependencyChainOnStart (Task& task)
                 << "\n";
 
       for (auto& b : blocking)
-        std::cout << "  " << b.id << " " << b.get ("description") << "\n";
+        std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
     }
   }
 }
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 49f5a4556..c5c88b86a 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -478,7 +478,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
       percentage = (count_done * 100 / (count_done + count_pending));
 
     msg << format (STRING_HELPER_PROJECT_COMPL, project, percentage)
-        << " ";
+        << ' ';
 
     if (count_pending == 1 && count_done == 0)
       msg << format (STRING_HELPER_PROJECT_REM1, count_pending);

From 814d7d69fadaf6d5c2e50e2e7bce87f4601cbb04 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 14 Oct 2016 23:11:28 -0400
Subject: [PATCH 100/879] Cleanup: Don't use string literals when character
 literals are needed

---
 src/Msg.cpp                     |  6 ++--
 src/TDB2.cpp                    | 60 ++++++++++++++++-----------------
 src/Task.cpp                    | 58 +++++++++++++++----------------
 src/columns/ColDepends.cpp      |  2 +-
 src/columns/ColDescription.cpp  |  4 +--
 src/columns/ColProject.cpp      |  6 ++--
 src/columns/ColRecur.cpp        |  2 +-
 src/columns/ColTags.cpp         |  6 ++--
 src/columns/ColTypeDate.cpp     | 10 +++---
 src/columns/ColTypeDuration.cpp |  2 +-
 src/columns/ColTypeNumeric.cpp  |  2 +-
 src/columns/ColTypeString.cpp   |  4 +--
 src/commands/CmdAttributes.cpp  |  2 +-
 src/commands/CmdBurndown.cpp    |  4 +--
 src/commands/CmdCommands.cpp    |  4 +--
 src/commands/CmdConfig.cpp      | 14 ++++----
 src/commands/CmdDiagnostics.cpp |  8 ++---
 src/commands/CmdEdit.cpp        |  2 +-
 src/commands/CmdExport.cpp      |  2 +-
 src/commands/CmdHistory.cpp     | 12 +++----
 src/commands/CmdIDs.cpp         |  6 ++--
 src/commands/CmdInfo.cpp        |  8 ++---
 src/commands/CmdStats.cpp       |  2 +-
 src/rules.cpp                   |  2 +-
 src/text.cpp                    |  2 +-
 src/text.h                      |  2 +-
 src/util.cpp                    | 12 +++----
 27 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/src/Msg.cpp b/src/Msg.cpp
index 7f73858c4..bed357e11 100644
--- a/src/Msg.cpp
+++ b/src/Msg.cpp
@@ -72,9 +72,9 @@ std::string Msg::serialize () const
 {
   std::string output;
   for (auto& i : _header)
-    output += i.first + ": " + i.second + "\n";
+    output += i.first + ": " + i.second + '\n';
 
-  output += "\n" + _payload + "\n";
+  output += '\n' + _payload + '\n';
   return output;
 }
 
@@ -95,7 +95,7 @@ bool Msg::parse (const std::string& input)
   {
     auto delimiter = i.find (':');
     if (delimiter == std::string::npos)
-      throw std::string ("ERROR: Malformed message header '") + i + "'";
+      throw std::string ("ERROR: Malformed message header '") + i + '\'';
 
     _header[Lexer::trim (i.substr (0, delimiter))] = Lexer::trim (i.substr (delimiter + 1));
   }
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 0f3e696c3..f53332aed 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -61,7 +61,7 @@ TF2::~TF2 ()
 {
   if (_dirty && TDB2::debug_mode)
     std::cout << format (STRING_TDB2_DIRTY_EXIT, std::string (_file))
-              << "\n";
+              << '\n';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -301,7 +301,7 @@ void TF2::commit ()
         for (auto& task : _tasks)
           // Skip over the tasks that are marked to be purged
           if (_purged_tasks.find (task.get ("uuid")) == _purged_tasks.end ())
-            _file.write_raw (task.composeF4 () + "\n");
+            _file.write_raw (task.composeF4 () + '\n');
 
         // Write out all the added lines.
         _file.append (_added_lines);
@@ -708,9 +708,9 @@ void TDB2::update (
     // old <task>
     // new <task>
     // ---
-    undo.add_line ("time " + ISO8601d ().toEpochString () + "\n");
-    undo.add_line ("old " + original.composeF4 () + "\n");
-    undo.add_line ("new " + task.composeF4 () + "\n");
+    undo.add_line ("time " + ISO8601d ().toEpochString () + '\n');
+    undo.add_line ("old " + original.composeF4 () + '\n');
+    undo.add_line ("new " + task.composeF4 () + '\n');
     undo.add_line ("---\n");
   }
   else
@@ -727,14 +727,14 @@ void TDB2::update (
     //   time <time>
     //   new <task>
     //   ---
-    undo.add_line ("time " + ISO8601d ().toEpochString () + "\n");
-    undo.add_line ("new " + task.composeF4 () + "\n");
+    undo.add_line ("time " + ISO8601d ().toEpochString () + '\n');
+    undo.add_line ("new " + task.composeF4 () + '\n');
     undo.add_line ("---\n");
   }
 
   // Add task to backlog.
   if (add_to_backlog)
-    backlog.add_line (task.composeJSON () + "\n");
+    backlog.add_line (task.composeJSON () + '\n');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -861,7 +861,7 @@ void TDB2::revert ()
     File::write (backlog._file._data, b);
   }
   else
-    std::cout << STRING_CMD_CONFIG_NO_CHANGE << "\n";
+    std::cout << STRING_CMD_CONFIG_NO_CHANGE << '\n';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -909,7 +909,7 @@ void TDB2::revert_pending (
   const std::string& uuid,
   const std::string& prior)
 {
-  std::string uuid_att = "uuid:\"" + uuid + "\"";
+  std::string uuid_att = "uuid:\"" + uuid + '"';
 
   // is 'current' in pending?
   for (auto task = p.begin (); task != p.end (); ++task)
@@ -922,12 +922,12 @@ void TDB2::revert_pending (
       if (prior != "")
       {
         *task = prior;
-        std::cout << STRING_TDB2_REVERTED << "\n";
+        std::cout << STRING_TDB2_REVERTED << '\n';
       }
       else
       {
         p.erase (task);
-        std::cout << STRING_TDB2_REMOVED << "\n";
+        std::cout << STRING_TDB2_REMOVED << '\n';
       }
 
       break;
@@ -942,7 +942,7 @@ void TDB2::revert_completed (
   const std::string& uuid,
   const std::string& prior)
 {
-  std::string uuid_att = "uuid:\"" + uuid + "\"";
+  std::string uuid_att = "uuid:\"" + uuid + '"';
 
   // is 'current' in completed?
   for (auto task = c.begin (); task != c.end (); ++task)
@@ -961,12 +961,12 @@ void TDB2::revert_completed (
         {
           c.erase (task);
           p.push_back (prior);
-          std::cout << STRING_TDB2_REVERTED << "\n";
+          std::cout << STRING_TDB2_REVERTED << '\n';
           context.debug ("TDB::revert_completed - task belongs in pending.data");
         }
         else
         {
-          std::cout << STRING_TDB2_REVERTED << "\n";
+          std::cout << STRING_TDB2_REVERTED << '\n';
           context.debug ("TDB::revert_completed - task belongs in completed.data");
         }
       }
@@ -974,11 +974,11 @@ void TDB2::revert_completed (
       {
         c.erase (task);
 
-        std::cout << STRING_TDB2_REVERTED << "\n";
+        std::cout << STRING_TDB2_REVERTED << '\n';
         context.debug ("TDB::revert_completed - task removed");
       }
 
-      std::cout << STRING_TDB2_UNDO_COMPLETE << "\n";
+      std::cout << STRING_TDB2_UNDO_COMPLETE << '\n';
       break;
     }
   }
@@ -991,7 +991,7 @@ void TDB2::revert_backlog (
   const std::string& current,
   const std::string& prior)
 {
-  std::string uuid_att = "\"uuid\":\"" + uuid + "\"";
+  std::string uuid_att = "\"uuid\":\"" + uuid + '"';
 
   bool found = false;
   for (auto task = b.rbegin (); task != b.rend (); ++task)
@@ -1038,9 +1038,9 @@ void TDB2::show_diff (
 
   if (context.config.get ("undo.style") == "side")
   {
-    std::cout << "\n"
+    std::cout << '\n'
               << format (STRING_TDB2_LAST_MOD, lastChange.toString ())
-              << "\n";
+              << '\n';
 
     // Attributes are all there is, so figure the different attribute names
     // between before and after.
@@ -1114,9 +1114,9 @@ void TDB2::show_diff (
       }
     }
 
-    std::cout << "\n"
+    std::cout << '\n'
               << view.render ()
-              << "\n";
+              << '\n';
   }
 
   // This style looks like this:
@@ -1203,21 +1203,21 @@ void TDB2::show_diff (
         else if (before_att != "" && after_att == "")
         {
           row = view.addRow ();
-          view.set (row, 0, "-" + a + ":", color_red);
+          view.set (row, 0, '-' + a + ':', color_red);
           view.set (row, 1, before_att, color_red);
 
           row = view.addRow ();
-          view.set (row, 0, "+" + a + ":", color_green);
+          view.set (row, 0, '+' + a + ':', color_green);
         }
 
         // Attribute added.
         else if (before_att == "" && after_att != "")
         {
           row = view.addRow ();
-          view.set (row, 0, "-" + a + ":", color_red);
+          view.set (row, 0, '-' + a + ':', color_red);
 
           row = view.addRow ();
-          view.set (row, 0, "+" + a + ":", color_green);
+          view.set (row, 0, '+' + a + ':', color_green);
           view.set (row, 1, after_att, color_green);
         }
 
@@ -1225,19 +1225,19 @@ void TDB2::show_diff (
         else
         {
           row = view.addRow ();
-          view.set (row, 0, "-" + a + ":", color_red);
+          view.set (row, 0, '-' + a + ':', color_red);
           view.set (row, 1, before_att, color_red);
 
           row = view.addRow ();
-          view.set (row, 0, "+" + a + ":", color_green);
+          view.set (row, 0, '+' + a + ':', color_green);
           view.set (row, 1, after_att, color_green);
         }
       }
     }
 
-    std::cout << "\n"
+    std::cout << '\n'
               << view.render ()
-              << "\n";
+              << '\n';
   }
 }
 
diff --git a/src/Task.cpp b/src/Task.cpp
index f8a0165b7..1b2d3d8f7 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -799,7 +799,7 @@ void Task::parseLegacy (const std::string& line)
     std::stringstream message;
     message << "Invalid fileformat at line '"
             << line
-            << "'";
+            << '\'';
     context.debug (message.str ());
 #endif
     throw std::string (STRING_TASK_PARSE_UNREC_FF);
@@ -836,13 +836,13 @@ std::string Task::composeF4 () const
         ff4 += encode (json::encode (it.second));
       else
         ff4 += it.second;
-      ff4 += "\"";
+      ff4 += '"';
 
       first = false;
     }
   }
 
-  ff4 += "]";
+  ff4 += ']';
   return ff4;
 }
 
@@ -850,12 +850,12 @@ std::string Task::composeF4 () const
 std::string Task::composeJSON (bool decorate /*= false*/) const
 {
   std::stringstream out;
-  out << "{";
+  out << '{';
 
   // ID inclusion is optional, but not a good idea, because it remains correct
   // only until the next gc.
   if (decorate)
-    out << "\"id\":" << id << ",";
+    out << "\"id\":" << id << ',';
 
   // First the non-annotations.
   int attributes_written = 0;
@@ -870,7 +870,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
         continue;
 
     if (attributes_written)
-      out << ",";
+      out << ',';
 
     std::string type = Task::attributes[i.first];
     if (type == "")
@@ -880,12 +880,12 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
     if (type == "date")
     {
       ISO8601d d (i.second);
-      out << "\""
+      out << '"'
           << (i.first == "modification" ? "modified" : i.first)
           << "\":\""
           // Date was deleted, do not export parsed empty string
           << (i.second == "" ? "" : d.toISO ())
-          << "\"";
+          << '"';
 
       ++attributes_written;
     }
@@ -898,7 +898,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
 */
     else if (type == "numeric")
     {
-      out << "\""
+      out << '"'
           << i.first
           << "\":"
           << i.second;
@@ -918,12 +918,12 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
       for (auto i : tags)
       {
         if (count++)
-          out << ",";
+          out << ',';
 
-        out << "\"" << i << "\"";
+        out << '"' << i << '"';
       }
 
-      out << "]";
+      out << ']';
       ++attributes_written;
     }
 
@@ -958,23 +958,23 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
       for (auto i : deps)
       {
         if (count++)
-          out << ",";
+          out << ',';
 
-        out << "\"" << i << "\"";
+        out << '"' << i << '"';
       }
 
-      out << "]";
+      out << ']';
       ++attributes_written;
     }
 
     // Everything else is a quoted value.
     else
     {
-      out << "\""
+      out << '"'
           << i.first
           << "\":\""
           << (type == "string" ? json::encode (i.second) : i.second)
-          << "\"";
+          << '"';
 
       ++attributes_written;
     }
@@ -983,7 +983,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
   // Now the annotations, if any.
   if (annotation_count)
   {
-    out << ","
+    out << ','
         << "\"annotations\":[";
 
     int annotations_written = 0;
@@ -992,7 +992,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
       if (! i.first.compare (0, 11, "annotation_", 11))
       {
         if (annotations_written)
-          out << ",";
+          out << ',';
 
         ISO8601d d (i.first.substr (11));
         out << "{\"entry\":\""
@@ -1005,18 +1005,18 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
       }
     }
 
-    out << "]";
+    out << ']';
   }
 
 #ifdef PRODUCT_TASKWARRIOR
   // Include urgency.
   if (decorate)
-    out << ","
+    out << ','
         << "\"urgency\":"
         << urgency_c ();
 #endif
 
-  out << "}";
+  out << '}';
   return out.str ();
 }
 
@@ -1123,7 +1123,7 @@ void Task::addDependency (const std::string& uuid)
   {
     // Check for extant dependency.
     if (depends.find (uuid) == std::string::npos)
-      set ("depends", depends + "," + uuid);
+      set ("depends", depends + ',' + uuid);
     else
     {
 #ifdef PRODUCT_TASKWARRIOR
@@ -1828,7 +1828,7 @@ float Task::urgency_c () const
         if (end != std::string::npos)
         {
           const std::string uda = var.first.substr (12, end - 12);
-          auto dot = uda.find (".");
+          auto dot = uda.find ('.');
           if (dot == std::string::npos)
           {
             // urgency.uda.<name>.coefficient
@@ -2106,13 +2106,13 @@ void Task::modify (modType type, bool text_required /* = false */)
 
         if (a.attribute ("sign") == "+")
         {
-          context.debug (label + "tags <-- add '" + tag + "'");
+          context.debug (label + "tags <-- add '" + tag + '\'');
           addTag (tag);
           feedback_special_tags (*this, tag);
         }
         else
         {
-          context.debug (label + "tags <-- remove '" + tag + "'");
+          context.debug (label + "tags <-- remove '" + tag + '\'');
           removeTag (tag);
         }
 
@@ -2138,7 +2138,7 @@ void Task::modify (modType type, bool text_required /* = false */)
     switch (type)
     {
     case modReplace:
-      context.debug (label + "description <-- '" + text + "'");
+      context.debug (label + "description <-- '" + text + '\'');
       set ("description", text);
       break;
 
@@ -2148,12 +2148,12 @@ void Task::modify (modType type, bool text_required /* = false */)
       break;
 
     case modAppend:
-      context.debug (label + "description <-- description + '" + text + "'");
+      context.debug (label + "description <-- description + '" + text + '\'');
       set ("description", get ("description") + ' ' + text);
       break;
 
     case modAnnotate:
-      context.debug (label + "new annotation <-- '" + text + "'");
+      context.debug (label + "new annotation <-- '" + text + '\'');
       addAnnotation (text);
       break;
     }
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 6e8ba0623..0d2d27142 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -125,7 +125,7 @@ void ColumnDepends::render (
       dependencyGetBlocking (task, blocking);
 
       if (_style == "count")
-        renderStringRight (lines, width, color, "[" + format (static_cast <int>(blocking.size ())) + "]");
+        renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']');
 
       else if (_style == "default" ||
                _style == "list")
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 700d71cf3..ac84b694c 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -238,7 +238,7 @@ void ColumnDescription::render (
   else if (_style == "count")
   {
     if (task.annotation_count)
-      description += " [" + format (task.annotation_count) + "]";
+      description += " [" + format (task.annotation_count) + ']';
 
     std::vector <std::string> raw;
     wrapText (raw, description, width, _hyphenate);
@@ -256,7 +256,7 @@ void ColumnDescription::render (
     int len_annos = 0;
     if (task.annotation_count)
     {
-      annos_count = " [" + format (task.annotation_count) + "]";
+      annos_count = " [" + format (task.annotation_count) + ']';
       len_annos = utf8_width (annos_count);
       len += len_annos;
     }
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index f94a967f0..e13162469 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -134,7 +134,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
       Variant v;
       e.evaluateInfixExpression (value, v);
       task.set (_name, (std::string) v);
-      context.debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + "'");
+      context.debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + '\'');
     }
     catch (const std::string& e)
     {
@@ -143,7 +143,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
       if (e == STRING_EVAL_NOT_EXPRESSION)
       {
         task.set (_name, value);
-        context.debug (label + _name + " <-- '" + value + "'");
+        context.debug (label + _name + " <-- '" + value + '\'');
       }
       else
         throw;
@@ -152,7 +152,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
   else
   {
     task.set (_name, value);
-    context.debug (label + _name + " <-- '" + value + "'");
+    context.debug (label + _name + " <-- '" + value + '\'');
   }
 }
 
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 3c57b2833..cd8cc8327 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -129,7 +129,7 @@ void ColumnRecur::modify (Task& task, const std::string& value)
   {
     // Store the raw value, for 'recur'.
     std::string label = "  MODIFICATION ";
-    context.debug (label + _name + " <-- '" + value + "'");
+    context.debug (label + _name + " <-- '" + value + '\'');
     task.set (_name, value);
   }
   else
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 22f82a2aa..6b28b4c4b 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -154,7 +154,7 @@ void ColumnTags::render (
     {
       std::vector <std::string> all;
       split (all, tags, ',');
-      renderStringRight (lines, width, color, "[" + format (static_cast <int> (all.size ())) + "]");
+      renderStringRight (lines, width, color, '[' + format (static_cast <int> (all.size ())) + ']');
     }
   }
 }
@@ -187,12 +187,12 @@ void ColumnTags::modify (Task& task, const std::string& value)
       Variant v;
       e.evaluateInfixExpression (value, v);
       task.addTag ((std::string) v);
-      context.debug (label + "tags <-- '" + (std::string) v + "' <-- '" + tag + "'");
+      context.debug (label + "tags <-- '" + (std::string) v + "' <-- '" + tag + '\'');
     }
     else
     {
       task.addTag (tag);
-      context.debug (label + "tags <-- '" + tag + "'");
+      context.debug (label + "tags <-- '" + tag + '\'');
     }
 
     feedback_special_tags (task, tag);
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 33cdc96b3..727402d32 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -61,7 +61,7 @@ ColumnTypeDate::ColumnTypeDate ()
                now.toEpochString (),
                now.toISO (),
                ISO8601p (ISO8601d () - now).formatVague (),
-               "-" + ISO8601p (ISO8601d () - now).formatVague (),
+               '-' + ISO8601p (ISO8601d () - now).formatVague (),
                "",
                ISO8601p (ISO8601d () - now).format ()};
 }
@@ -183,7 +183,7 @@ void ColumnTypeDate::render (
       if (now > date)
         renderStringLeft (lines, width, color, ISO8601p (now - date).formatVague ());
       else
-        renderStringLeft (lines, width, color, "-" + ISO8601p (date - now).formatVague ());
+        renderStringLeft (lines, width, color, '-' + ISO8601p (date - now).formatVague ());
     }
     else if (_style == "relative")
     {
@@ -191,7 +191,7 @@ void ColumnTypeDate::render (
       if (now < date)
         renderStringLeft (lines, width, color, ISO8601p (date - now).formatVague ());
       else
-        renderStringLeft (lines, width, color, "-" + ISO8601p (now - date).formatVague ());
+        renderStringLeft (lines, width, color, '-' + ISO8601p (now - date).formatVague ());
     }
 
     else if (_style == "remaining")
@@ -226,7 +226,7 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   std::string label = "  MODIFICATION ";
   if (evaluatedValue.type () == Variant::type_duration)
   {
-    context.debug (label + _name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + "'");
+    context.debug (label + _name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
     Variant now;
     if (namedDates ("now", now))
       evaluatedValue += now;
@@ -234,7 +234,7 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   else
   {
     evaluatedValue.cast (Variant::type_date);
-    context.debug (label + _name + " <-- '" + format ("{1}", evaluatedValue.get_date ()) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + "'");
+    context.debug (label + _name + " <-- '" + format ("{1}", evaluatedValue.get_date ()) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
   }
 
   // If a date doesn't parse (2/29/2014) then it evaluates to zero.
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 34a2f58a4..344fd130a 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -68,7 +68,7 @@ void ColumnTypeDuration::modify (Task& task, const std::string& value)
   if (evaluatedValue.type () == Variant::type_duration)
   {
     // Store the raw value, for 'recur'.
-    context.debug (label + _name + " <-- " + (std::string) evaluatedValue + " <-- '" + value + "'");
+    context.debug (label + _name + " <-- " + (std::string) evaluatedValue + " <-- '" + value + '\'');
     task.set (_name, evaluatedValue);
   }
   else
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index dd1fca449..40925c042 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -63,7 +63,7 @@ void ColumnTypeNumeric::modify (Task& task, const std::string& value)
   }
 
   std::string label = "  MODIFICATION ";
-  context.debug (label + _name + " <-- '" + evaluatedValue.get_string () + "' <-- '" + value + "'");
+  context.debug (label + _name + " <-- '" + evaluatedValue.get_string () + "' <-- '" + value + '\'');
 
   // If the result is not readily convertible to a numeric value, then this is
   // an error.
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index fea7e2e6e..3e18f087c 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -66,7 +66,7 @@ void ColumnTypeString::modify (Task& task, const std::string& value)
     if (validate (strValue))
     {
       task.set (_name, strValue);
-      context.debug (label + _name + " <-- '" + strValue + "' <-- '" + value + "'");
+      context.debug (label + _name + " <-- '" + strValue + "' <-- '" + value + '\'');
     }
     else
       throw format (STRING_INVALID_MOD, _name, value);
@@ -76,7 +76,7 @@ void ColumnTypeString::modify (Task& task, const std::string& value)
     if (validate (value))
     {
       task.set (_name, value);
-      context.debug (label + _name + " <-- '" + value + "'");
+      context.debug (label + _name + " <-- '" + value + '\'');
     }
     else
       throw format (STRING_INVALID_MOD, _name, value);
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index f83743d31..b84506f05 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -60,7 +60,7 @@ int CmdZshAttributes::execute (std::string& output)
 
   std::stringstream out;
   for (auto& col : columns)
-    out << col << ":" << col << '\n';
+    out << col << ':' << col << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 7fca5be75..5be688997 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -214,7 +214,7 @@ Chart::Chart (char type)
   std::vector <std::string> words = context.cli2.getWords ();
   std::string filter;
   join (filter, " ", words);
-  _title = "(" + filter + ")";
+  _title = '(' + filter + ')';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -860,7 +860,7 @@ void Chart::calculateRates ()
     _completion = end.toString (format)
                + " ("
                + delta.formatVague ()
-               + ")";
+               + ')';
 
     std::stringstream completion_message;
     completion_message << "Chart::calculateRates ("
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index cb6a51dc7..728b9c50c 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -224,8 +224,8 @@ int CmdZshCommands::execute (std::string& output)
   // Emit the commands in order.
   std::stringstream out;
   for (auto& zc : commands)
-    out << zc._command << ":"
-        << Command::categoryNames.at (zc._category) << ":"
+    out << zc._command << ':'
+        << Command::categoryNames.at (zc._category) << ':'
         << zc._description << '\n';
 
   output = out.str ();
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 932cc7136..f3d808286 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -65,8 +65,8 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
   for (auto& line : contents)
   {
     // If there is a comment on the line, it must follow the pattern.
-    auto comment = line.find ("#");
-    auto pos     = line.find (name + "=");
+    auto comment = line.find ('#');
+    auto pos     = line.find (name + '=');
 
     if (pos != std::string::npos &&
         (comment == std::string::npos ||
@@ -77,9 +77,9 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
           confirm (format (STRING_CMD_CONFIG_CONFIRM, name, context.config.get (name), value)))
       {
         if (comment != std::string::npos)
-          line = name + "=" + json::encode (value) + ' ' + line.substr (comment);
+          line = name + '=' + json::encode (value) + ' ' + line.substr (comment);
         else
-          line = name + "=" + json::encode (value);
+          line = name + '=' + json::encode (value);
 
         change = true;
       }
@@ -91,7 +91,7 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
       (!confirmation ||
        confirm (format (STRING_CMD_CONFIG_CONFIRM2, name, value))))
   {
-    contents.push_back (name + "=" + json::encode (value));
+    contents.push_back (name + '=' + json::encode (value));
     change = true;
   }
 
@@ -116,8 +116,8 @@ int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = fal
     bool lineDeleted = false;
 
     // If there is a comment on the line, it must follow the pattern.
-    auto comment = line->find ("#");
-    auto pos     = line->find (name + "=");
+    auto comment = line->find ('#');
+    auto pos     = line->find (name + '=');
 
     if (pos != std::string::npos &&
         (comment == std::string::npos ||
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 80ce794d5..3ed6a99bc 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -89,7 +89,7 @@ int CmdDiagnostics::execute (std::string& output)
       << "    " << STRING_CMD_DIAG_VERSION << ": "
       << __VERSION__ << '\n'
 #endif
-      << "       " << STRING_CMD_DIAG_CAPS << ":"
+      << "       " << STRING_CMD_DIAG_CAPS << ':'
 #ifdef __STDC__
       << " +stdc"
 #endif
@@ -168,7 +168,7 @@ int CmdDiagnostics::execute (std::string& output)
 #ifdef CMAKE_BUILD_TYPE
       << CMAKE_BUILD_TYPE
 #else
-      << "-"
+      << '-'
 #endif
       << "\n\n";
 
@@ -273,7 +273,7 @@ int CmdDiagnostics::execute (std::string& output)
   auto last_slash = credentials.rfind ('/');
   if (last_slash != std::string::npos)
     credentials = credentials.substr (0, last_slash)
-                + "/"
+                + '/'
                 + std::string (credentials.length () - last_slash - 1, '*');
 
   out << "      Creds: "
@@ -379,7 +379,7 @@ int CmdDiagnostics::execute (std::string& output)
       << (term ? term : STRING_CMD_DIAG_NONE)
       << " ("
       << context.getWidth ()
-      << "x"
+      << 'x'
       << context.getHeight ()
       << ")\n";
 
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 36d1d8093..a170cae4c 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -798,7 +798,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
 
   // Complete the command line.
   editor += ' ';
-  editor += "\"" + file.str () + "\"";
+  editor += '"' + file.str () + '"';
 
 ARE_THESE_REALLY_HARMFUL:
   bool changes = false; // No changes made.
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index c406bf2b8..af171cfdf 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -84,7 +84,7 @@ int CmdExport::execute (std::string& output)
     if (counter)
     {
       if (json_array)
-        output += ",";
+        output += ',';
       output += '\n';
     }
 
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 2cec28d86..5b5569deb 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -525,9 +525,9 @@ int CmdGHistoryMonthly::execute (std::string& output)
       }
       else
       {
-        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += "+";
-        std::string cBar = ""; while (cBar.length () < completedBar) cBar += "X";
-        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += "-";
+        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
+        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
+        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
 
         bar += std::string (leftOffset - aBar.length (), ' ');
         bar += aBar + cBar + dBar;
@@ -722,9 +722,9 @@ int CmdGHistoryAnnual::execute (std::string& output)
       }
       else
       {
-        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += "+";
-        std::string cBar = ""; while (cBar.length () < completedBar) cBar += "X";
-        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += "-";
+        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
+        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
+        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
 
         bar += std::string (leftOffset - aBar.length (), ' ');
         bar += aBar + cBar + dBar;
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index abb84eecd..b8894d204 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -103,7 +103,7 @@ std::string CmdIDs::compressIds (const std::vector <int>& ids)
         result << ' ';
 
       if (range_start < range_end)
-        result << ids[range_start] << "-" << ids[range_end];
+        result << ids[range_start] << '-' << ids[range_end];
       else
         result << ids[range_start];
     }
@@ -119,7 +119,7 @@ std::string CmdIDs::compressIds (const std::vector <int>& ids)
           result << ' ';
 
         if (range_start < range_end)
-          result << ids[range_start] << "-" << ids[range_end];
+          result << ids[range_start] << '-' << ids[range_end];
         else
           result << ids[range_start];
 
@@ -312,7 +312,7 @@ int CmdZshCompletionUuids::execute (std::string& output)
   std::stringstream out;
   for (auto& task : filtered)
     out << task.get ("uuid")
-        << ":"
+        << ':'
         << str_replace (task.get ("description"), ":", zshColonReplacement)
         << '\n';
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 13b603398..0d8ded1e7 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -231,7 +231,7 @@ int CmdInfo::execute (std::string& output)
       age = ISO8601p (now - dt).formatVague ();
     }
 
-    view.set (row, 1, entry + " (" + age + ")");
+    view.set (row, 1, entry + " (" + age + ')');
 
     // wait
     if (task.has ("wait"))
@@ -289,7 +289,7 @@ int CmdInfo::execute (std::string& output)
 
       ISO8601d mod (task.get_date ("modified"));
       std::string age = ISO8601p (now - mod).formatVague ();
-      view.set (row, 1, mod.toString (dateformat) + " (" + age + ")");
+      view.set (row, 1, mod.toString (dateformat) + " (" + age + ')');
     }
 
     // tags ...
@@ -399,8 +399,8 @@ int CmdInfo::execute (std::string& output)
           context.columns.find (att) == context.columns.end ())
       {
          row = view.addRow ();
-         view.set (row, 0, "[" + att);
-         view.set (row, 1, task.get (att) + "]");
+         view.set (row, 0, '[' + att);
+         view.set (row, 1, task.get (att) + ']');
       }
     }
 
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index b5974e15c..67d0a8c26 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -232,7 +232,7 @@ int CmdStats::execute (std::string& output)
     view.set (row, 0, STRING_CMD_STATS_TAGGED);
 
     std::stringstream value;
-    value << std::setprecision (3) << (100.0 * taggedT / totalT) << "%";
+    value << std::setprecision (3) << (100.0 * taggedT / totalT) << '%';
     view.set (row, 1, value.str ());
   }
 
diff --git a/src/rules.cpp b/src/rules.cpp
index dc4accd76..685a6f858 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -207,7 +207,7 @@ static void colorizeKeyword (Task& task, const std::string& rule, const Color& b
 static void colorizeUDA (Task& task, const std::string& rule, const Color& base, Color& c, bool merge)
 {
   // Is the rule color.uda.name.value or color.uda.name?
-  auto pos = rule.find (".", 10);
+  auto pos = rule.find ('.', 10);
   if (pos == std::string::npos)
   {
     if (task.has (rule.substr (10)))
diff --git a/src/text.cpp b/src/text.cpp
index bc8353f73..707889ad9 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -283,7 +283,7 @@ bool extractLine (
       // No backtrack, possible hyphenation.
       else if (hyphenate)
       {
-        line = text.substr (offset, prior_cursor - offset) + "-";
+        line = text.substr (offset, prior_cursor - offset) + '-';
         offset = prior_cursor;
         return true;
       }
diff --git a/src/text.h b/src/text.h
index c190495bb..e2e858faa 100644
--- a/src/text.h
+++ b/src/text.h
@@ -73,7 +73,7 @@ template<typename T>
 const std::string format (int fmt_num, const std::string& fmt, T arg)
 {
     std::string output = fmt;
-    replace_positional (output, "{" + format (fmt_num) + "}", format (arg));
+    replace_positional (output, '{' + format (fmt_num) + '}', format (arg));
     return output;
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index e36bc251d..f4eeb1565 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -64,7 +64,7 @@ static void signal_handler (int s)
 {
   if (s == SIGINT)
   {
-    std::cout << "\n\n" << STRING_ERROR_CONFIRM_SIGINT << "\n";
+    std::cout << "\n\n" << STRING_ERROR_CONFIRM_SIGINT << '\n';
     exit (1);
   }
 }
@@ -89,7 +89,7 @@ bool confirm (const std::string& question)
 
     std::string answer {""};
     std::getline (std::cin, answer);
-    context.debug ("STDIN '" + answer + "'");
+    context.debug ("STDIN '" + answer + '\'');
     answer = std::cin.eof () ? STRING_UTIL_CONFIRM_NO : Lexer::lowerCase (Lexer::trim (answer));
 
     autoComplete (answer, options, matches, 1); // Hard-coded 1.
@@ -121,15 +121,15 @@ int confirm4 (const std::string& question)
   {
     std::cout << question
               << " ("
-              << options[1] << "/"
-              << options[2] << "/"
-              << options[4] << "/"
+              << options[1] << '/'
+              << options[2] << '/'
+              << options[4] << '/'
               << options[5]
               << ") ";
 
     std::string answer {""};
     std::getline (std::cin, answer);
-    context.debug ("STDIN '" + answer + "'");
+    context.debug ("STDIN '" + answer + '\'');
     answer = std::cin.eof () ? STRING_UTIL_CONFIRM_QUIT : Lexer::lowerCase (Lexer::trim (answer));
     autoComplete (answer, options, matches, 1); // Hard-coded 1.
   }

From 67feb5bab7a6754f26cd9809a59f9edd1ee82d51 Mon Sep 17 00:00:00 2001
From: inbinder <zachary.manning@gmail.com>
Date: Sun, 16 Oct 2016 13:24:40 -0400
Subject: [PATCH 101/879] Src: rules.cpp changed Task::get to Task::has in
 colorizeProjectNone function

---
 src/rules.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rules.cpp b/src/rules.cpp
index 685a6f858..16b19eb18 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -165,7 +165,7 @@ static void colorizeProject (Task& task, const std::string& rule, const Color& b
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeProjectNone (Task& task, const Color& base, Color& c, bool merge)
 {
-  if (task.get ("project") == "")
+  if(!task.has ("project"))
     applyColor (base, c, merge);
 }
 

From 6c62617fd02522589cd4c80e14445d1d97618922 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 16 Oct 2016 13:49:05 -0400
Subject: [PATCH 102/879] Docs: Updated regarding TW-1857

---
 AUTHORS   | 1 +
 ChangeLog | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 52d43edde..e27853c84 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -132,6 +132,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Sebastien Badia
   Ran Benita
   Vladimir
+  Zachary Manning
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index fa863ac94..7da52f9ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,9 @@
 - TD-64   sync conflict deleted all annotations of the task
           (thanks to Markus Beppler, Konstantin Vorobyev).
 - TW-61   Extract only tasks with annotations
-          (thanks to Aikido Guy)
+          (thanks to Aikido Guy).
 - TW-1785 Purge command to remove deleted tasks
-          (thanks to Paul Beckingham)
+          (thanks to Paul Beckingham).
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
 - TW-1778 Unicode strings are truncated in task description
@@ -26,6 +26,8 @@
           (thanks to george js).
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
           (thanks to E. Manuel Cerr'on Angeles)
+- TW-1857 Change Task::get call to the more efficient Task::has
+          (thanks to Zachary Manning).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 4792bc8c3a894f54b6db7f5442ac12a7ac65d03e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 16 Oct 2016 22:46:39 -0400
Subject: [PATCH 103/879] Dependency: Don't use string literals when character
 literals are needed

---
 src/dependency.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index a1cc51e6a..2f7a38db2 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -159,10 +159,10 @@ void dependencyChainOnComplete (Task& task)
     if (context.config.getBoolean ("dependency.reminder"))
     {
       std::cout << format (STRING_DEPEND_BLOCKED, task.identifier ())
-                << "\n";
+                << '\n';
 
       for (auto& b : blocking)
-        std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
+        std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
     }
 
     // If there are both blocking and blocked tasks, the chain is broken.
@@ -171,10 +171,10 @@ void dependencyChainOnComplete (Task& task)
       if (context.config.getBoolean ("dependency.reminder"))
       {
         std::cout << STRING_DEPEND_BLOCKING
-                  << "\n";
+                  << '\n';
 
         for (auto& b : blocked)
-          std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
+          std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
       }
 
       if (!context.config.getBoolean ("dependency.confirmation") ||
@@ -214,10 +214,10 @@ void dependencyChainOnStart (Task& task)
     if (blocking.size ())
     {
       std::cout << format (STRING_DEPEND_BLOCKED, task.identifier ())
-                << "\n";
+                << '\n';
 
       for (auto& b : blocking)
-        std::cout << "  " << b.id << ' ' << b.get ("description") << "\n";
+        std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
     }
   }
 }

From 6ad736346fa8d6620d17649406a30162767d1d4c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 16 Oct 2016 22:47:26 -0400
Subject: [PATCH 104/879] CmdContext: Migrated from ViewText to Table

---
 src/commands/CmdContext.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index eae0dbdd1..0767c5e3a 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -27,6 +27,7 @@
 #include <cmake.h>
 #include <CmdContext.h>
 #include <CmdConfig.h>
+#include <Table.h>
 #include <Context.h>
 #include <Filter.h>
 #include <sstream>
@@ -218,16 +219,16 @@ void CmdContext::listContexts (std::stringstream& out)
   {
     std::sort (contexts.begin (), contexts.end ());
 
-    ViewText view;
-    view.width (context.getWidth ());
-    view.add (Column::factory ("string", "Name"));
-    view.add (Column::factory ("string", "Definition"));
-    view.add (Column::factory ("string", "Active"));
+    Table table;
+    table.width (context.getWidth ());
+    table.add ("Name");
+    table.add ("Definition");
+    table.add ("Active");
 
     if (context.color ())
     {
       Color label (context.config.get ("color.label"));
-      view.colorHeader (label);
+      table.colorHeader (label);
     }
 
     std::string activeContext = context.config.get ("context");
@@ -238,14 +239,14 @@ void CmdContext::listContexts (std::stringstream& out)
       if (userContext == activeContext)
           active = "yes";
 
-      int row = view.addRow ();
-      view.set (row, 0, userContext);
-      view.set (row, 1, context.config.get ("context." + userContext));
-      view.set (row, 2, active);
+      int row = table.addRow ();
+      table.set (row, 0, userContext);
+      table.set (row, 1, context.config.get ("context." + userContext));
+      table.set (row, 2, active);
     }
 
     out << optionalBlankLine ()
-        << view.render ()
+        << table.render ()
         << optionalBlankLine ();
   }
   else

From 6345b0c7de2a5344ab9e1caff389692f90f4d213 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 16 Oct 2016 22:53:48 -0400
Subject: [PATCH 105/879] CmdUDAs: Migrated from ViewText to Table

---
 src/commands/CmdUDAs.cpp | 58 ++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index e3d8a0b0d..d2c20d8eb 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -26,11 +26,11 @@
 
 #include <cmake.h>
 #include <CmdUDAs.h>
+#include <Table.h>
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
 #include <main.h>
 #include <text.h>
 #include <util.h>
@@ -83,19 +83,19 @@ int CmdUDAs::execute (std::string& output)
 
     // Render a list of UDA name, type, label, allowed values,
     // possible default value, and finally the usage count.
-    ViewText view;
-    view.width (context.getWidth ());
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_UDA));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_TYPE));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_LABEL));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_VALUES));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_DEFAULT));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_UDACOUNT));
+    Table table;
+    table.width (context.getWidth ());
+    table.add (STRING_COLUMN_LABEL_UDA);
+    table.add (STRING_COLUMN_LABEL_TYPE);
+    table.add (STRING_COLUMN_LABEL_LABEL);
+    table.add (STRING_COLUMN_LABEL_VALUES);
+    table.add (STRING_COLUMN_LABEL_DEFAULT);
+    table.add (STRING_COLUMN_LABEL_UDACOUNT);
 
     if (context.color ())
     {
-      Color label (context.config.get ("color.label"));
-      view.colorHeader (label);
+      Color label ("underline " + context.config.get ("color.label"));
+      table.colorHeader (label);
     }
 
     for (auto& uda : udas)
@@ -113,17 +113,17 @@ int CmdUDAs::execute (std::string& output)
         if (i.has (uda))
           ++count;
 
-      int row = view.addRow ();
-      view.set (row, 0, uda);
-      view.set (row, 1, type);
-      view.set (row, 2, label);
-      view.set (row, 3, values);
-      view.set (row, 4, defval);
-      view.set (row, 5, count);
+      int row = table.addRow ();
+      table.set (row, 0, uda);
+      table.set (row, 1, type);
+      table.set (row, 2, label);
+      table.set (row, 3, values);
+      table.set (row, 4, defval);
+      table.set (row, 5, count);
     }
 
     out << optionalBlankLine ()
-        << view.render ()
+        << table.render ()
         << optionalBlankLine ()
         << (udas.size () == 1
               ? format (STRING_CMD_UDAS_SUMMARY,  udas.size ())
@@ -149,26 +149,26 @@ int CmdUDAs::execute (std::string& output)
   if (orphans.size ())
   {
     // Display the orphans and their counts.
-    ViewText orphanView;
-    orphanView.width (context.getWidth ());
-    orphanView.add (Column::factory ("string", STRING_COLUMN_LABEL_ORPHAN));
-    orphanView.add (Column::factory ("string", STRING_COLUMN_LABEL_UDACOUNT));
+    Table orphanTable;
+    orphanTable.width (context.getWidth ());
+    orphanTable.add (STRING_COLUMN_LABEL_ORPHAN);
+    orphanTable.add (STRING_COLUMN_LABEL_UDACOUNT);
 
     if (context.color ())
     {
-      Color label (context.config.get ("color.label"));
-      orphanView.colorHeader (label);
+      Color label ("underline " + context.config.get ("color.label"));
+      orphanTable.colorHeader (label);
     }
 
     for (auto& o : orphans)
     {
-      int row = orphanView.addRow ();
-      orphanView.set (row, 0, o.first);
-      orphanView.set (row, 1, o.second);
+      int row = orphanTable.addRow ();
+      orphanTable.set (row, 0, o.first);
+      orphanTable.set (row, 1, o.second);
     }
 
     out << optionalBlankLine ()
-        << orphanView.render ()
+        << orphanTable.render ()
         << optionalBlankLine ()
         << (udas.size () == 1
               ? format (STRING_CMD_UDAS_ORPHAN,  orphans.size ())

From 161ebc1166772765d0cdba2b92303858fbb8b07c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 16 Oct 2016 23:16:09 -0400
Subject: [PATCH 106/879] CmdEdit: Migrated from Nibbler to Pig

---
 src/commands/CmdEdit.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index a170cae4c..44c6f6042 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -37,7 +37,7 @@
 #include <Context.h>
 #include <Lexer.h>
 #include <Filter.h>
-#include <Nibbler.h>
+#include <Pig.h>
 #include <i18n.h>
 #include <text.h>
 #include <util.h>
@@ -710,10 +710,10 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
           }
           else if (type == "numeric")
           {
-            Nibbler n (value);
+            Pig pig (value);
             double d;
-            if (n.getNumber (d) &&
-                n.depleted ())
+            if (pig.getNumber (d) &&
+                pig.eos ())
               task.set (col.first, value);
             else
               throw format (STRING_UDA_NUMERIC, value);

From a9061dc2995cfe1d0235a6fa5208685e089a7723 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 17 Oct 2016 17:16:14 -0400
Subject: [PATCH 107/879] ViewTask: Removed unused include

---
 src/ViewTask.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 929023024..c8347b4aa 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -28,7 +28,6 @@
 #include <ViewTask.h>
 #include <numeric>
 #include <Context.h>
-#include <Timer.h>
 #include <text.h>
 #include <utf8.h>
 #include <i18n.h>

From 6bf05083bd2ebb2a51e545c0081945d83d962e01 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 17 Oct 2016 21:52:39 -0400
Subject: [PATCH 108/879] Timer: Migrated to libshared

---
 src/CMakeLists.txt |   2 +-
 src/Config.cpp     |   5 ++
 src/Hooks.cpp      |   1 +
 src/Timer.cpp      | 113 ---------------------------------------------
 src/Timer.h        |  55 ----------------------
 5 files changed, 7 insertions(+), 169 deletions(-)
 delete mode 100644 src/Timer.cpp
 delete mode 100644 src/Timer.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8170b9c17..6eaee7cf0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,6 @@ add_library (task CLI2.cpp CLI2.h
                   Nibbler.cpp Nibbler.h
                   TDB2.cpp TDB2.h
                   Task.cpp Task.h
-                  Timer.cpp Timer.h
                   TLSClient.cpp TLSClient.h
                   Variant.cpp Variant.h
                   ViewTask.cpp ViewTask.h
@@ -41,6 +40,7 @@ add_library (libshared libshared/src/FS.cpp            libshared/src/FS.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
                        libshared/src/Table.cpp         libshared/src/Table.h
+                       libshared/src/Timer.cpp         libshared/src/Timer.h
                        libshared/src/unicode.cpp       libshared/src/unicode.h
                        libshared/src/utf8.cpp          libshared/src/utf8.h
                        libshared/src/wcwidth6.cpp)
diff --git a/src/Config.cpp b/src/Config.cpp
index 3cbe612af..46993dbc1 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -26,6 +26,7 @@
 
 #include <cmake.h>
 #include <Config.h>
+#include <Context.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -382,6 +383,8 @@ std::string Config::_defaults =
   "report.blocking.filter= status:pending +BLOCKING\n"
   "\n";
 
+extern Context context;
+
 ////////////////////////////////////////////////////////////////////////////////
 // DO NOT CALL Config::setDefaults.
 //
@@ -421,6 +424,8 @@ void Config::load (const std::string& file, int nest /* = 1 */)
   std::string contents;
   if (File::read (file, contents) && contents.length ())
     parse (contents, nest);
+
+  context.debug (timer.str ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index ff07f28a4..79815f787 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -559,6 +559,7 @@ int Hooks::callHookScript (
     timer_per_hook.start();
 
     status = execute (script, args, inputStr, outputStr);
+    context.debug(timer_per_hook.str ());
   }
   else
     status = execute (script, args, inputStr, outputStr);
diff --git a/src/Timer.cpp b/src/Timer.cpp
deleted file mode 100644
index ed41c55c9..000000000
--- a/src/Timer.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Timer.h>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <Context.h>
-
-extern Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-Timer::Timer ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Timer starts when the object is constructed with a description.
-Timer::Timer (const std::string& description)
-: _description (description)
-{
-  start ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Timer stops when the object is destructed.
-Timer::~Timer ()
-{
-  stop ();
-
-  std::stringstream s;
-  s << "Timer "
-    << _description
-    << ' '
-    << std::setprecision (6)
-    << std::fixed
-    << _total / 1000000.0
-    << " sec";
-
-  context.debug (s.str ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Timer::start ()
-{
-  if (!_running)
-  {
-    gettimeofday (&_start, nullptr);
-    _running = true;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Timer::stop ()
-{
-  if (_running)
-  {
-    struct timeval end;
-    gettimeofday (&end, nullptr);
-    _running = false;
-    _total += (end.tv_sec - _start.tv_sec) * 1000000
-            + (end.tv_usec - _start.tv_usec);
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned long Timer::total () const
-{
-  return _total;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Timer::subtract (unsigned long value)
-{
-  if (value > _total)
-    _total = 0;
-  else
-    _total -= value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned long Timer::now ()
-{
-  struct timeval now;
-  gettimeofday (&now, nullptr);
-  return now.tv_sec * 1000000 + now.tv_usec;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Timer.h b/src/Timer.h
deleted file mode 100644
index 60e133799..000000000
--- a/src/Timer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_TIMER
-#define INCLUDED_TIMER
-
-#include <string>
-#include <sys/time.h>
-
-// Timer is a scope-activated timer that dumps to std::cout at end of scope.
-class Timer
-{
-public:
-  Timer ();
-  explicit Timer (const std::string&);
-  ~Timer ();
-
-  void start ();
-  void stop ();
-  unsigned long total () const;
-  void subtract (unsigned long);
-
-  static unsigned long now ();
-
-private:
-  std::string    _description {"-"};
-  bool           _running     {false};
-  struct timeval _start       {};
-  unsigned long  _total       {0};
-};
-
-#endif

From 4079fb2326982f6a52655bd2301396fbd90b38db Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 22 Oct 2016 13:21:39 -0400
Subject: [PATCH 109/879] Tests: Removed unnecessary imports

---
 test/list.all.projects.t | 2 --
 test/special.t           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index d40b773d9..3c85d3bae 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -33,8 +33,6 @@ import unittest
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from basetest import Task, TestCase
-from basetest import Taskd, ServerTestCase
-
 
 class TestListAllProjects(TestCase):
     @classmethod
diff --git a/test/special.t b/test/special.t
index 496bd4ce4..4dd737fd5 100755
--- a/test/special.t
+++ b/test/special.t
@@ -33,8 +33,6 @@ import unittest
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from basetest import Task, TestCase
-from basetest import Taskd, ServerTestCase
-
 
 class TestSpecialTags(TestCase):
     @classmethod

From 7ab0e9c7222cc40f3ebbc09d9240dca0762a2515 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 31 Oct 2016 18:21:03 +0100
Subject: [PATCH 110/879] l10n: Make safete valve message more explicit about
 completed/deleted tasks

---
 src/l10n/deu-DEU.h | 2 +-
 src/l10n/eng-USA.h | 2 +-
 src/l10n/epo-RUS.h | 2 +-
 src/l10n/esp-ESP.h | 2 +-
 src/l10n/fra-FRA.h | 2 +-
 src/l10n/ita-ITA.h | 2 +-
 src/l10n/jpn-JPN.h | 2 +-
 src/l10n/pol-POL.h | 2 +-
 src/l10n/por-PRT.h | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4cb7e32b7..8e7496067 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
 #define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
 #define STRING_TASK_VALID_RECUR      "Wiederhol-Periode '{1}' ist ungültig."
-#define STRING_TASK_SAFETY_VALVE     "Dieser Befehl hat keinen Filter und wird alle Aufgaben verändern.  Sind Sie sicher?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
 #define STRING_TASK_INVALID_DUR      "Zeitdauer '{1}' nicht unterstützt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3a64918ba..75916f5f1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -860,7 +860,7 @@
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 #define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all tasks.  Are you sure?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 6594bf211..0c02e4caa 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
 #define STRING_TASK_VALID_RECUR      "Reokaz-valoro '{1}' ne estas valida."
-#define STRING_TASK_SAFETY_VALVE     "Tiu komando ne havas filtrilo, do ĝi modifos ĉian taskon.  Ĉu vi estas certa?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1a512c4d7..e48f429ce 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -871,7 +871,7 @@
 #define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
 #define STRING_TASK_VALID_RECUR      "El valor de recurrencia '{1}' no es válido."
-#define STRING_TASK_SAFETY_VALVE     "Este comando no tiene filtro, y modificará todas las tareas. ¿Está seguro?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
 #define STRING_TASK_INVALID_DUR      "El valor de duración '{1}' no está soportado."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 05d7e82e9..ac468a930 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 #define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all tasks.  Are you sure?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d54af0588..eaff151c9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -861,7 +861,7 @@
 #define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
 #define STRING_TASK_VALID_RECUR      "Il valore di periodicità '{1}' non è valido."
-#define STRING_TASK_SAFETY_VALVE     "Questo comando non ha filtro, e modificherà tutti i task. Sicuro?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ff27b30f3..14560d743 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 #define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
-#define STRING_TASK_SAFETY_VALVE     "このコマンドにはフィルタが設定されていないため全タスクが変更されます。よいですか?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 8e5d82760..382dd8528 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
 #define STRING_TASK_VALID_RECUR      "Wartość '{1}' określająca okres zadania jest niepoprawna."
-#define STRING_TASK_SAFETY_VALVE     "Nie nałożono filtra, wszystkie zadania zostaną poddane modyfikacji.  Czy chcesz kontynuować?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
 #define STRING_TASK_INVALID_DUR      "Wartość czas trwania '{1}' jest niewspierana."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c8859b024..d11655965 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -862,7 +862,7 @@
 #define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."
 #define STRING_TASK_VALID_RECUR      "O valor de recorrência '{1}' não é válido."
-#define STRING_TASK_SAFETY_VALVE     "Este comando não possui um filtro e irá modificar todas as tarefas. Tem a certeza?"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
 #define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."

From 9a85c45bf729e9195b36cd955217ec336890617b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 01:04:36 -0400
Subject: [PATCH 111/879] TLSClient: No longer calls gnutls_global_{de,}init
 for 3.3.0+

---
 src/TLSClient.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 512de5bf1..7ad058fc7 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -86,7 +86,9 @@ TLSClient::~TLSClient ()
 {
   gnutls_deinit (_session);
   gnutls_certificate_free_credentials (_credentials);
+#if GNUTLS_VERSION_NUMBER < 0x030300
   gnutls_global_deinit ();
+#endif
 
   if (_socket)
   {
@@ -144,9 +146,12 @@ void TLSClient::init (
   _cert = cert;
   _key  = key;
 
-  int ret = gnutls_global_init ();
+  int ret;
+#if GNUTLS_VERSION_NUMBER < 0x030300
+  ret = gnutls_global_init ();
   if (ret < 0)
     throw format ("TLS init error. {1}", gnutls_strerror (ret));
+#endif
 
   ret = gnutls_certificate_allocate_credentials (&_credentials);
   if (ret < 0)

From cf66c2a191fcd5c200beff44302459e931a7bb68 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 01:05:14 -0400
Subject: [PATCH 112/879] TLSClient: Improved C+ Core Guidelines compliance

---
 src/TLSClient.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 7ad058fc7..c467517ee 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -186,7 +186,7 @@ void TLSClient::init (
   if (ret < 0)
   {
     if (_debug && ret == GNUTLS_E_INVALID_REQUEST)
-      std::cout << "c: ERROR Priority error at: " << err << "\n";
+      std::cout << "c: ERROR Priority error at: " << err << '\n';
 
     throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret));
   }
@@ -280,7 +280,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   {
 #if GNUTLS_VERSION_NUMBER >= 0x03010a
     char* desc = gnutls_session_get_desc (_session);
-    std::cout << "c: INFO Handshake was completed: " << desc << "\n";
+    std::cout << "c: INFO Handshake was completed: " << desc << '\n';
     gnutls_free (desc);
 #else
     std::cout << "c: INFO Handshake was completed.\n";
@@ -315,7 +315,7 @@ int TLSClient::verify_certificate () const
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR Certificate verification peers3 failed. " << gnutls_strerror (ret) << "\n";
+      std::cout << "c: ERROR Certificate verification peers3 failed. " << gnutls_strerror (ret) << '\n';
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
@@ -325,18 +325,18 @@ int TLSClient::verify_certificate () const
   //   GNUTLS_CERT_UNEXPECTED_OWNER    1<<14  Hostname does not match
 
   if (_debug && status)
-    std::cout << "c: ERROR Certificate status=" << status << "\n";
+    std::cout << "c: ERROR Certificate status=" << status << '\n';
 #else
   int ret = gnutls_certificate_verify_peers2 (_session, &status);
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR Certificate verification peers2 failed. " << gnutls_strerror (ret) << "\n";
+      std::cout << "c: ERROR Certificate verification peers2 failed. " << gnutls_strerror (ret) << '\n';
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
   if (_debug && status)
-    std::cout << "c: ERROR Certificate status=" << status << "\n";
+    std::cout << "c: ERROR Certificate status=" << status << '\n';
 
   if ((status == 0) && (_trust != TLSClient::ignore_hostname))
   {
@@ -350,7 +350,7 @@ int TLSClient::verify_certificate () const
       if (cert_list_size == 0)
       {
         if (_debug)
-          std::cout << "c: ERROR Certificate get peers failed. " << gnutls_strerror (ret) << "\n";
+          std::cout << "c: ERROR Certificate get peers failed. " << gnutls_strerror (ret) << '\n';
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
 
@@ -358,7 +358,7 @@ int TLSClient::verify_certificate () const
       if (ret < 0)
       {
         if (_debug)
-          std::cout << "c: ERROR x509 init failed. " << gnutls_strerror (ret) << "\n";
+          std::cout << "c: ERROR x509 init failed. " << gnutls_strerror (ret) << '\n';
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
 
@@ -366,7 +366,7 @@ int TLSClient::verify_certificate () const
       if (ret < 0)
       {
         if (_debug)
-          std::cout << "c: ERROR x509 cert import. " << gnutls_strerror (ret) << "\n";
+          std::cout << "c: ERROR x509 cert import. " << gnutls_strerror (ret) << '\n';
         gnutls_x509_crt_deinit(cert);
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
@@ -374,7 +374,7 @@ int TLSClient::verify_certificate () const
       if (gnutls_x509_crt_check_hostname (cert, hostname) == 0)
       {
         if (_debug)
-          std::cout << "c: ERROR x509 cert check hostname. " << gnutls_strerror (ret) << "\n";
+          std::cout << "c: ERROR x509 cert check hostname. " << gnutls_strerror (ret) << '\n';
         gnutls_x509_crt_deinit(cert);
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
@@ -391,12 +391,12 @@ int TLSClient::verify_certificate () const
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR certificate verification status. " << gnutls_strerror (ret) << "\n";
+      std::cout << "c: ERROR certificate verification status. " << gnutls_strerror (ret) << '\n';
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
   if (_debug)
-    std::cout << "c: INFO " << out.data << "\n";
+    std::cout << "c: INFO " << out.data << '\n';
   gnutls_free (out.data);
 #endif
 
@@ -502,7 +502,7 @@ void TLSClient::recv (std::string& data)
     if (received < 0 && gnutls_error_is_fatal (received) == 0)
     {
       if (_debug)
-        std::cout << "c: WARNING " << gnutls_strerror (received) << "\n";
+        std::cout << "c: WARNING " << gnutls_strerror (received) << '\n';
     }
     else if (received < 0)
       throw std::string (gnutls_strerror (received));

From 660cd61da7b4bfe2cd817d22cdce7e4a5209f5b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 01:12:56 -0400
Subject: [PATCH 113/879] Test: Fixed bad typo in test framework

---
 test/basetest/taskd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basetest/taskd.py b/test/basetest/taskd.py
index 52160553f..eb6ea52ce 100644
--- a/test/basetest/taskd.py
+++ b/test/basetest/taskd.py
@@ -108,7 +108,7 @@ class Taskd(object):
         self.env = os.environ.copy()
 
         # Make sure TASKDDATA points to the temporary folder
-        self.env["TASKDATA"] = self.datadir
+        self.env["TASKDDATA"] = self.datadir
 
     def create_user(self, user=None, group=None, org=None):
         """Create a user/group in the server and return the user

From 952171337c52f8e102a3adf17de75c87985401c5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 17:57:35 -0500
Subject: [PATCH 114/879] Tests: Fixed unit test that emitted unicode, that
 'run_all' dislikes

---
 test/text.t.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/text.t.cpp b/test/text.t.cpp
index 231622824..0f47e9dbb 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -53,8 +53,8 @@ int main (int, char**)
   text = "This ☺ is a test of utf8 line extraction.";
   lines.clear ();
   wrapText (lines, text, 7, true);
-  t.is (lines.size (), (size_t) 7, "wrapText 'This ☺ is a test of utf8 line extraction.' -> total 7 lines");
-  t.is (lines[0], "This ☺",        "wrapText line 0 -> 'This ☺'");
+  t.is (lines.size (), (size_t) 7, "wrapText 'This \\u263a is a test of utf8 line extraction.' -> total 7 lines");
+  t.is (lines[0], "This ☺",        "wrapText line 0 -> 'This \\u263a'");
   t.is (lines[1], "is a",          "wrapText line 1 -> 'is a'");
   t.is (lines[2], "test of",       "wrapText line 2 -> 'test of'");
   t.is (lines[3], "utf8",          "wrapText line 3 -> 'utf8'");
@@ -74,7 +74,7 @@ int main (int, char**)
   unsigned int offset = 0;
   std::string line;
   extractLine (line, text, 7, true, offset);
-  t.is (line, "This ☺", "extractLine 7 'This ☺ is a test of utf8 line extraction.' -> 'This ☺'");
+  t.is (line, "This ☺", "extractLine 7 'This \\u263a is a test of utf8 line extraction.' -> 'This \\u263a'");
 
   // void extractLine (std::string& text, std::string& line, int length, bool hyphenate, unsigned int& offset)
   text = "line 1\nlengthy second line that exceeds width";

From 772c68ff622cd14716ad9658ec50da79e3a35a1a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 23:50:40 -0500
Subject: [PATCH 115/879] Test: Removed binary output from test

---
 test/text.t.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/text.t.cpp b/test/text.t.cpp
index 0f47e9dbb..72bcbd044 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -230,7 +230,7 @@ int main (int, char**)
   t.is (longestWord ("    "),                   0, "longestWord (    ) --> 0");
   t.is (longestWord ("this is a test"),         4, "longestWord (this is a test) --> 4");
   t.is (longestWord ("this is a better test"),  6, "longestWord (this is a better test) --> 6");
-  t.is (longestWord ("house Çirçös clown"),     6, "longestWord (Çirçös) --> 6");
+  t.is (longestWord ("house Çirçös clown"),     6, "longestWord (house ...... clown) --> 6");
 
   // int longestLine (const std::string&)
   t.is (longestLine ("one two three four"),    18, "longestLine (one two three four) --> 18");

From e1adf6766bb05ed0a5b4808fb9bdf40313669369 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 6 Nov 2016 23:56:55 -0500
Subject: [PATCH 116/879] Test: Removed binary output from test

---
 test/text.t.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/text.t.cpp b/test/text.t.cpp
index 72bcbd044..cbcf19fab 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -351,10 +351,10 @@ int main (int, char**)
   t.is (leftJustify ("foo", 3), "foo",   "leftJustify foo,3 -> 'foo'");
   t.is (leftJustify ("foo", 4), "foo ",  "leftJustify foo,4 -> 'foo '");
   t.is (leftJustify ("foo", 5), "foo  ", "leftJustify foo,5 -> 'foo  '");
-  t.is (leftJustify ("föo", 5), "föo  ", "leftJustify föo,5 -> 'föo  '");
+  t.is (leftJustify ("föo", 5), "föo  ", "leftJustify f:oo,5 -> 'f:oo  '");
 
   // When a string doesn't fit in the space necessary‥
-  t.is (leftJustify ("foo", 2), "fo",    "leftJustify foo,2 -→ 'fo'");
+  t.is (leftJustify ("foo", 2), "fo",    "leftJustify foo,2 -> 'fo'");
 
   // std::string rightJustify (const std::string&, const int);
   t.is (rightJustify (123, 3), "123",   "rightJustify 123,3 -> '123'");
@@ -365,7 +365,7 @@ int main (int, char**)
   t.is (rightJustify ("foo", 3), "foo",   "rightJustify foo,3 -> 'foo'");
   t.is (rightJustify ("foo", 4), " foo",  "rightJustify foo,4 -> ' foo'");
   t.is (rightJustify ("foo", 5), "  foo", "rightJustify foo,5 -> '  foo'");
-  t.is (rightJustify ("föo", 5), "  föo", "rightJustify föo,5 -> '  föo'");
+  t.is (rightJustify ("föo", 5), "  föo", "rightJustify f:oo,5 -> '  f:oo'");
 
   // bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0);
   t.ok (closeEnough ("foobar", "foobar"),      "closeEnough foobar == foobar");

From c4909ac65761678615fabb5650ffc738fea778bc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 12 Nov 2016 13:47:40 -0500
Subject: [PATCH 117/879] libshared: Updated to
 200f8c699b3011dbe49483e6343affad86e0ac96

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index d84d1bc70..ab9104b63 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit d84d1bc70b14c85af771bb5cc7299c290d5372b5
+Subproject commit ab9104b63984f4c2726c75865085d9ca44f28d2b

From a50dc97332ce029aed83927e74146a143e5d619b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:02:44 -0500
Subject: [PATCH 118/879] Context: Added ::debugTiming to wrap Timer formatting

---
 src/Context.cpp | 15 +++++++++++++++
 src/Context.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/Context.cpp b/src/Context.cpp
index 3d8c3e34e..37584f152 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -29,6 +29,7 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <iomanip>
 #include <algorithm>
 #include <assert.h>
 #include <stdlib.h>
@@ -801,6 +802,20 @@ void Context::decomposeSortField (
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void Context::debugTiming (const std::string& details, const Timer& timer)
+{
+  std::stringstream out;
+  out << "Timer "
+      << details
+      << ' '
+      << std::setprecision (6)
+      << std::fixed
+      << timer.total_us () / 1.0e6
+      << " sec";
+  debug (out.str ());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // This capability is to answer the question of 'what did I just do to generate
 // this output?'.
diff --git a/src/Context.h b/src/Context.h
index a3ea489be..152f91a23 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -66,6 +66,7 @@ public:
   void error (const std::string&);     // Error message sink - non-maskable
 
   void decomposeSortField (const std::string&, std::string&, bool&, bool&);
+  void debugTiming (const std::string&, const Timer&);
 
 private:
   void staticInitialization ();

From d9c72e8f581a906bb37ca487d6cca97a3c3fb203 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:06:48 -0500
Subject: [PATCH 119/879] Config: Migrated to libshared Timer

---
 src/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 46993dbc1..be606f8bb 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -408,7 +408,7 @@ Config::Config ()
 //
 void Config::load (const std::string& file, int nest /* = 1 */)
 {
-  Timer timer ("Config::load (" + file + ")");
+  Timer timer;
 
   if (nest > 10)
     throw std::string (STRING_CONFIG_OVERNEST);
@@ -425,7 +425,7 @@ void Config::load (const std::string& file, int nest /* = 1 */)
   if (File::read (file, contents) && contents.length ())
     parse (contents, nest);
 
-  context.debug (timer.str ());
+  context.debugTiming (format ("Config::load ({1})", file), timer);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From d5cb31922e5fbf1c93f4226c6cfa94ddce75db2b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:07:09 -0500
Subject: [PATCH 120/879] Hooks: Migrated to libshared Timer

---
 src/Hooks.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 79815f787..d27f8cac0 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -555,11 +555,9 @@ int Hooks::callHookScript (
   std::string outputStr;
   if (_debug >= 2)
   {
-    Timer timer_per_hook("Hooks::execute (" + script + ")");
-    timer_per_hook.start();
-
+    Timer timer;
     status = execute (script, args, inputStr, outputStr);
-    context.debug(timer_per_hook.str ());
+    context.debugTiming (format ("Hooks::execute ({1})", script), timer);
   }
   else
     status = execute (script, args, inputStr, outputStr);

From ced7490df6de8c08c4f6edf3fb279b4b9e71005f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:08:04 -0500
Subject: [PATCH 121/879] TDB2: Migrated to libshared Timer

---
 src/TDB2.cpp | 8 ++------
 src/TDB2.h   | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index f53332aed..34b085a2d 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -381,7 +381,7 @@ void TF2::load_gc (Task& task)
 ////////////////////////////////////////////////////////////////////////////////
 void TF2::load_tasks (bool from_gc /* = false */)
 {
-  context.timer_load.start ();
+  Timer timer;
 
   if (! _loaded_lines)
   {
@@ -425,7 +425,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
     throw e + format (STRING_TDB2_PARSE_ERROR, _file._data, line_number);
   }
 
-  context.timer_load.stop ();
+  context.tdb2.load_time_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1254,7 +1254,6 @@ void TDB2::show_diff (
 void TDB2::gc ()
 {
   context.timer_gc.start ();
-  unsigned long load_start = context.timer_load.total ();
 
   // Allowed as an override, but not recommended.
   if (context.config.getBoolean ("gc"))
@@ -1291,10 +1290,7 @@ void TDB2::gc ()
       completed.dependency_scan ();
   }
 
-  // Stop and remove accumulated load time from the GC time, because they
-  // overlap.
   context.timer_gc.stop ();
-  context.timer_gc.subtract (context.timer_load.total () - load_start);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/TDB2.h b/src/TDB2.h
index a830355e4..9f8178f8f 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -154,6 +154,7 @@ public:
   TF2 completed;
   TF2 undo;
   TF2 backlog;
+  long load_time_us {};
 
 private:
   std::string        _location;

From 0849501ef54fb291cb18e59b159e26524c31dbf1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:10:48 -0500
Subject: [PATCH 122/879] Context: Migrated to libshared Timer

---
 src/Context.cpp | 41 +++++++++++++++++++++--------------------
 src/Context.h   |  4 ++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 37584f152..2b7452117 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -103,7 +103,7 @@ Context::~Context ()
 int Context::initialize (int argc, const char** argv)
 {
   timer_total.start ();
-  timer_init.start ();
+  Timer timer_init;
   int rc = 0;
 
   try
@@ -308,7 +308,7 @@ int Context::initialize (int argc, const char** argv)
         std::cerr << e << '\n';
   }
 
-  timer_init.stop ();
+  time_init_us += timer_init.total_us ();
   return rc;
 }
 
@@ -339,24 +339,25 @@ int Context::run ()
       << ' '
       << ISO8601d ().toISO ()
 
-      << " init:"   << timer_init.total ()
-      << " load:"   << timer_load.total ()
-      << " gc:"     << timer_gc.total ()
-      << " filter:" << timer_filter.total ()
-      << " commit:" << timer_commit.total ()
-      << " sort:"   << timer_sort.total ()
-      << " render:" << timer_render.total ()
-      << " hooks:"  << timer_hooks.total ()
-      << " other:"  << timer_total.total ()  -
-                       timer_init.total ()   -
-                       timer_load.total ()   -
-                       timer_gc.total ()     -
-                       timer_filter.total () -
-                       timer_commit.total () -
-                       timer_sort.total ()   -
-                       timer_render.total () -
-                       timer_hooks.total ()
-      << " total:"  << timer_total.total ()
+      << " init:"   << time_init_us
+      << " load:"   << static_cast <long> (timer_load.total_us ())
+      << " gc:"     << static_cast <long> (timer_gc.total_us () - tdb2.load_time_us)
+      << " filter:" << static_cast <long> (timer_filter.total_us ())
+      << " commit:" << static_cast <long> (timer_commit.total_us ())
+      << " sort:"   << static_cast <long> (timer_sort.total_us ())
+      << " render:" << static_cast <long> (timer_render.total_us ())
+      << " hooks:"  << static_cast <long> (timer_hooks.total_us ())
+      << " other:"  << static_cast <long> (timer_total.total_us ()  -
+                                           time_init_us             -
+                                           timer_load.total_us ()   -
+                                           timer_gc.total_us ()     -
+                                           tdb2.load_time_us        -
+                                           timer_filter.total_us () -
+                                           timer_commit.total_us () -
+                                           timer_sort.total_us ()   -
+                                           timer_render.total_us () -
+                                           timer_hooks.total_us ())
+      << " total:"  << static_cast <long> (timer_total.total_us ())
       << '\n';
     debug (s.str ());
   }
diff --git a/src/Context.h b/src/Context.h
index 152f91a23..33b59f67f 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -104,8 +104,8 @@ public:
   int                                 terminal_width;
   int                                 terminal_height;
 
-  Timer                               timer_total;
-  Timer                               timer_init;
+  Timer                               timer_total         {};
+  long                                time_init_us        {0};
   Timer                               timer_load;
   Timer                               timer_gc;
   Timer                               timer_filter;

From c7cb2f26ffd35be032d3f5783d2c66257af4612a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:12:07 -0500
Subject: [PATCH 123/879] Context: Uses inline member initialization

---
 src/Context.cpp | 15 ---------------
 src/Context.h   | 48 +++++++++++++++++++++---------------------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 2b7452117..693c09a47 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -74,21 +74,6 @@ static const char* modifierNames[] =
 
 #define NUM_MODIFIER_NAMES       (sizeof (modifierNames) / sizeof (modifierNames[0]))
 
-////////////////////////////////////////////////////////////////////////////////
-Context::Context ()
-: rc_file ("~/.taskrc")
-, data_dir ("~/.task")
-, config ()
-, tdb2 ()
-, determine_color_use (true)
-, use_color (true)
-, run_gc (true)
-, verbosity_legacy (false)
-, terminal_width (0)
-, terminal_height (0)
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 Context::~Context ()
 {
diff --git a/src/Context.h b/src/Context.h
index 33b59f67f..208cede89 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -41,7 +41,7 @@
 class Context
 {
 public:
-  Context ();                          // Default constructor
+  Context () = default;                // Default constructor
   ~Context ();                         // Destructor
 
   Context (const Context&);
@@ -77,32 +77,26 @@ private:
   void propagateDebug ();
 
 public:
-  CLI2                                cli2;
-  std::string                         home_dir;
-  File                                rc_file;
-  Path                                data_dir;
-  Config                              config;
-
-  TDB2                                tdb2;
-  Hooks                               hooks;
-
-  bool                                determine_color_use;
-  bool                                use_color;
-
-  bool                                run_gc;
-
-  bool                                verbosity_legacy;
-  std::set <std::string>              verbosity;
-  std::vector <std::string>           headers;
-  std::vector <std::string>           footnotes;
-  std::vector <std::string>           errors;
-  std::vector <std::string>           debugMessages;
-
-  std::map <std::string, Command*>    commands;
-  std::map <std::string, Column*>     columns;
-
-  int                                 terminal_width;
-  int                                 terminal_height;
+  CLI2                                cli2                {};
+  std::string                         home_dir            {};
+  File                                rc_file             {"~/.taskrc"};
+  Path                                data_dir            {"~/.task"};
+  Config                              config              {};
+  TDB2                                tdb2                {};
+  Hooks                               hooks               {};
+  bool                                determine_color_use {true};
+  bool                                use_color           {true};
+  bool                                run_gc              {true};
+  bool                                verbosity_legacy    {false};
+  std::set <std::string>              verbosity           {};
+  std::vector <std::string>           headers             {};
+  std::vector <std::string>           footnotes           {};
+  std::vector <std::string>           errors              {};
+  std::vector <std::string>           debugMessages       {};
+  std::map <std::string, Command*>    commands            {};
+  std::map <std::string, Column*>     columns             {};
+  int                                 terminal_width      {0};
+  int                                 terminal_height     {0};
 
   Timer                               timer_total         {};
   long                                time_init_us        {0};

From 89b8c9f1983a1a705f98b3e081e3eb1f8e27d20d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:16:48 -0500
Subject: [PATCH 124/879] Context: Eliminated gc timer

---
 src/Context.cpp | 4 ++--
 src/Context.h   | 2 +-
 src/TDB2.cpp    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 693c09a47..5ce959b8f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -326,7 +326,7 @@ int Context::run ()
 
       << " init:"   << time_init_us
       << " load:"   << static_cast <long> (timer_load.total_us ())
-      << " gc:"     << static_cast <long> (timer_gc.total_us () - tdb2.load_time_us)
+      << " gc:"     << time_gc_us - tdb2.load_time_us
       << " filter:" << static_cast <long> (timer_filter.total_us ())
       << " commit:" << static_cast <long> (timer_commit.total_us ())
       << " sort:"   << static_cast <long> (timer_sort.total_us ())
@@ -335,7 +335,7 @@ int Context::run ()
       << " other:"  << static_cast <long> (timer_total.total_us ()  -
                                            time_init_us             -
                                            timer_load.total_us ()   -
-                                           timer_gc.total_us ()     -
+                                           time_gc_us               -
                                            tdb2.load_time_us        -
                                            timer_filter.total_us () -
                                            timer_commit.total_us () -
diff --git a/src/Context.h b/src/Context.h
index 208cede89..26b7d042c 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -101,7 +101,7 @@ public:
   Timer                               timer_total         {};
   long                                time_init_us        {0};
   Timer                               timer_load;
-  Timer                               timer_gc;
+  long                                time_gc_us          {0};
   Timer                               timer_filter;
   Timer                               timer_commit;
   Timer                               timer_sort;
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 34b085a2d..8b2f12fc9 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1253,7 +1253,7 @@ void TDB2::show_diff (
 // - waiting task in pending that needs to be un-waited
 void TDB2::gc ()
 {
-  context.timer_gc.start ();
+  Timer timer;
 
   // Allowed as an override, but not recommended.
   if (context.config.getBoolean ("gc"))
@@ -1290,7 +1290,7 @@ void TDB2::gc ()
       completed.dependency_scan ();
   }
 
-  context.timer_gc.stop ();
+  context.time_gc_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 14f100268003443d321b24399fbe6e9414b9d4ea Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:27:38 -0500
Subject: [PATCH 125/879] Context: Eliminated filter timer

---
 src/Context.cpp |  4 ++--
 src/Context.h   |  2 +-
 src/Filter.cpp  | 23 +++++++++++------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 5ce959b8f..2cb965ae6 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -327,7 +327,7 @@ int Context::run ()
       << " init:"   << time_init_us
       << " load:"   << static_cast <long> (timer_load.total_us ())
       << " gc:"     << time_gc_us - tdb2.load_time_us
-      << " filter:" << static_cast <long> (timer_filter.total_us ())
+      << " filter:" << time_filter_us
       << " commit:" << static_cast <long> (timer_commit.total_us ())
       << " sort:"   << static_cast <long> (timer_sort.total_us ())
       << " render:" << static_cast <long> (timer_render.total_us ())
@@ -337,7 +337,7 @@ int Context::run ()
                                            timer_load.total_us ()   -
                                            time_gc_us               -
                                            tdb2.load_time_us        -
-                                           timer_filter.total_us () -
+                                           time_filter_us           -
                                            timer_commit.total_us () -
                                            timer_sort.total_us ()   -
                                            timer_render.total_us () -
diff --git a/src/Context.h b/src/Context.h
index 26b7d042c..b7645a6d5 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -102,7 +102,7 @@ public:
   long                                time_init_us        {0};
   Timer                               timer_load;
   long                                time_gc_us          {0};
-  Timer                               timer_filter;
+  long                                time_filter_us      {0};
   Timer                               timer_commit;
   Timer                               timer_sort;
   Timer                               timer_render;
diff --git a/src/Filter.cpp b/src/Filter.cpp
index a6bcdddb9..169ae9ac2 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -28,6 +28,7 @@
 #include <Filter.h>
 #include <algorithm>
 #include <Context.h>
+#include <Timer.h>
 #include <DOM.h>
 #include <Eval.h>
 #include <Variant.h>
@@ -59,7 +60,7 @@ bool domSource (const std::string& identifier, Variant& value)
 // Take an input set of tasks and filter into a subset.
 void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output)
 {
-  context.timer_filter.start ();
+  Timer timer;
   _startCount = (int) input.size ();
 
   context.cli2.prepareFilter ();
@@ -98,15 +99,14 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
 
   _endCount = (int) output.size ();
   context.debug (format ("Filtered {1} tasks --> {2} tasks [list subset]", _startCount, _endCount));
-  context.timer_filter.stop ();
+  context.time_filter_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Take the set of all tasks and filter into a subset.
 void Filter::subset (std::vector <Task>& output)
 {
-  context.timer_filter.start ();
-
+  Timer timer;
   context.cli2.prepareFilter ();
 
   std::vector <std::pair <std::string, Lexer::Type>> precompiled;
@@ -119,9 +119,9 @@ void Filter::subset (std::vector <Task>& output)
 
   if (precompiled.size ())
   {
-    context.timer_filter.stop ();
+    Timer timer_pending;
     auto pending = context.tdb2.pending.get_tasks ();
-    context.timer_filter.start ();
+    context.time_filter_us -= timer_pending.total_us ();
     _startCount = (int) pending.size ();
 
     Eval eval;
@@ -148,9 +148,9 @@ void Filter::subset (std::vector <Task>& output)
     shortcut = pendingOnly ();
     if (! shortcut)
     {
-      context.timer_filter.stop ();
+      Timer timer_completed;
       auto completed = context.tdb2.completed.get_tasks ();
-      context.timer_filter.start ();
+      context.time_filter_us -= timer_completed.total_us ();
       _startCount += (int) completed.size ();
 
       for (auto& task : completed)
@@ -170,20 +170,19 @@ void Filter::subset (std::vector <Task>& output)
   else
   {
     safety ();
-    context.timer_filter.stop ();
 
+    Timer pending_completed;
     for (auto& task : context.tdb2.pending.get_tasks ())
       output.push_back (task);
 
     for (auto& task : context.tdb2.completed.get_tasks ())
       output.push_back (task);
-
-    context.timer_filter.start ();
+    context.time_filter_us -= pending_completed.total_us ();
   }
 
   _endCount = (int) output.size ();
   context.debug (format ("Filtered {1} tasks --> {2} tasks [{3}]", _startCount, _endCount, (shortcut ? "pending only" : "all tasks")));
-  context.timer_filter.stop ();
+  context.time_filter_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From ff36a8755109a100caa9933356bd932f61cb1043 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:31:31 -0500
Subject: [PATCH 126/879] Context: Eliminated commit timer

---
 src/Context.cpp | 4 ++--
 src/Context.h   | 2 +-
 src/TDB2.cpp    | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 2cb965ae6..e7d7968cd 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -328,7 +328,7 @@ int Context::run ()
       << " load:"   << static_cast <long> (timer_load.total_us ())
       << " gc:"     << time_gc_us - tdb2.load_time_us
       << " filter:" << time_filter_us
-      << " commit:" << static_cast <long> (timer_commit.total_us ())
+      << " commit:" << time_commit_us
       << " sort:"   << static_cast <long> (timer_sort.total_us ())
       << " render:" << static_cast <long> (timer_render.total_us ())
       << " hooks:"  << static_cast <long> (timer_hooks.total_us ())
@@ -338,7 +338,7 @@ int Context::run ()
                                            time_gc_us               -
                                            tdb2.load_time_us        -
                                            time_filter_us           -
-                                           timer_commit.total_us () -
+                                           time_commit_us           -
                                            timer_sort.total_us ()   -
                                            timer_render.total_us () -
                                            timer_hooks.total_us ())
diff --git a/src/Context.h b/src/Context.h
index b7645a6d5..fd636fb46 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -103,7 +103,7 @@ public:
   Timer                               timer_load;
   long                                time_gc_us          {0};
   long                                time_filter_us      {0};
-  Timer                               timer_commit;
+  long                                time_commit_us      {0};
   Timer                               timer_sort;
   Timer                               timer_render;
   Timer                               timer_hooks;
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 8b2f12fc9..da4f3a133 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -740,6 +740,8 @@ void TDB2::update (
 ////////////////////////////////////////////////////////////////////////////////
 void TDB2::commit ()
 {
+  Timer timer;
+
   // Ignore harmful signals.
   signal (SIGHUP,    SIG_IGN);
   signal (SIGINT,    SIG_IGN);
@@ -749,10 +751,7 @@ void TDB2::commit ()
   signal (SIGUSR2,   SIG_IGN);
 
   dump ();
-  context.timer_commit.start ();
-
   gather_changes ();
-
   pending.commit ();
   completed.commit ();
   undo.commit ();
@@ -766,7 +765,7 @@ void TDB2::commit ()
   signal (SIGUSR1,   SIG_DFL);
   signal (SIGUSR2,   SIG_DFL);
 
-  context.timer_commit.stop ();
+  context.time_commit_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From ae128f587d304634710276822c58d0c10f9b7ba0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:33:55 -0500
Subject: [PATCH 127/879] Context: Eliminated sort timer

---
 src/Context.cpp | 4 ++--
 src/Context.h   | 2 +-
 src/sort.cpp    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index e7d7968cd..3ac308fb0 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -329,7 +329,7 @@ int Context::run ()
       << " gc:"     << time_gc_us - tdb2.load_time_us
       << " filter:" << time_filter_us
       << " commit:" << time_commit_us
-      << " sort:"   << static_cast <long> (timer_sort.total_us ())
+      << " sort:"   << time_sort_us
       << " render:" << static_cast <long> (timer_render.total_us ())
       << " hooks:"  << static_cast <long> (timer_hooks.total_us ())
       << " other:"  << static_cast <long> (timer_total.total_us ()  -
@@ -339,7 +339,7 @@ int Context::run ()
                                            tdb2.load_time_us        -
                                            time_filter_us           -
                                            time_commit_us           -
-                                           timer_sort.total_us ()   -
+                                           time_sort_us             -
                                            timer_render.total_us () -
                                            timer_hooks.total_us ())
       << " total:"  << static_cast <long> (timer_total.total_us ())
diff --git a/src/Context.h b/src/Context.h
index fd636fb46..c3947900f 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -104,7 +104,7 @@ public:
   long                                time_gc_us          {0};
   long                                time_filter_us      {0};
   long                                time_commit_us      {0};
-  Timer                               timer_sort;
+  long                                time_sort_us        {0};
   Timer                               timer_render;
   Timer                               timer_hooks;
 };
diff --git a/src/sort.cpp b/src/sort.cpp
index 86c3dbb5d..58c3e5cc9 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -47,7 +47,7 @@ void sort_tasks (
   std::vector <int>& order,
   const std::string& keys)
 {
-  context.timer_sort.start ();
+  Timer timer;
 
   global_data = &data;
 
@@ -59,7 +59,7 @@ void sort_tasks (
   if (order.size ())
     std::stable_sort (order.begin (), order.end (), sort_compare);
 
-  context.timer_sort.stop ();
+  context.time_sort_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From e3d006f867be8ba58aec48f23617983c7e0357f1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:37:54 -0500
Subject: [PATCH 128/879] Context: Eliminated hooks timer

---
 src/Context.cpp |  4 ++--
 src/Context.h   |  2 +-
 src/Hooks.cpp   | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 3ac308fb0..6d2bffea1 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -331,7 +331,7 @@ int Context::run ()
       << " commit:" << time_commit_us
       << " sort:"   << time_sort_us
       << " render:" << static_cast <long> (timer_render.total_us ())
-      << " hooks:"  << static_cast <long> (timer_hooks.total_us ())
+      << " hooks:"  << time_hooks_us
       << " other:"  << static_cast <long> (timer_total.total_us ()  -
                                            time_init_us             -
                                            timer_load.total_us ()   -
@@ -341,7 +341,7 @@ int Context::run ()
                                            time_commit_us           -
                                            time_sort_us             -
                                            timer_render.total_us () -
-                                           timer_hooks.total_us ())
+                                           time_hooks_us)
       << " total:"  << static_cast <long> (timer_total.total_us ())
       << '\n';
     debug (s.str ());
diff --git a/src/Context.h b/src/Context.h
index c3947900f..de2cf6aa8 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -106,7 +106,7 @@ public:
   long                                time_commit_us      {0};
   long                                time_sort_us        {0};
   Timer                               timer_render;
-  Timer                               timer_hooks;
+  long                                time_hooks_us       {0};
 };
 
 #endif
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index d27f8cac0..abff63366 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -111,7 +111,7 @@ void Hooks::onLaunch () const
   if (! _enabled)
     return;
 
-  context.timer_hooks.start ();
+  Timer timer;
 
   std::vector <std::string> matchingScripts = scripts ("on-launch");
   if (matchingScripts.size ())
@@ -144,7 +144,7 @@ void Hooks::onLaunch () const
     }
   }
 
-  context.timer_hooks.stop ();
+  context.time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -164,7 +164,7 @@ void Hooks::onExit () const
   if (! _enabled)
     return;
 
-  context.timer_hooks.start ();
+  Timer timer;
 
   std::vector <std::string> matchingScripts = scripts ("on-exit");
   if (matchingScripts.size ())
@@ -206,7 +206,7 @@ void Hooks::onExit () const
     }
   }
 
-  context.timer_hooks.stop ();
+  context.time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -226,7 +226,7 @@ void Hooks::onAdd (Task& task) const
   if (! _enabled)
     return;
 
-  context.timer_hooks.start ();
+  Timer timer;
 
   std::vector <std::string> matchingScripts = scripts ("on-add");
   if (matchingScripts.size ())
@@ -271,7 +271,7 @@ void Hooks::onAdd (Task& task) const
     task = Task (input[0]);
   }
 
-  context.timer_hooks.stop ();
+  context.time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -292,7 +292,7 @@ void Hooks::onModify (const Task& before, Task& after) const
   if (! _enabled)
     return;
 
-  context.timer_hooks.start ();
+  Timer timer;
 
   std::vector <std::string> matchingScripts = scripts ("on-modify");
   if (matchingScripts.size ())
@@ -337,7 +337,7 @@ void Hooks::onModify (const Task& before, Task& after) const
     after = Task (input[1]);
   }
 
-  context.timer_hooks.stop ();
+  context.time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 197f13059367fe6ae56cc6db703bcfa0479bc996 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 13:42:48 -0500
Subject: [PATCH 129/879] Context: Eliminated render timer

---
 src/Context.cpp            | 20 ++++++++++----------
 src/Context.h              |  2 +-
 src/ViewTask.cpp           | 10 +++++-----
 src/commands/CmdExport.cpp |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 6d2bffea1..c2df43c86 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -330,17 +330,17 @@ int Context::run ()
       << " filter:" << time_filter_us
       << " commit:" << time_commit_us
       << " sort:"   << time_sort_us
-      << " render:" << static_cast <long> (timer_render.total_us ())
+      << " render:" << time_render_us
       << " hooks:"  << time_hooks_us
-      << " other:"  << static_cast <long> (timer_total.total_us ()  -
-                                           time_init_us             -
-                                           timer_load.total_us ()   -
-                                           time_gc_us               -
-                                           tdb2.load_time_us        -
-                                           time_filter_us           -
-                                           time_commit_us           -
-                                           time_sort_us             -
-                                           timer_render.total_us () -
+      << " other:"  << static_cast <long> (timer_total.total_us () -
+                                           time_init_us            -
+                                           timer_load.total_us ()  -
+                                           time_gc_us              -
+                                           tdb2.load_time_us       -
+                                           time_filter_us          -
+                                           time_commit_us          -
+                                           time_sort_us            -
+                                           time_render_us          -
                                            time_hooks_us)
       << " total:"  << static_cast <long> (timer_total.total_us ())
       << '\n';
diff --git a/src/Context.h b/src/Context.h
index de2cf6aa8..d9b2e6212 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -105,7 +105,7 @@ public:
   long                                time_filter_us      {0};
   long                                time_commit_us      {0};
   long                                time_sort_us        {0};
-  Timer                               timer_render;
+  long                                time_render_us      {0};
   long                                time_hooks_us       {0};
 };
 
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index c8347b4aa..b0562995f 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -110,7 +110,7 @@ ViewTask::~ViewTask ()
 //
 std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& sequence)
 {
-  context.timer_render.start ();
+  Timer timer;
 
   bool const obfuscate           = context.config.getBoolean ("obfuscate");
   bool const print_empty_columns = context.config.getBoolean ("print.empty.columns");
@@ -287,7 +287,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
     // Stop if the line limit is exceeded.
     if (++_lines >= _truncate_lines && _truncate_lines != 0)
     {
-      context.timer_render.stop ();
+      context.time_render_us += timer.total_us ();
       return out;
     }
   }
@@ -373,7 +373,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
       // Stop if the line limit is exceeded.
       if (++_lines >= _truncate_lines && _truncate_lines != 0)
       {
-        context.timer_render.stop ();
+        context.time_render_us += timer.total_us ();
         return out;
       }
     }
@@ -383,12 +383,12 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
     // Stop if the row limit is exceeded.
     if (++_rows >= _truncate_rows && _truncate_rows != 0)
     {
-      context.timer_render.stop ();
+      context.time_render_us += timer.total_us ();
       return out;
     }
   }
 
-  context.timer_render.stop ();
+  context.time_render_us += timer.total_us ();
   return out;
 }
 
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index af171cfdf..ba490e0d4 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -63,7 +63,7 @@ int CmdExport::execute (std::string& output)
   filter.subset (filtered);
 
   // Export == render.
-  context.timer_render.start ();
+  Timer timer;
 
   // Obey 'limit:N'.
   int rows = 0;
@@ -101,7 +101,7 @@ int CmdExport::execute (std::string& output)
   if (json_array)
     output += "]\n";
 
-  context.timer_render.stop ();
+  context.time_render_us += timer.total_us ();
   return rc;
 }
 

From 570cd3d810bc3dbc8da329813697818626d32aa4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 Nov 2016 14:03:59 -0500
Subject: [PATCH 130/879] Context: Eliminated load timer

---
 src/Context.cpp | 28 +++++++++++++---------------
 src/Context.h   |  3 ++-
 src/TDB2.cpp    |  2 +-
 src/TDB2.h      |  1 -
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index c2df43c86..518099b13 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -88,7 +88,6 @@ Context::~Context ()
 int Context::initialize (int argc, const char** argv)
 {
   timer_total.start ();
-  Timer timer_init;
   int rc = 0;
 
   try
@@ -293,7 +292,7 @@ int Context::initialize (int argc, const char** argv)
         std::cerr << e << '\n';
   }
 
-  time_init_us += timer_init.total_us ();
+  time_init_us += timer_total.total_us ();
   return rc;
 }
 
@@ -311,6 +310,7 @@ int Context::run ()
     hooks.onExit ();          // No chance to update data.
 
     timer_total.stop ();
+    time_total_us += timer_total.total_us ();
 
     std::stringstream s;
     s << "Perf "
@@ -325,24 +325,22 @@ int Context::run ()
       << ISO8601d ().toISO ()
 
       << " init:"   << time_init_us
-      << " load:"   << static_cast <long> (timer_load.total_us ())
-      << " gc:"     << time_gc_us - tdb2.load_time_us
+      << " load:"   << time_load_us
+      << " gc:"     << time_gc_us - time_load_us
       << " filter:" << time_filter_us
       << " commit:" << time_commit_us
       << " sort:"   << time_sort_us
       << " render:" << time_render_us
       << " hooks:"  << time_hooks_us
-      << " other:"  << static_cast <long> (timer_total.total_us () -
-                                           time_init_us            -
-                                           timer_load.total_us ()  -
-                                           time_gc_us              -
-                                           tdb2.load_time_us       -
-                                           time_filter_us          -
-                                           time_commit_us          -
-                                           time_sort_us            -
-                                           time_render_us          -
-                                           time_hooks_us)
-      << " total:"  << static_cast <long> (timer_total.total_us ())
+      << " other:"  << time_total_us  -
+                       time_init_us   -
+                       time_gc_us     -
+                       time_filter_us -
+                       time_commit_us -
+                       time_sort_us   -
+                       time_render_us -
+                       time_hooks_us
+      << " total:"  << time_total_us
       << '\n';
     debug (s.str ());
   }
diff --git a/src/Context.h b/src/Context.h
index d9b2e6212..0c249c91b 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -99,8 +99,9 @@ public:
   int                                 terminal_height     {0};
 
   Timer                               timer_total         {};
+  long                                time_total_us       {0};
   long                                time_init_us        {0};
-  Timer                               timer_load;
+  long                                time_load_us        {0};
   long                                time_gc_us          {0};
   long                                time_filter_us      {0};
   long                                time_commit_us      {0};
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index da4f3a133..9d80cca43 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -425,7 +425,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
     throw e + format (STRING_TDB2_PARSE_ERROR, _file._data, line_number);
   }
 
-  context.tdb2.load_time_us += timer.total_us ();
+  context.time_load_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/TDB2.h b/src/TDB2.h
index 9f8178f8f..a830355e4 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -154,7 +154,6 @@ public:
   TF2 completed;
   TF2 undo;
   TF2 backlog;
-  long load_time_us {};
 
 private:
   std::string        _location;

From 764ada3a17b0b00256fd4d62cbf42a7a77f00048 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Nov 2016 09:43:39 -0500
Subject: [PATCH 131/879] CmdDiagnostics: Made sure file existence is checked
 before readability

---
 src/commands/CmdDiagnostics.cpp | 69 ++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 3ed6a99bc..9e0a50fd3 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -234,13 +234,53 @@ int CmdDiagnostics::execute (std::string& output)
       << context.config.get ("taskd.server")
       << '\n';
 
-  if (context.config.get ("taskd.ca") != "")
-    out << "         CA: "
-        << context.config.get ("taskd.ca")
-        << (File (context.config.get ("taskd.ca")).readable ()
-             ? ", readable, " : ", not readable, ")
-        << File (context.config.get ("taskd.ca")).size ()
-        << " bytes\n";
+  std::string ca_pem = context.config.get ("taskd.ca");
+  out << "         CA: ";
+  if (ca_pem != "")
+  {
+    File file_ca (ca_pem);
+    if (file_ca.exists ())
+      out << ca_pem
+          << (file_ca.readable () ? ", readable, " : ", not readable, ")
+          << file_ca.size ()
+          << " bytes\n";
+    else
+      out << "not found\n";
+  }
+  else
+    out << "-\n";
+
+  std::string cert_pem = context.config.get ("taskd.certificate");
+  out << "Certificate: ";
+  if (cert_pem != "")
+  {
+    File file_cert (cert_pem);
+    if (file_cert.exists ())
+      out << cert_pem
+          << (file_cert.readable () ? ", readable, " : ", not readable, ")
+          << file_cert.size ()
+          << " bytes\n";
+    else
+      out << "not found\n";
+  }
+  else
+    out << "-\n";
+
+  std::string key_pem = context.config.get ("taskd.key");
+  out << "        Key: ";
+  if (key_pem != "")
+  {
+    File file_key (key_pem);
+    if (file_key.exists ())
+      out << key_pem
+          << (file_key.readable () ? ", readable, " : ", not readable, ")
+          << file_key.size ()
+          << " bytes\n";
+    else
+      out << "not found\n";
+  }
+  else
+    out << "-\n";
 
   std::string trust_value = context.config.get ("taskd.trust");
   if (trust_value == "strict" ||
@@ -250,20 +290,6 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "      Trust: Bad value - see 'man taskrc'\n";
 
-  out << "Certificate: "
-      << context.config.get ("taskd.certificate")
-      << (File (context.config.get ("taskd.certificate")).readable ()
-           ? ", readable, " : ", not readable, ")
-      << File (context.config.get ("taskd.certificate")).size ()
-      << " bytes\n";
-
-  out << "        Key: "
-      << context.config.get ("taskd.key")
-      << (File (context.config.get ("taskd.key")).readable ()
-           ? ", readable, " : ", not readable, ")
-      << File (context.config.get ("taskd.key")).size ()
-      << " bytes\n";
-
   out << "    Ciphers: "
       << context.config.get ("taskd.ciphers")
       << '\n';
@@ -412,7 +438,6 @@ int CmdDiagnostics::execute (std::string& output)
         << '\n';
   }
 
-
   // Check all the UUID references
 
   bool noBrokenRefs = true;

From 80ea2bb51d1a9a37ab73c741b34fab08caa8bdaa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Nov 2016 09:45:04 -0500
Subject: [PATCH 132/879] TDB2: Made sure file exists before checking
 readability

---
 src/TDB2.cpp | 4 ++--
 test/diag.t  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 9d80cca43..fa5cea3da 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -571,8 +571,8 @@ const std::string TF2::dump ()
     label = rightJustify (_file._data.substr (slash + 1), 14);
 
   // File mode.
-  std::string mode = std::string (_file.readable () ? "r" : "-") +
-                     std::string (_file.writable () ? "w" : "-");
+  std::string mode = std::string (_file.exists () && _file.readable () ? "r" : "-") +
+                     std::string (_file.exists () && _file.writable () ? "w" : "-");
        if (mode == "r-") mode = red.colorize (mode);
   else if (mode == "rw") mode = green.colorize (mode);
   else                   mode = yellow.colorize (mode);
diff --git a/test/diag.t b/test/diag.t
index 894dd2c9c..4804ee131 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -50,6 +50,8 @@ class TestDiagnostics(TestCase):
         self.tap(out)
         self.assertRegexpMatches(out, "Compliance:\s+C\+\+11")
         self.assertRegexpMatches(out, "libgnutls:\s+\d+\.\d+\.\d+")
+        self.assertIn("edlin", out)
+        self.assertIn("strict", out)
 
 
 if __name__ == "__main__":

From 3be7803d3023e76f9d035fa62ef41bae1a9a5c1f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Nov 2016 10:26:59 -0500
Subject: [PATCH 133/879] libshared: Updated to
 ce5c3414de56a2d1390893bbdc46e7116c38cd90

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index ab9104b63..ce5c3414d 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit ab9104b63984f4c2726c75865085d9ca44f28d2b
+Subproject commit ce5c3414de56a2d1390893bbdc46e7116c38cd90

From 992b41b82aef375732b3101d76f6530130b4a56b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Nov 2016 13:12:07 -0500
Subject: [PATCH 134/879] TLSClient: Improved C++ core guidelines

---
 src/TLSClient.cpp | 15 ---------------
 src/TLSClient.h   | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index c467517ee..8f7653db8 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -66,21 +66,6 @@ static int verify_certificate_callback (gnutls_session_t session)
   return client->verify_certificate ();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-TLSClient::TLSClient ()
-: _ca ("")
-, _cert ("")
-, _key ("")
-, _host ("")
-, _port ("")
-, _session(0)
-, _socket (0)
-, _limit (0)
-, _debug (false)
-, _trust(strict)
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 TLSClient::~TLSClient ()
 {
diff --git a/src/TLSClient.h b/src/TLSClient.h
index 444d9ffa6..b51aa38c1 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -36,7 +36,7 @@ class TLSClient
 public:
   enum trust_level { strict, ignore_hostname, allow_all };
 
-  TLSClient ();
+  TLSClient () = default;
   ~TLSClient ();
   void limit (int);
   void debug (int);
@@ -51,18 +51,18 @@ public:
   void recv (std::string&);
 
 private:
-  std::string                      _ca;
-  std::string                      _cert;
-  std::string                      _key;
-  std::string                      _ciphers;
-  std::string                      _host;
-  std::string                      _port;
-  gnutls_certificate_credentials_t _credentials;
-  gnutls_session_t                 _session;
-  int                              _socket;
-  int                              _limit;
-  bool                             _debug;
-  enum trust_level                 _trust;
+  std::string                      _ca          {""};
+  std::string                      _cert        {""};
+  std::string                      _key         {""};
+  std::string                      _ciphers     {""};
+  std::string                      _host        {""};
+  std::string                      _port        {""};
+  gnutls_certificate_credentials_t _credentials {};
+  gnutls_session_t                 _session     {0};
+  int                              _socket      {0};
+  int                              _limit       {0};
+  bool                             _debug       {false};
+  enum trust_level                 _trust       {strict};
 };
 
 #endif

From b32306941959197ed7fea6db5aa82ed9da089d1c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 21 Nov 2016 20:34:18 -0500
Subject: [PATCH 135/879] Tests: Fixed test harness for Python 3.x.

- Thanks to jrabbit.
---
 AUTHORS      | 1 +
 ChangeLog    | 2 ++
 test/run_all | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index e27853c84..135bd7a24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -133,6 +133,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Ran Benita
   Vladimir
   Zachary Manning
+  jrabbit
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 7da52f9ce..d771f7ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
+- Fixed test harness for Python 3.x.
+          (thanks to jrabbit).
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
diff --git a/test/run_all b/test/run_all
index a41aa6cba..3f68d283e 100755
--- a/test/run_all
+++ b/test/run_all
@@ -60,7 +60,10 @@ def run_test(testqueue, outqueue, threadname):
 class TestRunner(object):
     def __init__(self):
         self.threads = []
-        self.tap = open(cmd_args.tapfile, 'w')
+        if sys.version_info > (3,):
+            self.tap = open(cmd_args.tapfile, 'w', errors='ignore')
+        else:
+            self.tap = open(cmd_args.tapfile, 'w')
 
         self._parallelq = Queue()
         self._serialq = Queue()

From a821c886b3852fa97a0799cc7b4b8b06e2da547a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 21 Nov 2016 22:07:02 -0500
Subject: [PATCH 136/879] Tests: Set sys.stdout as utf8

---
 test/run_all | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/run_all b/test/run_all
index 3f68d283e..7f91a3217 100755
--- a/test/run_all
+++ b/test/run_all
@@ -12,6 +12,9 @@ from multiprocessing import cpu_count
 from threading import Thread
 from subprocess import call, Popen, PIPE
 
+if sys.version_info > (3,):
+    import codecs
+
 try:
     # python 2
     from Queue import Queue, Empty
@@ -200,6 +203,9 @@ def parse_args():
 
 
 def main():
+    if sys.version_info > (3,):
+        sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
+
     runner = TestRunner()
     runner.start()
 

From 3d3ad553a6b8c45d42c9cc1ad6c7f2bf22e00356 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 25 Nov 2016 08:26:55 -0800
Subject: [PATCH 137/879] Docs: Typos in ref PDF

- Thanks to eldios.
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 135bd7a24..eee16bb32 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -302,3 +302,4 @@ suggestions:
   Andrew
   bjonnh
   OKOMper
+  eldios

From 2e06bb656125906b7cd99e8bc5ac883b35f1755b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 27 Nov 2016 13:36:53 -0500
Subject: [PATCH 138/879] libshared: Updated to
 9473050234dd3a90bff5400a081ee54881b6b0f5

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index ce5c3414d..947305023 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit ce5c3414de56a2d1390893bbdc46e7116c38cd90
+Subproject commit 9473050234dd3a90bff5400a081ee54881b6b0f5

From 0e56abd0f9d968c1bea2f2ef169e5b654587f50a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 5 Dec 2016 23:34:52 -0500
Subject: [PATCH 139/879] libshared: Updated to
 2af7d037559f84450fffa812829fc553498a7ae4

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 947305023..2af7d0375 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 9473050234dd3a90bff5400a081ee54881b6b0f5
+Subproject commit 2af7d037559f84450fffa812829fc553498a7ae4

From 8a43f4902db509e1a38fcf41aba3b1aab57d4f10 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:20:45 -0500
Subject: [PATCH 140/879] libhsared: migrating from local to libshared

---
 src/CLI2.cpp                    |  10 +-
 src/CMakeLists.txt              |   6 +-
 src/Color.cpp                   |   6 +-
 src/Config.cpp                  |   1 +
 src/Context.cpp                 |  10 +-
 src/DOM.cpp                     |   6 +-
 src/Dates.cpp                   |   2 +-
 src/Eval.cpp                    |   3 +-
 src/Filter.cpp                  |   4 +-
 src/Hooks.cpp                   |  10 +-
 src/ISO8601.cpp                 |   3 +-
 src/TDB2.cpp                    |   4 +-
 src/TLSClient.cpp               |   2 +-
 src/Task.cpp                    |  67 ++++-----
 src/Variant.cpp                 |   2 +-
 src/ViewTask.cpp                |   1 +
 src/ViewText.cpp                |   1 +
 src/columns/ColDepends.cpp      |  15 +-
 src/columns/ColDescription.cpp  |   3 +-
 src/columns/ColID.cpp           |   2 +-
 src/columns/ColIMask.cpp        |   2 +-
 src/columns/ColMask.cpp         |   2 +-
 src/columns/ColParent.cpp       |   2 +-
 src/columns/ColProject.cpp      |   3 +-
 src/columns/ColRecur.cpp        |   3 +-
 src/columns/ColStatus.cpp       |   2 +-
 src/columns/ColString.cpp       |   2 +
 src/columns/ColTags.cpp         |  19 +--
 src/columns/ColTypeDate.cpp     |   2 +-
 src/columns/ColTypeDuration.cpp |   2 +-
 src/columns/ColTypeNumeric.cpp  |   2 +-
 src/columns/ColTypeString.cpp   |   2 +-
 src/columns/ColUDA.cpp          |   3 +-
 src/columns/ColUUID.cpp         |   2 +-
 src/columns/ColUrgency.cpp      |   2 +-
 src/columns/Column.cpp          |  11 +-
 src/commands/CmdAdd.cpp         |   4 +-
 src/commands/CmdAnnotate.cpp    |   4 +-
 src/commands/CmdAppend.cpp      |   4 +-
 src/commands/CmdCalendar.cpp    |   3 +-
 src/commands/CmdColor.cpp       |   3 +-
 src/commands/CmdColumns.cpp     |   1 +
 src/commands/CmdConfig.cpp      |   4 +-
 src/commands/CmdContext.cpp     |   3 +-
 src/commands/CmdCount.cpp       |   2 +-
 src/commands/CmdCustom.cpp      |   1 +
 src/commands/CmdDelete.cpp      |   2 +-
 src/commands/CmdDenotate.cpp    |   3 +-
 src/commands/CmdDiagnostics.cpp |   2 +-
 src/commands/CmdDone.cpp        |   2 +-
 src/commands/CmdDuplicate.cpp   |   2 +-
 src/commands/CmdEdit.cpp        |  12 +-
 src/commands/CmdGet.cpp         |   5 +-
 src/commands/CmdHelp.cpp        |   3 +-
 src/commands/CmdHistory.cpp     |   1 +
 src/commands/CmdIDs.cpp         |  11 +-
 src/commands/CmdImport.cpp      |   1 +
 src/commands/CmdInfo.cpp        |   2 +
 src/commands/CmdLog.cpp         |   2 +-
 src/commands/CmdModify.cpp      |   2 +-
 src/commands/CmdPrepend.cpp     |   2 +-
 src/commands/CmdProjects.cpp    |   1 +
 src/commands/CmdPurge.cpp       |   2 +-
 src/commands/CmdReports.cpp     |   1 +
 src/commands/CmdShow.cpp        |   2 +-
 src/commands/CmdStart.cpp       |   2 +-
 src/commands/CmdStats.cpp       |   1 +
 src/commands/CmdStop.cpp        |   2 +-
 src/commands/CmdSummary.cpp     |   1 +
 src/commands/CmdSync.cpp        |   9 +-
 src/commands/CmdTags.cpp        |   1 +
 src/commands/CmdTimesheet.cpp   |   2 +-
 src/commands/CmdUDAs.cpp        |   1 +
 src/commands/CmdUnique.cpp      |   2 +-
 src/commands/CmdUrgency.cpp     |   2 +-
 src/commands/CmdVersion.cpp     |   2 +-
 src/commands/Command.cpp        |   3 +-
 src/dependency.cpp              |   2 +-
 src/feedback.cpp                |   9 +-
 src/legacy.cpp                  |   2 +-
 src/main.h                      |  16 ---
 src/recur.cpp                   |   2 +-
 src/rules.cpp                   |   2 +-
 src/sort.cpp                    |   6 +-
 src/text.cpp                    | 242 --------------------------------
 src/text.h                      |  42 ------
 src/util.cpp                    |  37 +----
 src/util.h                      |   1 -
 88 files changed, 185 insertions(+), 510 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index c8a2d06db..55dfc1aa5 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -32,8 +32,8 @@
 #include <Context.h>
 #include <Lexer.h>
 #include <Color.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
@@ -1480,8 +1480,7 @@ void CLI2::findIDs ()
         else if (a._lextype == Lexer::Type::set)
         {
           // Split the ID list into elements.
-          std::vector <std::string> elements;
-          split (elements, a.attribute ("raw"), ',');
+          auto elements = split (a.attribute ("raw"), ',');
 
           for (auto& element : elements)
           {
@@ -1536,8 +1535,7 @@ void CLI2::findIDs ()
             a.tag ("FILTER");
 
             // Split the ID list into elements.
-            std::vector <std::string> elements;
-            split (elements, raw, ',');
+            auto elements = split (raw, ',');
 
             for (const auto& element : elements)
             {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6eaee7cf0..3d4e5f9d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,12 +35,16 @@ add_library (task CLI2.cpp CLI2.h
                   text.cpp text.h
                   util.cpp util.h)
 
-add_library (libshared libshared/src/FS.cpp            libshared/src/FS.h
+add_library (libshared libshared/src/Datetime.cpp      libshared/src/Datetime.h
+                       libshared/src/Duration.cpp      libshared/src/Duration.h
+                       libshared/src/FS.cpp            libshared/src/FS.h
                        libshared/src/JSON.cpp          libshared/src/JSON.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
                        libshared/src/Table.cpp         libshared/src/Table.h
                        libshared/src/Timer.cpp         libshared/src/Timer.h
+                       libshared/src/shared.cpp        libshared/src/shared.h
+                       libshared/src/format.cpp        libshared/src/format.h
                        libshared/src/unicode.cpp       libshared/src/unicode.h
                        libshared/src/utf8.cpp          libshared/src/utf8.h
                        libshared/src/wcwidth6.cpp)
diff --git a/src/Color.cpp b/src/Color.cpp
index 557fdfea6..a516e2270 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -31,7 +31,8 @@
 #include <algorithm>
 #include <main.h>
 #include <Lexer.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 #include <string>
 
@@ -130,8 +131,7 @@ Color::Color (const std::string& spec)
 : _value (0)
 {
   // Split spec into words.
-  std::vector <std::string> words;
-  split (words, spec, ' ');
+  auto words = split (spec, ' ');
 
   // Construct the color as two separate colors, then blend them later.  This
   // make it possible to declare a color such as "color1 on black", and have
diff --git a/src/Config.cpp b/src/Config.cpp
index be606f8bb..681a101ce 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -41,6 +41,7 @@
 #include <JSON.h>
 #include <Lexer.h>
 #include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/Context.cpp b/src/Context.cpp
index 518099b13..61c591531 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -39,8 +39,8 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <ISO8601.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 #include <main.h>
 #include <i18n.h>
 
@@ -576,7 +576,8 @@ bool Context::verbose (const std::string& token)
   if (verbosity.empty ())
   {
     verbosity_legacy = config.getBoolean ("verbose");
-    split (verbosity, config.get ("verbose"), ',');
+    for (auto& token : split (config.get ("verbose"), ','))
+      verbosity.insert (token);
 
     // Regular feedback means almost everything.
     // This odd test is to see if a Boolean-false value is a real one, which
@@ -700,8 +701,7 @@ void Context::staticInitialization ()
         rc.first.substr (rc.first.length () - 7, 7) == ".values")
     {
       std::string name = rc.first.substr (4, rc.first.length () - 7 - 4);
-      std::vector <std::string> values;
-      split (values, rc.second, ',');
+      auto values = split (rc.second, ',');
 
       for (auto r = values.rbegin(); r != values.rend (); ++r)
         Task::customOrder[name].push_back (*r);
diff --git a/src/DOM.cpp b/src/DOM.cpp
index f1b06bbd9..88b6c3c65 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -32,7 +32,8 @@
 #include <Variant.h>
 #include <Context.h>
 #include <ISO8601.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
@@ -189,8 +190,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
   }
 
   // split name on '.'
-  std::vector <std::string> elements;
-  split (elements, name, '.');
+  auto elements = split (name, '.');
 
   Task ref (task);
   Nibbler n (elements[0]);
diff --git a/src/Dates.cpp b/src/Dates.cpp
index a721b6a49..1cb4273f0 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <stdlib.h>
 #include <time.h>
-#include <text.h>
+#include <shared.h>
 #include <ISO8601.h>
 #include <Lexer.h>
 #include <CLI2.h>
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 9736d0981..f4f0a2a2f 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -31,7 +31,8 @@
 #include <Context.h>
 #include <Task.h>
 #include <Color.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 169ae9ac2..9e7d06c07 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -34,8 +34,8 @@
 #include <Variant.h>
 #include <Dates.h>
 #include <i18n.h>
-#include <text.h>
-#include <util.h>
+#include <format.h>
+#include <shared.h>
 
 extern Context context;
 
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index abff63366..109aa0490 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -39,10 +39,12 @@
 #include <Context.h>
 #include <Variant.h>
 #include <DOM.h>
+#include <Lexer.h>
 #include <JSON.h>
 #include <Timer.h>
+#include <format.h>
+#include <shared.h>
 #include <text.h>
-#include <util.h>
 #include <i18n.h>
 
 extern Context context;
@@ -468,7 +470,9 @@ void Hooks::assertSameTask (const std::vector <std::string>& input, const Task&
     }
 
     json::string* up = (json::string*) u->second;
-    std::string json_uuid = json::decode (unquoteText (up->dump ()));
+    auto text = up->dump ();
+    Lexer::dequote (text);
+    std::string json_uuid = json::decode (text);
     if (json_uuid != uuid)
     {
       context.error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid));
@@ -562,7 +566,7 @@ int Hooks::callHookScript (
   else
     status = execute (script, args, inputStr, outputStr);
 
-  split (output, outputStr, '\n');
+  output = split (outputStr, '\n');
 
   if (_debug >= 2)
   {
diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
index 0830c21fd..9528393dc 100644
--- a/src/ISO8601.cpp
+++ b/src/ISO8601.cpp
@@ -35,7 +35,8 @@
 #ifdef PRODUCT_TASKWARRIOR
 #include <Dates.h>
 #endif
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <i18n.h>
 
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index fa5cea3da..b8caae2b0 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -37,8 +37,8 @@
 #include <Color.h>
 #include <ISO8601.h>
 #include <i18n.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 8f7653db8..1a9927daf 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -46,7 +46,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 #define MAX_BUF 16384
diff --git a/src/Task.cpp b/src/Task.cpp
index 1b2d3d8f7..a284b849e 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -45,7 +45,8 @@
 #ifdef PRODUCT_TASKWARRIOR
 #include <RX.h>
 #endif
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 
 #include <i18n.h>
@@ -712,8 +713,7 @@ void Task::parseJSON (const json::object* root_obj)
       else if (i.first == "depends" && i.second->type() == json::j_string)
       {
         json::string* deps = (json::string*)i.second;
-        std::vector <std::string> uuids;
-        split (uuids, deps->_data, ',');
+        auto uuids = split (deps->_data, ',');
 
         for (const auto& uuid : uuids)
           addDependency (uuid);
@@ -721,11 +721,19 @@ void Task::parseJSON (const json::object* root_obj)
 
       // Strings are decoded.
       else if (type == "string")
-        set (i.first, json::decode (unquoteText (i.second->dump ())));
+      {
+        auto text = i.second->dump ();
+        Lexer::dequote (text);
+        set (i.first, json::decode (text));
+      }
 
       // Other types are simply added.
       else
-        set (i.first, unquoteText (i.second->dump ()));
+      {
+        auto text = i.second->dump ();
+        Lexer::dequote (text);
+        set (i.first, text);
+      }
     }
 
     // UDA orphans and annotations do not have columns.
@@ -769,7 +777,9 @@ void Task::parseJSON (const json::object* root_obj)
                 << "' --> preserved\n";
         context.debug (message.str ());
 #endif
-        set (i.first, json::decode (unquoteText (i.second->dump ())));
+        auto text = i.second->dump ();
+        Lexer::dequote (text);
+        set (i.first, json::decode (text));
       }
     }
   }
@@ -909,8 +919,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
     // Tags are converted to an array.
     else if (i.first == "tags")
     {
-      std::vector <std::string> tags;
-      split (tags, i.second, ',');
+      auto tags = split (i.second, ',');
 
       out << "\"tags\":[";
 
@@ -949,8 +958,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
 #endif
             )
     {
-      std::vector <std::string> deps;
-      split (deps, i.second, ',');
+      auto deps = split (i.second, ',');
 
       out << "\"depends\":[";
 
@@ -1148,16 +1156,13 @@ void Task::addDependency (const std::string& uuid)
 ////////////////////////////////////////////////////////////////////////////////
 void Task::removeDependency (const std::string& uuid)
 {
-  std::vector <std::string> deps;
-  split (deps, get ("depends"), ',');
+  auto deps = split (get ("depends"), ',');
 
   auto i = std::find (deps.begin (), deps.end (), uuid);
   if (i != deps.end ())
   {
     deps.erase (i);
-    std::string combined;
-    join (combined, ",", deps);
-    set ("depends", combined);
+    set ("depends", join (",", deps));
     recalc_urgency = true;
   }
   else
@@ -1178,8 +1183,7 @@ void Task::removeDependency (int id)
 ////////////////////////////////////////////////////////////////////////////////
 void Task::getDependencies (std::vector <int>& all) const
 {
-  std::vector <std::string> deps;
-  split (deps, get ("depends"), ',');
+  auto deps = split (get ("depends"), ',');
 
   all.clear ();
 
@@ -1190,15 +1194,13 @@ void Task::getDependencies (std::vector <int>& all) const
 ////////////////////////////////////////////////////////////////////////////////
 void Task::getDependencies (std::vector <std::string>& all) const
 {
-  all.clear ();
-  split (all, get ("depends"), ',');
+  all = split (get ("depends"), ',');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Task::getDependencies (std::vector <Task>& all) const
 {
-  std::vector <std::string> deps;
-  split (deps, get ("depends"), ',');
+  std::vector <std::string> deps = split (get ("depends"), ',');
 
   all.clear ();
 
@@ -1214,9 +1216,7 @@ void Task::getDependencies (std::vector <Task>& all) const
 ////////////////////////////////////////////////////////////////////////////////
 int Task::getTagCount () const
 {
-  std::vector <std::string> tags;
-  split (tags, get ("tags"), ',');
-
+  auto tags = split (get ("tags"), ',');
   return (int) tags.size ();
 }
 
@@ -1275,8 +1275,7 @@ bool Task::hasTag (const std::string& tag) const
   }
 
   // Concrete tags.
-  std::vector <std::string> tags;
-  split (tags, get ("tags"), ',');
+  auto tags = split (get ("tags"), ',');
 
   if (std::find (tags.begin (), tags.end (), tag) != tags.end ())
     return true;
@@ -1287,15 +1286,12 @@ bool Task::hasTag (const std::string& tag) const
 ////////////////////////////////////////////////////////////////////////////////
 void Task::addTag (const std::string& tag)
 {
-  std::vector <std::string> tags;
-  split (tags, get ("tags"), ',');
+  auto tags = split (get ("tags"), ',');
 
   if (std::find (tags.begin (), tags.end (), tag) == tags.end ())
   {
     tags.push_back (tag);
-    std::string combined;
-    join (combined, ",", tags);
-    set ("tags", combined);
+    set ("tags", join (",", tags));
 
     recalc_urgency = true;
   }
@@ -1315,22 +1311,19 @@ void Task::addTags (const std::vector <std::string>& tags)
 ////////////////////////////////////////////////////////////////////////////////
 void Task::getTags (std::vector<std::string>& tags) const
 {
-  split (tags, get ("tags"), ',');
+  tags = split (get ("tags"), ',');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Task::removeTag (const std::string& tag)
 {
-  std::vector <std::string> tags;
-  split (tags, get ("tags"), ',');
+  auto tags = split (get ("tags"), ',');
 
   auto i = std::find (tags.begin (), tags.end (), tag);
   if (i != tags.end ())
   {
     tags.erase (i);
-    std::string combined;
-    join (combined, ",", tags);
-    set ("tags", combined);
+    set ("tags", join (",", tags));
   }
 
   recalc_urgency = true;
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 1de474e85..a4a287515 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -34,7 +34,7 @@
 #include <ISO8601.h>
 #include <Lexer.h>
 #include <RX.h>
-#include <text.h>
+#include <shared.h>
 #include <i18n.h>
 
 std::string Variant::dateFormat = "";
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index b0562995f..4c2f9bff1 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -28,6 +28,7 @@
 #include <ViewTask.h>
 #include <numeric>
 #include <Context.h>
+#include <format.h>
 #include <text.h>
 #include <utf8.h>
 #include <i18n.h>
diff --git a/src/ViewText.cpp b/src/ViewText.cpp
index 07502e9ea..c1d8455d8 100644
--- a/src/ViewText.cpp
+++ b/src/ViewText.cpp
@@ -27,6 +27,7 @@
 #include <cmake.h>
 #include <ViewText.h>
 #include <Context.h>
+#include <format.h>
 #include <text.h>
 #include <utf8.h>
 #include <main.h>
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 0d2d27142..ce425776b 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -28,7 +28,8 @@
 #include <ColDepends.h>
 #include <algorithm>
 #include <Context.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <i18n.h>
 #include <main.h>
@@ -91,8 +92,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
       for (auto& i : blocking)
         blocking_ids.push_back (i.id);
 
-      std::string all;
-      join (all, " ", blocking_ids);
+      auto all = join (" ", blocking_ids);
       maximum = all.length ();
 
       unsigned int length;
@@ -134,8 +134,7 @@ void ColumnDepends::render (
         for (const auto& t : blocking)
           blocking_ids.push_back (t.id);
 
-        std::string combined;
-        join (combined, " ", blocking_ids);
+        auto combined = join (" ", blocking_ids);
 
         std::vector <std::string> all;
         wrapText (all, combined, width, _hyphenate);
@@ -150,12 +149,8 @@ void ColumnDepends::render (
 ////////////////////////////////////////////////////////////////////////////////
 void ColumnDepends::modify (Task& task, const std::string& value)
 {
-  // Parse IDs
-  std::vector <std::string> deps;
-  split (deps, value, ',');
-
   // Apply or remove dendencies in turn.
-  for (auto& dep : deps)
+  for (auto& dep : split (value, ','))
   {
     if (dep[0] == '-')
     {
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index ac84b694c..f45358858 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -29,7 +29,8 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <ISO8601.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index de2f41fa3..48e7c016c 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <ColID.h>
 #include <math.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 97ef05143..5f053fa98 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -26,7 +26,7 @@
 
 #include <cmake.h>
 #include <ColIMask.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index a00d7b8a8..08a8e70e5 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -26,7 +26,7 @@
 
 #include <cmake.h>
 #include <ColMask.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 3d1622c0b..38518681f 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -26,7 +26,7 @@
 
 #include <cmake.h>
 #include <ColParent.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index e13162469..069563db8 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -32,7 +32,8 @@
 #include <Lexer.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index cd8cc8327..aa1c85397 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -33,7 +33,8 @@
 #include <Lexer.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <i18n.h>
 
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index ebc0b222e..ef403bd00 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -26,7 +26,7 @@
 
 #include <cmake.h>
 #include <ColStatus.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <utf8.h>
 
diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp
index 581ce491a..5befb51e5 100644
--- a/src/columns/ColString.cpp
+++ b/src/columns/ColString.cpp
@@ -27,6 +27,8 @@
 #include <cmake.h>
 #include <ColString.h>
 #include <Context.h>
+#include <format.h>
+#include <shared.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 6b28b4c4b..c32232030 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -32,7 +32,8 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 #include <utf8.h>
 #include <main.h>
@@ -96,8 +97,7 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
       // Find the widest tag.
       if (tags.find (',') != std::string::npos)
       {
-        std::vector <std::string> all;
-        split (all, tags, ',');
+        auto all = split (tags, ',');
         for (const auto& tag : all)
         {
           auto length = utf8_width (tag);
@@ -132,10 +132,9 @@ void ColumnTags::render (
     {
       if (tags.find (',') != std::string::npos)
       {
-        std::vector <std::string> all;
-        split (all, tags, ',');
+        auto all = split (tags, ',');
         std::sort (all.begin (), all.end ());
-        join (tags, " ", all);
+        tags = join (" ", all);
 
         all.clear ();
         wrapText (all, tags, width, _hyphenate);
@@ -152,8 +151,7 @@ void ColumnTags::render (
     }
     else if (_style == "count")
     {
-      std::vector <std::string> all;
-      split (all, tags, ',');
+      auto all = split (tags, ',');
       renderStringRight (lines, width, color, '[' + format (static_cast <int> (all.size ())) + ']');
     }
   }
@@ -167,10 +165,7 @@ void ColumnTags::modify (Task& task, const std::string& value)
   // TW-1701
   task.set ("tags", "");
 
-  std::vector <std::string> tags;
-  split (tags, value, ',');
-
-  for (auto& tag : tags)
+  for (auto& tag : split (value, ','))
   {
     // If it's a DOM ref, eval it first.
     Lexer lexer (tag);
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 727402d32..c996f3f4f 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -32,7 +32,7 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 344fd130a..b3e433d81 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -31,7 +31,7 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 40925c042..b69147f1f 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -31,7 +31,7 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 3e18f087c..af91ae008 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -31,7 +31,7 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <Dates.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 9a4016219..d2f316a3c 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -28,7 +28,8 @@
 #include <ColUDA.h>
 #include <Context.h>
 #include <ISO8601.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <utf8.h>
 #include <i18n.h>
 #include <stdlib.h>
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 48baf9769..83f1a7dc9 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <ColUUID.h>
 #include <math.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index b2bf3911f..82a6586ca 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -26,7 +26,7 @@
 
 #include <cmake.h>
 #include <ColUrgency.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index c3b1b8e4c..75e4e6bd5 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -51,7 +51,8 @@
 #include <ColUUID.h>
 #include <ColUDA.h>
 #include <ColWait.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
@@ -186,7 +187,7 @@ Column* Column::uda (const std::string& name)
     c->_name = name;
     c->_label = label;
     if (values != "")
-      split (c->_values, values, ',');
+      c->_values = split (values, ',');
     return c;
   }
   else if (type == "numeric")
@@ -195,7 +196,7 @@ Column* Column::uda (const std::string& name)
     c->_name = name;
     c->_label = label;
     if (values != "")
-      split (c->_values, values, ',');
+      c->_values = split (values, ',');
     return c;
   }
   else if (type == "date")
@@ -204,7 +205,7 @@ Column* Column::uda (const std::string& name)
     c->_name = name;
     c->_label = label;
     if (values != "")
-      split (c->_values, values, ',');
+      c->_values = split (values, ',');
     return c;
   }
   else if (type == "duration")
@@ -213,7 +214,7 @@ Column* Column::uda (const std::string& name)
     c->_name = name;
     c->_label = label;
     if (values != "")
-      split (c->_values, values, ',');
+      c->_values = split (values, ',');
     return c;
   }
   else if (type != "")
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index efca8d798..e9dd03792 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -27,9 +27,9 @@
 #include <cmake.h>
 #include <CmdAdd.h>
 #include <Context.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
-#include <util.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 932ee027b..e980b75e6 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -30,8 +30,8 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 5be95aee9..e3fe1a3ec 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -29,8 +29,8 @@
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
-#include <util.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index f71e6e8c2..6bc259051 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -33,8 +33,9 @@
 #include <ViewText.h>
 #include <Lexer.h>
 #include <i18n.h>
+#include <shared.h>
+#include <format.h>
 #include <text.h>
-#include <util.h>
 #include <utf8.h>
 #include <main.h>
 
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 7262c614c..231bf3ab7 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -31,7 +31,8 @@
 #include <Context.h>
 #include <main.h>
 #include <Color.h>
-#include <text.h>
+#include <format.h>
+#include <shared.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 3696bb802..8772a9e85 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -30,6 +30,7 @@
 #include <Context.h>
 #include <ViewText.h>
 #include <Color.h>
+#include <shared.h>
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index f3d808286..bf938e8a9 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -31,8 +31,8 @@
 #include <Context.h>
 #include <JSON.h>
 #include <i18n.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 0767c5e3a..057b8d6f8 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -33,7 +33,8 @@
 #include <sstream>
 #include <algorithm>
 #include <i18n.h>
-#include <util.h>
+#include <format.h>
+#include <shared.h>
 #include <text.h>
 
 extern Context context;
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index a9e5d2043..4f97506d8 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -28,7 +28,7 @@
 #include <CmdCount.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 1c78dd2ca..cc45fff3d 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -36,6 +36,7 @@
 #include <Lexer.h>
 #include <ViewTask.h>
 #include <i18n.h>
+#include <format.h>
 #include <text.h>
 #include <main.h>
 
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 1697483b8..0bfc1c8ae 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <util.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 1f958f8fa..7bd040aa5 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -29,7 +29,8 @@
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 9e0a50fd3..15362bf99 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -34,7 +34,7 @@
 #include <RX.h>
 #include <Context.h>
 #include <i18n.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #ifdef HAVE_COMMIT
 #include <commit.h>
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 253ffb4b4..5ddcfa2f1 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <util.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 350dacabc..ab2189313 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 44c6f6042..a43e99bde 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -39,7 +39,8 @@
 #include <Filter.h>
 #include <Pig.h>
 #include <i18n.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
@@ -230,8 +231,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   std::vector <std::string> tags;
   task.getTags (tags);
-  std::string allTags;
-  join (allTags, " ", tags);
+  auto allTags = join (" ", tags);
 
   if (verbose)
     before << "# " << STRING_EDIT_TAG_SEP << '\n';
@@ -360,8 +360,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
 
   // tags
   value = findValue (after, "\n  Tags:");
-  std::vector <std::string> tags;
-  split (tags, value, ' ');
+  auto tags = split (value, ' ');
   task.remove ("tags");
   task.addTags (tags);
 
@@ -676,8 +675,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
 
   // Dependencies
   value = findValue (after, "\n  Dependencies:");
-  std::vector <std::string> dependencies;
-  split (dependencies, value, ",");
+  auto dependencies = split (value, ',');
 
   task.remove ("depends");
   for (auto& dep : dependencies)
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 363574a66..06a911d41 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -30,7 +30,8 @@
 #include <Context.h>
 #include <DOM.h>
 #include <main.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
@@ -90,7 +91,7 @@ int CmdGet::execute (std::string& output)
   if (results.size () == 0)
     throw std::string (STRING_CMD_GET_NO_DOM);
 
-  join (output, " ", results);
+  output = join (" ", results);
   output += '\n';
   return 0;
 }
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index de0d9af85..e04641b78 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -30,7 +30,8 @@
 #include <ViewText.h>
 #include <Context.h>
 #include <i18n.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 
 extern Context context;
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 5b5569deb..2d7e5b4c7 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -31,6 +31,7 @@
 #include <Filter.h>
 #include <ViewText.h>
 #include <main.h>
+#include <format.h>
 #include <text.h>
 #include <i18n.h>
 #include <ISO8601.h>
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index b8894d204..1b4330aeb 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -31,7 +31,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <shared.h>
 #include <i18n.h>
 
 extern Context context;
@@ -163,8 +163,7 @@ int CmdCompletionIds::execute (std::string& output)
       ids.push_back (task.id);
 
   std::sort (ids.begin (), ids.end ());
-  join (output, "\n", ids);
-  output += '\n';
+  output = join ("\n", ids) + '\n';
 
   context.headers.clear ();
   return 0;
@@ -240,8 +239,7 @@ int CmdUUIDs::execute (std::string& output)
     uuids.push_back (task.get ("uuid"));
 
   std::sort (uuids.begin (), uuids.end ());
-  join (output, " ", uuids);
-  output += '\n';
+  output = join (" ", uuids) + '\n';
 
   context.headers.clear ();
   return 0;
@@ -277,8 +275,7 @@ int CmdCompletionUuids::execute (std::string& output)
     uuids.push_back (task.get ("uuid"));
 
   std::sort (uuids.begin (), uuids.end ());
-  join (output, "\n", uuids);
-  output += '\n';
+  output = join ("\n", uuids) + '\n';
 
   context.headers.clear ();
   return 0;
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index ae893ac51..4ede977c0 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -31,6 +31,7 @@
 #include <sstream>
 #include <Context.h>
 #include <Filter.h>
+#include <format.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 0d8ded1e7..0f6273fb1 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -33,6 +33,8 @@
 #include <Filter.h>
 #include <ISO8601.h>
 #include <main.h>
+#include <shared.h>
+#include <format.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 886507578..fbbc33b67 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <CmdLog.h>
 #include <Context.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <util.h>
 #include <main.h>
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index db203e180..352939479 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index c0ead57f1..87162c33b 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <util.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index b1ecb8a25..8d7defea4 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -31,6 +31,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <ViewText.h>
+#include <format.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index ab6d3b4b7..146754617 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -30,7 +30,7 @@
 #include <Filter.h>
 #include <i18n.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 
 extern Context context;
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 4474f96bd..0fa52cb0c 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -30,6 +30,7 @@
 #include <algorithm>
 #include <Context.h>
 #include <ViewText.h>
+#include <format.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 56d848ac5..296c0be66 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -29,7 +29,7 @@
 #include <vector>
 #include <sstream>
 #include <algorithm>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 #include <main.h>
 #include <Context.h>
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 34f2df484..8da0c3897 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 67d0a8c26..0ef70197c 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -34,6 +34,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
+#include <format.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 40dc5e33a..86d23366e 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 99783e2c5..1e45e6189 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -33,6 +33,7 @@
 #include <Filter.h>
 #include <ViewText.h>
 #include <ISO8601.h>
+#include <format.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 52d425761..28da9c5a8 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -32,7 +32,8 @@
 #include <Context.h>
 #include <Filter.h>
 #include <Color.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
@@ -91,8 +92,7 @@ int CmdSync::execute (std::string& output)
   if (credentials_string == "")
     throw std::string (STRING_CMD_SYNC_BAD_CRED);
 
-  std::vector <std::string> credentials;
-  split (credentials, credentials_string, "/");
+  auto credentials = split (credentials_string, '/');
   if (credentials.size () != 3)
     throw std::string (STRING_CMD_SYNC_BAD_CRED);
 
@@ -198,8 +198,7 @@ int CmdSync::execute (std::string& output)
 
       int download_count = 0;
       payload = response.getPayload ();
-      std::vector <std::string> lines;
-      split (lines, payload, '\n');
+      auto lines = split (payload, '\n');
 
       // Load all tasks, but only if necessary.  There is always a sync key in
       // the payload, so if there are two or more lines, then we have merging
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 95eedbb9a..5f75b85b3 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -32,6 +32,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <ViewText.h>
+#include <format.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 15d25ba55..65c1f6055 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -34,7 +34,7 @@
 #include <ISO8601.h>
 #include <main.h>
 #include <i18n.h>
-#include <text.h>
+#include <format.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index d2c20d8eb..00091d904 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -32,6 +32,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
+#include <format.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 8b28f9020..dbb3cadc2 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -32,7 +32,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 4d45a65bf..caa3587a6 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -32,7 +32,7 @@
 #include <Filter.h>
 #include <Lexer.h>
 #include <main.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index ce1432fb2..b8ec3c52d 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -33,7 +33,7 @@
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 86a276f83..b726e6eb8 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -28,7 +28,8 @@
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <Command.h>
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 2f7a38db2..b8e912579 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -30,7 +30,7 @@
 #include <sstream>
 #include <stack>
 #include <Context.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/feedback.cpp b/src/feedback.cpp
index c5c88b86a..3a96f473d 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -36,8 +36,8 @@
 #include <ISO8601.h>
 #include <Lexer.h>
 #include <main.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
@@ -52,10 +52,7 @@ std::string taskIdentifiers (const std::vector <Task>& tasks)
   for (auto task: tasks)
     identifiers.push_back (task.identifier (true));
 
-  std::string result;
-  join (result, ", ", identifiers);
-
-  return result;
+  return join (", ", identifiers);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/legacy.cpp b/src/legacy.cpp
index be4039cf0..48beb99dd 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -28,7 +28,7 @@
 #include <cstddef>
 #include <sstream>
 #include <Context.h>
-#include <text.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/main.h b/src/main.h
index ad1c60e88..1fd8dd628 100644
--- a/src/main.h
+++ b/src/main.h
@@ -83,21 +83,5 @@ std::string legacyCheckForDeprecatedVariables ();
 std::string legacyCheckForDeprecatedColumns ();
 void legacyAttributeMap (std::string&);
 
-// list template
-///////////////////////////////////////////////////////////////////////////////
-template <class T> void listDiff (
-  const T& left, const T& right, T& leftOnly, T& rightOnly)
-{
-  leftOnly.clear ();
-  for (auto& l : left)
-    if (std::find (right.begin (), right.end (), l) == right.end ())
-      leftOnly.push_back (l);
-
-  rightOnly.clear ();
-  for (auto& r : right)
-    if (std::find (left.begin (), left.end (), r) == left.end ())
-      rightOnly.push_back (r);
-}
-
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/recur.cpp b/src/recur.cpp
index 6ee2179fc..9a09f9a12 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -40,7 +40,7 @@
 #include <Context.h>
 #include <Lexer.h>
 #include <ISO8601.h>
-#include <text.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/rules.cpp b/src/rules.cpp
index 16b19eb18..0bb86a161 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -29,7 +29,7 @@
 #include <Context.h>
 #include <ISO8601.h>
 #include <text.h>
-#include <util.h>
+#include <shared.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/sort.cpp b/src/sort.cpp
index 58c3e5cc9..055fc6f66 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -32,7 +32,8 @@
 #include <Context.h>
 #include <ISO8601.h>
 #include <Task.h>
-#include <text.h>
+#include <shared.h>
+#include <format.h>
 #include <i18n.h>
 
 extern Context context;
@@ -52,8 +53,7 @@ void sort_tasks (
   global_data = &data;
 
   // Split the key defs.
-  global_keys.clear ();
-  split (global_keys, keys, ',');
+  global_keys = split (keys, ',');
 
   // Only sort if necessary.
   if (order.size ())
diff --git a/src/text.cpp b/src/text.cpp
index 707889ad9..c4b53fa22 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -170,33 +170,6 @@ std::string unquoteText (const std::string& input)
   return output;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-int longestWord (const std::string& input)
-{
-  int longest = 0;
-  int length = 0;
-  std::string::size_type i = 0;
-  int character;
-
-  while ((character = utf8_next_char (input, i)))
-  {
-    if (character == ' ')
-    {
-      if (length > longest)
-        longest = length;
-
-      length = 0;
-    }
-    else
-      length += mk_wcwidth (character);
-  }
-
-  if (length > longest)
-    longest = length;
-
-  return longest;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 int longestLine (const std::string& input)
 {
@@ -312,32 +285,6 @@ bool extractLine (
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-const std::string str_replace (
-  std::string &str,
-  const std::string& search,
-  const std::string& replacement)
-{
-  std::string::size_type pos = 0;
-  while ((pos = str.find (search, pos)) != std::string::npos)
-  {
-    str.replace (pos, search.length (), replacement);
-    pos += replacement.length ();
-  }
-
-  return str;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string str_replace (
-  const std::string& str,
-  const std::string& search,
-  const std::string& replacement)
-{
-  std::string modified = str;
-  return str_replace (modified, search, replacement);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 const char* optionalBlankLine ()
 {
@@ -356,127 +303,6 @@ bool nontrivial (const std::string& input)
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-bool compare (
-  const std::string& left,
-  const std::string& right,
-  bool sensitive /*= true*/)
-{
-  // Use strcasecmp if required.
-  if (!sensitive)
-    return strcasecmp (left.c_str (), right.c_str ()) == 0 ? true : false;
-
-  // Otherwise, just use std::string::operator==.
-  return left == right;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool closeEnough (
-  const std::string& reference,
-  const std::string& attempt,
-  unsigned int minLength /* = 0 */)
-{
-  // An exact match is accepted first.
-  if (compare (reference, attempt, false))
-    return true;
-
-  // A partial match will suffice.
-  if (attempt.length () < reference.length () &&
-      attempt.length () >= minLength)
-    return compare (reference.substr (0, attempt.length ()), attempt, false);
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string::size_type find (
-  const std::string& text,
-  const std::string& pattern,
-  bool sensitive /*= true*/)
-{
-  // Implement a sensitive find, which is really just a loop withing a loop,
-  // comparing lower-case versions of each character in turn.
-  if (!sensitive)
-  {
-    // Handle empty pattern.
-    const char* p = pattern.c_str ();
-    size_t len = pattern.length ();
-    if (len == 0)
-      return 0;
-
-    // Evaluate these once, for performance reasons.
-    const char* t = text.c_str ();
-    const char* start = t;
-    const char* end = start + text.size ();
-
-    for (; t <= end - len; ++t)
-    {
-      int diff = 0;
-      for (size_t i = 0; i < len; ++i)
-        if ((diff = tolower (t[i]) - tolower (p[i])))
-          break;
-
-      // diff == 0 means there was no break from the loop, which only occurs
-      // when a difference is detected.  Therefore, the loop terminated, and
-      // diff is zero.
-      if (diff == 0)
-        return t - start;
-    }
-
-    return std::string::npos;
-  }
-
-  // Otherwise, just use std::string::find.
-  return text.find (pattern);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string::size_type find (
-  const std::string& text,
-  const std::string& pattern,
-  std::string::size_type begin,
-  bool sensitive /*= true*/)
-{
-  // Implement a sensitive find, which is really just a loop withing a loop,
-  // comparing lower-case versions of each character in turn.
-  if (!sensitive)
-  {
-    // Handle empty pattern.
-    const char* p = pattern.c_str ();
-    size_t len = pattern.length ();
-    if (len == 0)
-      return 0;
-
-    // Handle bad begin.
-    if (begin >= text.length ())
-      return std::string::npos;
-
-    // Evaluate these once, for performance reasons.
-    const char* start = text.c_str ();
-    const char* t = start + begin;
-    const char* end = start + text.size ();
-
-    for (; t <= end - len; ++t)
-    {
-      int diff = 0;
-      for (size_t i = 0; i < len; ++i)
-        if ((diff = tolower (t[i]) - tolower (p[i])))
-          break;
-
-      // diff == 0 means there was no break from the loop, which only occurs
-      // when a difference is detected.  Therefore, the loop terminated, and
-      // diff is zero.
-      if (diff == 0)
-        return t - start;
-    }
-
-    return std::string::npos;
-  }
-
-  // Otherwise, just use std::string::find.
-  return text.find (pattern, begin);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Return the length, in characters, of the input, subtracting color control
 // codes.
@@ -536,74 +362,6 @@ const std::string obfuscateText (const std::string& input)
   return output.str ();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-const std::string format (std::string& value)
-{
-  return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string format (const char* value)
-{
-  std::string s (value);
-  return s;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string formatHex (int value)
-{
-  std::stringstream s;
-  s.setf (std::ios::hex, std::ios::basefield);
-  s << value;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string format (float value, int width, int precision)
-{
-  std::stringstream s;
-  s.width (width);
-  s.precision (precision);
-  if (0 < value && value < 1)
-  {
-    // For value close to zero, width - 2 (2 accounts for the first zero and
-    // the dot) is the number of digits after zero that are significant
-    double factor = 1;
-    for (int i = 2; i < width; i++)
-      factor *= 10;
-    value = roundf (value * factor) / factor;
-  }
-  s << value;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string format (double value, int width, int precision)
-{
-  std::stringstream s;
-  s.width (width);
-  s.precision (precision);
-  if (0 < value && value < 1)
-  {
-    // For value close to zero, width - 2 (2 accounts for the first zero and
-    // the dot) is the number of digits after zero that are significant
-    double factor = 1;
-    for (int i = 2; i < width; i++)
-      factor *= 10;
-    value = round (value * factor) / factor;
-  }
-  s << value;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string format (double value)
-{
-  std::stringstream s;
-  s << std::fixed << value;
-  return s.str ();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 void replace_positional (
   std::string& fmt,
diff --git a/src/text.h b/src/text.h
index e2e858faa..26d6b23d6 100644
--- a/src/text.h
+++ b/src/text.h
@@ -35,7 +35,6 @@
 // text.cpp, Non-UTF-8 aware.
 void wrapText (std::vector <std::string>&, const std::string&, const int, bool);
 std::string unquoteText (const std::string&);
-int longestWord (const std::string&);
 int longestLine (const std::string&);
 bool extractLine (std::string&, const std::string&, int, bool, unsigned int&);
 void split (std::set<std::string>&, const std::string&, const char);
@@ -43,53 +42,12 @@ void split (std::vector<std::string>&, const std::string&, const char);
 void split (std::vector<std::string>&, const std::string&, const std::string&);
 void join (std::string&, const std::string&, const std::vector<std::string>&);
 void join (std::string&, const std::string&, const std::vector<int>&);
-const std::string str_replace (std::string&, const std::string&, const std::string&);
-const std::string str_replace (const std::string&, const std::string&, const std::string&);
 const char* optionalBlankLine ();
 bool nontrivial (const std::string&);
-bool compare (const std::string&, const std::string&, bool sensitive = true);
-bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0);
-std::string::size_type find (const std::string&, const std::string&, bool sensitive = true);
-std::string::size_type find (const std::string&, const std::string&, std::string::size_type, bool sensitive = true);
 int strippedLength (const std::string&);
 const std::string obfuscateText (const std::string&);
-const std::string format (std::string&);
-const std::string format (const char*);
-const std::string formatHex (int);
-const std::string format (float, int, int);
-const std::string format (double, int, int);
-const std::string format (double);
 void replace_positional (std::string&, const std::string&, const std::string&);
 
-template<typename T>
-const std::string format (T value)
-{
-    std::stringstream s;
-    s << value;
-    return s.str ();
-}
-
-template<typename T>
-const std::string format (int fmt_num, const std::string& fmt, T arg)
-{
-    std::string output = fmt;
-    replace_positional (output, '{' + format (fmt_num) + '}', format (arg));
-    return output;
-}
-
-template<typename T, typename... Args>
-const std::string format (int fmt_num, const std::string& fmt, T arg, Args... args)
-{
-    const std::string fmt_replaced (format (fmt_num, fmt, arg));
-    return format (fmt_num+1, fmt_replaced, args...);
-}
-
-template<typename... Args>
-const std::string format (const std::string& fmt, Args... args)
-{
-    return format (1, fmt, args...);
-}
-
 std::string leftJustify (const int, const int);
 std::string leftJustify (const std::string&, const int);
 std::string rightJustifyZero (const int, const int);
diff --git a/src/util.cpp b/src/util.cpp
index f4eeb1565..fd37193d3 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <util.h>
+#include <shared.h>
 // If <iostream> is included, put it after <stdio.h>, because it includes
 // <stdio.h>, and therefore would ignore the _WITH_GETLINE.
 #ifdef FREEBSD
@@ -163,41 +163,6 @@ std::string formatBytes (size_t bytes)
   return Lexer::commify (formatted);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-int autoComplete (
-  const std::string& partial,
-  const std::vector<std::string>& list,
-  std::vector<std::string>& matches,
-  int minimum/* = 1*/)
-{
-  matches.clear ();
-
-  // Handle trivial case.
-  unsigned int length = partial.length ();
-  if (length)
-  {
-    for (auto& item : list)
-    {
-      // An exact match is a special case.  Assume there is only one exact match
-      // and return immediately.
-      if (partial == item)
-      {
-        matches.clear ();
-        matches.push_back (item);
-        return 1;
-      }
-
-      // Maintain a list of partial matches.
-      else if (length >= (unsigned) minimum &&
-               length <= item.length ()    &&
-               partial == item.substr (0, length))
-        matches.push_back (item);
-    }
-  }
-
-  return matches.size ();
-}
-
 // Handle the generation of UUIDs on FreeBSD in a separate implementation
 // of the uuid () function, since the API is quite different from Linux's.
 // Also, uuid_unparse_lower is not needed on FreeBSD, because the string
diff --git a/src/util.h b/src/util.h
index 078fadbe6..a53e6e49b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -43,7 +43,6 @@
 bool confirm (const std::string&);
 int confirm4 (const std::string&);
 std::string formatBytes (size_t);
-int autoComplete (const std::string&, const std::vector<std::string>&, std::vector<std::string>&, int minimum = 1);
 
 #ifndef HAVE_UUID_UNPARSE_LOWER
 void uuid_unparse_lower (uuid_t uu, char *out);

From 060787a5db9112902204d5edc95b40f11ab66384 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:23:25 -0500
Subject: [PATCH 141/879] calc: Migration to libshared

---
 src/calc.cpp                 |  3 +-
 src/commands/CmdBurndown.cpp |  7 ++---
 src/text.cpp                 | 56 ------------------------------------
 src/text.h                   |  6 ----
 4 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index cf50b8695..55a7e4065 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -32,7 +32,8 @@
 #include <Eval.h>
 #include <Dates.h>
 #include <Context.h>
-#include <text.h>
+#include <Task.h>
+#include <format.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 5be688997..ad43dd664 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -37,8 +37,8 @@
 #include <ISO8601.h>
 #include <main.h>
 #include <i18n.h>
-#include <text.h>
-#include <util.h>
+#include <shared.h>
+#include <format.h>
 
 extern Context context;
 
@@ -212,8 +212,7 @@ Chart::Chart (char type)
 
   // Set the title.
   std::vector <std::string> words = context.cli2.getWords ();
-  std::string filter;
-  join (filter, " ", words);
+  auto filter = join (" ", words);
   _title = '(' + filter + ')';
 }
 
diff --git a/src/text.cpp b/src/text.cpp
index c4b53fa22..0c859aeab 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -377,59 +377,3 @@ void replace_positional (
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string leftJustify (const int input, const int width)
-{
-  std::stringstream s;
-  s << input;
-  std::string output = s.str ();
-  return output + std::string (width - output.length (), ' ');
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string leftJustify (const std::string& input, const int width)
-{
-  auto len = static_cast <int> (utf8_text_width (input));
-
-  if (len == width)
-    return input;
-
-  if (len > width)
-    return input.substr (0, width);
-
-  return input + std::string (width - utf8_text_width (input), ' ');
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string rightJustifyZero (const int input, const int width)
-{
-  std::stringstream s;
-  s << std::setw (width) << std::setfill ('0') << input;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string rightJustify (const int input, const int width)
-{
-  std::stringstream s;
-  s << std::setw (width) << std::setfill (' ') << input;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string rightJustify (const std::string& input, const int width)
-{
-  auto len = static_cast <int> (utf8_text_width (input));
-
-  if (len == width)
-    return input;
-
-  if (len > width)
-    return input.substr (0, width);
-
-  return ((width > len)
-           ? std::string (width - len, ' ')
-           : "")
-         + input;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/text.h b/src/text.h
index 26d6b23d6..dcefa7189 100644
--- a/src/text.h
+++ b/src/text.h
@@ -48,11 +48,5 @@ int strippedLength (const std::string&);
 const std::string obfuscateText (const std::string&);
 void replace_positional (std::string&, const std::string&, const std::string&);
 
-std::string leftJustify (const int, const int);
-std::string leftJustify (const std::string&, const int);
-std::string rightJustifyZero (const int, const int);
-std::string rightJustify (const int, const int);
-std::string rightJustify (const std::string&, const int);
-
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From 488673ea9ad8d47b38ccb5d6c698d77e0cc22508 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:25:41 -0500
Subject: [PATCH 142/879] text: Removed replace_positional

---
 src/text.cpp | 14 --------------
 src/text.h   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/text.cpp b/src/text.cpp
index 0c859aeab..ccd151410 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -363,17 +363,3 @@ const std::string obfuscateText (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void replace_positional (
-  std::string& fmt,
-  const std::string& from,
-  const std::string& to)
-{
-  std::string::size_type pos = 0;
-  while ((pos = fmt.find (from, pos)) != std::string::npos)
-  {
-    fmt.replace (pos, from.length (), to);
-    pos += to.length ();
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/text.h b/src/text.h
index dcefa7189..b1dfef035 100644
--- a/src/text.h
+++ b/src/text.h
@@ -46,7 +46,6 @@ const char* optionalBlankLine ();
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
 const std::string obfuscateText (const std::string&);
-void replace_positional (std::string&, const std::string&, const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From 4bbb5fadb3178ee7e44dd66bfda75e20c25d3b8d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:26:06 -0500
Subject: [PATCH 143/879] util: Removed formatBytes

---
 src/util.cpp | 14 --------------
 src/util.h   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index fd37193d3..e6639ee2e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -149,20 +149,6 @@ int confirm4 (const std::string& question)
   return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Convert a quantity in seconds to a more readable format.
-std::string formatBytes (size_t bytes)
-{
-  char formatted[24];
-
-       if (bytes >=  995000000) snprintf (formatted, 24, "%.1f %s", (bytes / 1000000000.0), STRING_UTIL_GIBIBYTES);
-  else if (bytes >=     995000) snprintf (formatted, 24, "%.1f %s", (bytes /    1000000.0), STRING_UTIL_MEBIBYTES);
-  else if (bytes >=        995) snprintf (formatted, 24, "%.1f %s", (bytes /       1000.0), STRING_UTIL_KIBIBYTES);
-  else                          snprintf (formatted, 24, "%d %s",   (int)bytes,             STRING_UTIL_BYTES);
-
-  return Lexer::commify (formatted);
-}
-
 // Handle the generation of UUIDs on FreeBSD in a separate implementation
 // of the uuid () function, since the API is quite different from Linux's.
 // Also, uuid_unparse_lower is not needed on FreeBSD, because the string
diff --git a/src/util.h b/src/util.h
index a53e6e49b..d3fb12047 100644
--- a/src/util.h
+++ b/src/util.h
@@ -42,7 +42,6 @@
 // util.cpp
 bool confirm (const std::string&);
 int confirm4 (const std::string&);
-std::string formatBytes (size_t);
 
 #ifndef HAVE_UUID_UNPARSE_LOWER
 void uuid_unparse_lower (uuid_t uu, char *out);

From f99fc16e14316e699b830cea95966798c3aab76c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:28:50 -0500
Subject: [PATCH 144/879] util: Removed execute

---
 src/util.cpp | 149 ---------------------------------------------------
 src/util.h   |   2 -
 2 files changed, 151 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index e6639ee2e..2ba0ffd27 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -197,155 +197,6 @@ const std::string uuid ()
 }
 #endif
 
-////////////////////////////////////////////////////////////////////////////////
-// Run a binary with args, capturing output.
-int execute (
-  const std::string& executable,
-  const std::vector <std::string>& args,
-  const std::string& input,
-  std::string& output)
-{
-  pid_t pid;
-  int pin[2], pout[2];
-  fd_set rfds, wfds;
-  struct timeval tv;
-  int select_retval, read_retval, write_retval;
-  char buf[16384];
-  unsigned int written;
-  const char* input_cstr = input.c_str ();
-
-  if (signal (SIGPIPE, SIG_IGN) == SIG_ERR) // Handled locally with EPIPE.
-    throw std::string (std::strerror (errno));
-
-  if (pipe (pin) == -1)
-    throw std::string (std::strerror (errno));
-
-  if (pipe (pout) == -1)
-    throw std::string (std::strerror (errno));
-
-  if ((pid = fork ()) == -1)
-    throw std::string (std::strerror (errno));
-
-  if (pid == 0)
-  {
-    // This is only reached in the child
-    close (pin[1]);   // Close the write end of the input pipe.
-    close (pout[0]);  // Close the read end of the output pipe.
-
-    // Parent writes to pin[1]. Set read end pin[0] as STDIN for child.
-    if (dup2 (pin[0], STDIN_FILENO) == -1)
-      throw std::string (std::strerror (errno));
-    close (pin[0]);
-
-    // Parent reads from pout[0]. Set write end pout[1] as STDOUT for child.
-    if (dup2 (pout[1], STDOUT_FILENO) == -1)
-      throw std::string (std::strerror (errno));
-    close (pout[1]);
-
-    // Add executable as argv[0] and NULL-terminate the array for execvp().
-    char** argv = new char* [args.size () + 2];
-    argv[0] = (char*) executable.c_str ();
-    for (unsigned int i = 0; i < args.size (); ++i)
-      argv[i+1] = (char*) args[i].c_str ();
-
-    argv[args.size () + 1] = NULL;
-    _exit (execvp (executable.c_str (), argv));
-  }
-
-  // This is only reached in the parent
-  close (pin[0]);   // Close the read end of the input pipe.
-  close (pout[1]);  // Close the write end of the output pipe.
-
-  if (input.size () == 0)
-  {
-    // Nothing to send to the child, close the pipe early.
-    close (pin[1]);
-  }
-
-  output = "";
-  read_retval = -1;
-  written = 0;
-  while (read_retval != 0 || input.size () != written)
-  {
-    FD_ZERO (&rfds);
-    if (read_retval != 0)
-      FD_SET (pout[0], &rfds);
-
-    FD_ZERO (&wfds);
-    if (input.size () != written)
-      FD_SET (pin[1], &wfds);
-
-    // On Linux, tv may be overwritten by select().  Reset it each time.
-    // NOTE: Timeout chosen arbitrarily - we don't time out execute() calls.
-    // select() is run over and over again unless the child exits or closes
-    // its pipes.
-    tv.tv_sec = 5;
-    tv.tv_usec = 0;
-
-    select_retval = select (std::max (pout[0], pin[1]) + 1, &rfds, &wfds, NULL, &tv);
-
-    if (select_retval == -1)
-      throw std::string (std::strerror (errno));
-
-    // Write data to child's STDIN
-    if (FD_ISSET (pin[1], &wfds))
-    {
-      write_retval = write (pin[1], input_cstr + written, input.size () - written);
-      if (write_retval == -1)
-      {
-        if (errno == EPIPE)
-        {
-          // Child died (or closed the pipe) before reading all input.
-          // We don't really care; pretend we wrote it all.
-          write_retval = input.size () - written;
-        }
-        else
-        {
-          throw std::string (std::strerror (errno));
-        }
-      }
-      written += write_retval;
-
-      if (written == input.size ())
-      {
-        // Let the child know that no more input is coming by closing the pipe.
-        close (pin[1]);
-      }
-    }
-
-    // Read data from child's STDOUT
-    if (FD_ISSET (pout[0], &rfds))
-    {
-      read_retval = read (pout[0], &buf, sizeof (buf) - 1);
-      if (read_retval == -1)
-        throw std::string (std::strerror (errno));
-
-      buf[read_retval] = '\0';
-      output += buf;
-    }
-  }
-
-  close (pout[0]);  // Close the read end of the output pipe.
-
-  int status = -1;
-  if (wait (&status) == -1)
-    throw std::string (std::strerror (errno));
-
-  if (WIFEXITED (status))
-  {
-    status = WEXITSTATUS (status);
-  }
-  else
-  {
-    throw std::string ("Error: Could not get Hook exit status!");
-  }
-
-  if (signal (SIGPIPE, SIG_DFL) == SIG_ERR)  // We're done, return to default.
-    throw std::string (std::strerror (errno));
-
-  return status;
-}
-
 // Collides with std::numeric_limits methods
 #undef max
 
diff --git a/src/util.h b/src/util.h
index d3fb12047..cc500723c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -48,8 +48,6 @@ void uuid_unparse_lower (uuid_t uu, char *out);
 #endif
 const std::string uuid ();
 
-int execute (const std::string&, const std::vector <std::string>&, const std::string&, std::string&);
-
 const std::string indentProject (
   const std::string&,
   const std::string& whitespace = "  ",

From db0f8d33e16f5a8630a220a5e19c583b89793b4c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 6 Dec 2016 07:32:19 -0500
Subject: [PATCH 145/879] util: Removed confirm

---
 src/commands/CmdDelete.cpp  |  2 +-
 src/commands/CmdModify.cpp  |  2 +-
 src/commands/CmdPrepend.cpp |  2 +-
 src/commands/CmdPurge.cpp   |  2 +-
 src/util.cpp                | 31 -------------------------------
 src/util.h                  |  1 -
 6 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 0bfc1c8ae..d2af38623 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
-#include <util.h>
+#include <shared.h>
 #include <format.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 352939479..e65b200bb 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -31,7 +31,7 @@
 #include <Filter.h>
 #include <main.h>
 #include <format.h>
-#include <util.h>
+#include <shared.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 87162c33b..835899da6 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
-#include <util.h>
+#include <shared.h>
 #include <format.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 146754617..4a38c2b69 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -31,7 +31,7 @@
 #include <i18n.h>
 #include <main.h>
 #include <format.h>
-#include <util.h>
+#include <shared.h>
 
 extern Context context;
 
diff --git a/src/util.cpp b/src/util.cpp
index 2ba0ffd27..50fc940cd 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -69,37 +69,6 @@ static void signal_handler (int s)
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Uses std::getline, because std::cin eats leading whitespace, and that means
-// that if a newline is entered, std::cin eats it and never returns from the
-// "std::cin >> answer;" line, but it does display the newline.  This way, with
-// std::getline, the newline can be detected, and the prompt re-written.
-bool confirm (const std::string& question)
-{
-  std::vector <std::string> options {STRING_UTIL_CONFIRM_YES,
-                                     STRING_UTIL_CONFIRM_NO};
-  std::vector <std::string> matches;
-
-  signal (SIGINT, signal_handler);
-
-  do
-  {
-    std::cout << question
-              << STRING_UTIL_CONFIRM_YN;
-
-    std::string answer {""};
-    std::getline (std::cin, answer);
-    context.debug ("STDIN '" + answer + '\'');
-    answer = std::cin.eof () ? STRING_UTIL_CONFIRM_NO : Lexer::lowerCase (Lexer::trim (answer));
-
-    autoComplete (answer, options, matches, 1); // Hard-coded 1.
-  }
-  while (! std::cin.eof () && matches.size () != 1);
-
-  signal (SIGINT, SIG_DFL);
-  return matches.size () == 1 && matches[0] == STRING_UTIL_CONFIRM_YES ? true : false;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // 0 = no
 // 1 = yes
diff --git a/src/util.h b/src/util.h
index cc500723c..404c0a1b9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -40,7 +40,6 @@
 #include <Task.h>
 
 // util.cpp
-bool confirm (const std::string&);
 int confirm4 (const std::string&);
 
 #ifndef HAVE_UUID_UNPARSE_LOWER

From 232d266fb519e38010fd276cd34ce5eed7ff9597 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Dec 2016 01:14:16 -0500
Subject: [PATCH 146/879] text: Removed local join/split implementation

---
 src/Config.cpp             |   5 +-
 src/Msg.cpp                |   6 +-
 src/commands/CmdCustom.cpp |  10 +-
 src/commands/CmdExec.cpp   |   6 +-
 src/commands/CmdImport.cpp |   6 +-
 src/commands/CmdInfo.cpp   |   3 +-
 src/commands/CmdUDAs.cpp   |   4 +-
 src/dependency.cpp         |   2 +-
 src/rules.cpp              |   3 +-
 src/text.cpp               | 241 +------------------------------------
 src/text.h                 |   9 --
 11 files changed, 18 insertions(+), 277 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 681a101ce..794dd5b16 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -40,7 +40,7 @@
 #include <Timer.h>
 #include <JSON.h>
 #include <Lexer.h>
-#include <text.h>
+#include <shared.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -437,8 +437,7 @@ void Config::parse (const std::string& input, int nest /* = 1 */)
     return;
 
   // Split the input into lines.
-  std::vector <std::string> lines;
-  split (lines, input, "\n");
+  auto lines = split (input, '\n');
 
   // Parse each line.
   for (auto& line : lines)
diff --git a/src/Msg.cpp b/src/Msg.cpp
index bed357e11..86efa0930 100644
--- a/src/Msg.cpp
+++ b/src/Msg.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <Msg.h>
 #include <Lexer.h>
-#include <text.h>
+#include <shared.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 void Msg::set (const std::string& name, const std::string& value)
@@ -89,9 +89,7 @@ bool Msg::parse (const std::string& input)
     throw std::string ("ERROR: Malformed message");
 
   // Parse header.
-  std::vector <std::string> lines;
-  split (lines, input.substr (0, separator), '\n');
-  for (auto& i : lines)
+  for (auto& i : split (input.substr (0, separator), '\n'))
   {
     auto delimiter = i.find (':');
     if (delimiter == std::string::npos)
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index cc45fff3d..27a8eeb11 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -37,6 +37,7 @@
 #include <ViewTask.h>
 #include <i18n.h>
 #include <format.h>
+#include <shared.h>
 #include <text.h>
 #include <main.h>
 
@@ -72,18 +73,15 @@ int CmdCustom::execute (std::string& output)
   std::string reportSort    = context.config.get ("report." + _keyword + ".sort");
   std::string reportFilter  = context.config.get ("report." + _keyword + ".filter");
 
-  std::vector <std::string> columns;
-  split (columns, reportColumns, ',');
+  auto columns = split (reportColumns, ',');
   validateReportColumns (columns);
 
-  std::vector <std::string> labels;
-  split (labels, reportLabels, ',');
+  auto labels = split (reportLabels, ',');
 
   if (columns.size () != labels.size () && labels.size () != 0)
     throw format (STRING_CMD_CUSTOM_MISMATCH, _keyword);
 
-  std::vector <std::string> sortOrder;
-  split (sortOrder, reportSort, ',');
+  auto sortOrder = split (reportSort, ',');
   if (sortOrder.size () != 0 &&
       sortOrder[0] != "none")
     validateSortColumns (sortOrder);
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 2bfefebf7..d06f8b03e 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <i18n.h>
-#include <text.h>
+#include <shared.h>
 
 extern Context context;
 
@@ -52,9 +52,7 @@ CmdExec::CmdExec ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdExec::execute (std::string&)
 {
-  std::string command_line;
-  join (command_line, " ", context.cli2.getWords ());
-  return system (command_line.c_str ());
+  return system (join (" ", context.cli2.getWords ()).c_str ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 4ede977c0..657a438ff 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -32,6 +32,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <format.h>
+#include <shared.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
@@ -147,10 +148,7 @@ int CmdImport::import (const std::string& input)
   //   { ... }
   catch (std::string& e)
   {
-    std::vector <std::string> lines;
-    split (lines, input, '\n');
-
-    for (auto& line : lines)
+    for (auto& line : split (input, '\n'))
     {
       if (line.length ())
       {
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 0f6273fb1..4134413ae 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -299,8 +299,7 @@ int CmdInfo::execute (std::string& output)
     task.getTags (tags);
     if (tags.size ())
     {
-      std::string allTags;
-      join (allTags, " ", tags);
+      auto allTags = join (" ", tags);
 
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_TAGS);
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 00091d904..685adeefd 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -33,6 +33,7 @@
 #include <Filter.h>
 #include <main.h>
 #include <format.h>
+#include <shared.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
@@ -215,8 +216,7 @@ int CmdCompletionUDAs::execute (std::string& output)
   if (udas.size ())
   {
     std::sort (udas.begin (), udas.end ());
-    join (output, "\n", udas);
-    output += '\n';
+    output = join ("\n", udas) + '\n';
   }
 
   return 0;
diff --git a/src/dependency.cpp b/src/dependency.cpp
index b8e912579..de4f6ee94 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -31,7 +31,7 @@
 #include <stack>
 #include <Context.h>
 #include <format.h>
-#include <util.h>
+#include <shared.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/rules.cpp b/src/rules.cpp
index 0bb86a161..c9715030e 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -67,8 +67,7 @@ void initializeColorRules ()
     // Load the rule.precedence.color list, split it, then autocomplete against
     // the 'rules' vector loaded above.
     std::vector <std::string> results;
-    std::vector <std::string> precedence;
-    split (precedence, context.config.get ("rule.precedence.color"), ',');
+    auto precedence = split (context.config.get ("rule.precedence.color"), ',');
 
     for (const auto& p : precedence)
     {
diff --git a/src/text.cpp b/src/text.cpp
index ccd151410..1709e6a84 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -36,6 +36,7 @@
 #include <Lexer.h>
 #include <math.h>
 #include <util.h>
+#include <shared.h>
 #include <text.h>
 #include <utf8.h>
 #include <i18n.h>
@@ -45,246 +46,6 @@ extern Context context;
 static const char* newline = "\n";
 static const char* noline  = "";
 
-///////////////////////////////////////////////////////////////////////////////
-void wrapText (
-  std::vector <std::string>& lines,
-  const std::string& text,
-  const int width,
-  bool hyphenate)
-{
-  std::string line;
-  unsigned int offset = 0;
-  while (extractLine (line, text, width, hyphenate, offset))
-    lines.push_back (line);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void split (
-  std::set<std::string>& results,
-  const std::string& input,
-  const char delimiter)
-{
-  results.clear ();
-  std::string::size_type start = 0;
-  std::string::size_type i;
-  while ((i = input.find (delimiter, start)) != std::string::npos)
-  {
-    results.insert (input.substr (start, i - start));
-    start = i + 1;
-  }
-
-  if (input.length ())
-    results.insert (input.substr (start));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void split (
-  std::vector<std::string>& results,
-  const std::string& input,
-  const char delimiter)
-{
-  results.clear ();
-  std::string::size_type start = 0;
-  std::string::size_type i;
-  while ((i = input.find (delimiter, start)) != std::string::npos)
-  {
-    results.push_back (input.substr (start, i - start));
-    start = i + 1;
-  }
-
-  if (input.length ())
-    results.push_back (input.substr (start));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void split (
-  std::vector<std::string>& results,
-  const std::string& input,
-  const std::string& delimiter)
-{
-  results.clear ();
-  std::string::size_type length = delimiter.length ();
-
-  std::string::size_type start = 0;
-  std::string::size_type i;
-  while ((i = input.find (delimiter, start)) != std::string::npos)
-  {
-    results.push_back (input.substr (start, i - start));
-    start = i + length;
-  }
-
-  if (input.length ())
-    results.push_back (input.substr (start));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void join (
-  std::string& result,
-  const std::string& separator,
-  const std::vector<std::string>& items)
-{
-  std::stringstream s;
-  unsigned int size = items.size ();
-  for (unsigned int i = 0; i < size; ++i)
-  {
-    s << items[i];
-    if (i < size - 1)
-      s << separator;
-  }
-
-  result = s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void join (
-  std::string& result,
-  const std::string& separator,
-  const std::vector<int>& items)
-{
-  std::stringstream s;
-  unsigned int size = items.size ();
-  for (unsigned int i = 0; i < size; ++i)
-  {
-    s << items[i];
-    if (i < size - 1)
-      s << separator;
-  }
-
-  result = s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Remove enclosing balanced quotes.  Assumes trimmed text.
-std::string unquoteText (const std::string& input)
-{
-  std::string output = input;
-
-  if (output.length () > 1)
-  {
-    char quote = output[0];
-    if ((quote == '\'' || quote == '"') &&
-        output[output.length () - 1] == quote)
-      return output.substr (1, output.length () - 2);
-  }
-
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int longestLine (const std::string& input)
-{
-  int longest = 0;
-  int length = 0;
-  std::string::size_type i = 0;
-  int character;
-
-  while ((character = utf8_next_char (input, i)))
-  {
-    if (character == '\n')
-    {
-      if (length > longest)
-        longest = length;
-
-      length = 0;
-    }
-    else
-      length += mk_wcwidth (character);
-  }
-
-  if (length > longest)
-    longest = length;
-
-  return longest;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Break UTF8 text into chunks no more than width characters.
-bool extractLine (
-  std::string& line,
-  const std::string& text,
-  int width,
-  bool hyphenate,
-  unsigned int& offset)
-{
-  // Terminate processing.
-  if (offset >= text.length ())
-    return false;
-
-  int line_length                     {0};
-  int character                       {0};
-  std::string::size_type lastWordEnd  {std::string::npos};
-  bool something                      {false};
-  std::string::size_type cursor       {offset};
-  std::string::size_type prior_cursor {offset};
-  while ((character = utf8_next_char (text, cursor)))
-  {
-    // Premature EOL.
-    if (character == '\n')
-    {
-      line = text.substr (offset, prior_cursor - offset);
-      offset = cursor;
-      return true;
-    }
-
-    if (! Lexer::isWhitespace (character))
-    {
-      something = true;
-      if (! text[cursor] || Lexer::isWhitespace (text[cursor]))
-        lastWordEnd = prior_cursor;
-    }
-
-    line_length += mk_wcwidth (character);
-
-    if (line_length >= width)
-    {
-      // Backtrack to previous word end.
-      if (lastWordEnd != std::string::npos)
-      {
-        // Eat one WS after lastWordEnd.
-        std::string::size_type lastBreak = lastWordEnd;
-        utf8_next_char (text, lastBreak);
-
-        // Position offset at following char.
-        std::string::size_type nextStart = lastBreak;
-        utf8_next_char (text, nextStart);
-
-        line = text.substr (offset, lastBreak - offset);
-        offset = nextStart;
-        return true;
-      }
-
-      // No backtrack, possible hyphenation.
-      else if (hyphenate)
-      {
-        line = text.substr (offset, prior_cursor - offset) + '-';
-        offset = prior_cursor;
-        return true;
-      }
-
-      // No hyphenation, just truncation.
-      else
-      {
-        line = text.substr (offset, cursor - offset);
-        offset = cursor;
-        return true;
-      }
-    }
-
-    // Hindsight.
-    prior_cursor = cursor;
-  }
-
-  // Residual text.
-  if (something)
-  {
-    line = text.substr (offset, cursor - offset);
-     offset = cursor;
-    return true;
-  }
-
-  return false;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 const char* optionalBlankLine ()
 {
diff --git a/src/text.h b/src/text.h
index b1dfef035..de92b5263 100644
--- a/src/text.h
+++ b/src/text.h
@@ -33,15 +33,6 @@
 #include <vector>
 
 // text.cpp, Non-UTF-8 aware.
-void wrapText (std::vector <std::string>&, const std::string&, const int, bool);
-std::string unquoteText (const std::string&);
-int longestLine (const std::string&);
-bool extractLine (std::string&, const std::string&, int, bool, unsigned int&);
-void split (std::set<std::string>&, const std::string&, const char);
-void split (std::vector<std::string>&, const std::string&, const char);
-void split (std::vector<std::string>&, const std::string&, const std::string&);
-void join (std::string&, const std::string&, const std::vector<std::string>&);
-void join (std::string&, const std::string&, const std::vector<int>&);
 const char* optionalBlankLine ();
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);

From 8c35f0a4ce293c8c96786fe3f6e444d3ebc34f34 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Dec 2016 01:14:47 -0500
Subject: [PATCH 147/879] Tests: Removed migrated util tests

---
 test/util.t.cpp | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/test/util.t.cpp b/test/util.t.cpp
index 9718b59d1..fb199dea9 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -42,26 +42,8 @@ int main (int, char**)
   unsetenv ("TASKDATA");
   unsetenv ("TASKRC");
 
-  // TODO bool confirm (const std::string&);
   // TODO int confirm4 (const std::string&);
 
-  // std::string formatBytes (size_t);
-  t.is (formatBytes (0), "0 B", "0 -> 0 B");
-
-  t.is (formatBytes (994),  "994 B", "994 -> 994 B");
-  t.is (formatBytes (995),  "1.0 KiB", "995 -> 1.0 KiB");
-  t.is (formatBytes (999),  "1.0 KiB", "999 -> 1.0 KiB");
-  t.is (formatBytes (1000), "1.0 KiB", "1000 -> 1.0 KiB");
-  t.is (formatBytes (1001), "1.0 KiB", "1001 -> 1.0 KiB");
-
-  t.is (formatBytes (999999),  "1.0 MiB", "999999 -> 1.0 MiB");
-  t.is (formatBytes (1000000), "1.0 MiB", "1000000 -> 1.0 MiB");
-  t.is (formatBytes (1000001), "1.0 MiB", "1000001 -> 1.0 MiB");
-
-  t.is (formatBytes (999999999),  "1.0 GiB", "999999999 -> 1.0 GiB");
-  t.is (formatBytes (1000000000), "1.0 GiB", "1000000000 -> 1.0 GiB");
-  t.is (formatBytes (1000000001), "1.0 GiB", "1000000001 -> 1.0 GiB");
-
   // TODO const std::string uuid ();
 
   // TODO These are in feedback.cpp, not util.cpp.

From a79d4cb80301fe66a2a0a62fe53e03c58ea4064a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Dec 2016 01:15:01 -0500
Subject: [PATCH 148/879] Tests: Removed migrated text tests

---
 test/text.t.cpp | 323 +-----------------------------------------------
 1 file changed, 1 insertion(+), 322 deletions(-)

diff --git a/test/text.t.cpp b/test/text.t.cpp
index cbcf19fab..651a04e78 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -37,205 +37,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (180);
-
-  // void wrapText (std::vector <std::string>& lines, const std::string& text, const int width, bool hyphenate)
-  std::string text = "This is a test of the line wrapping code.";
-  std::vector <std::string> lines;
-  wrapText (lines, text, 10, true);
-  t.is (lines.size (), (size_t) 5, "wrapText 'This is a test of the line wrapping code.' -> total 5 lines");
-  t.is (lines[0], "This is a",     "wrapText line 0 -> 'This is a'");
-  t.is (lines[1], "test of",       "wrapText line 1 -> 'test of'");
-  t.is (lines[2], "the line",      "wrapText line 2 -> 'the line'");
-  t.is (lines[3], "wrapping",      "wrapText line 3 -> 'wrapping'");
-  t.is (lines[4], "code.",         "wrapText line 4 -> 'code.'");
-
-  text = "This ☺ is a test of utf8 line extraction.";
-  lines.clear ();
-  wrapText (lines, text, 7, true);
-  t.is (lines.size (), (size_t) 7, "wrapText 'This \\u263a is a test of utf8 line extraction.' -> total 7 lines");
-  t.is (lines[0], "This ☺",        "wrapText line 0 -> 'This \\u263a'");
-  t.is (lines[1], "is a",          "wrapText line 1 -> 'is a'");
-  t.is (lines[2], "test of",       "wrapText line 2 -> 'test of'");
-  t.is (lines[3], "utf8",          "wrapText line 3 -> 'utf8'");
-  t.is (lines[4], "line",          "wrapText line 4 -> 'line'");
-  t.is (lines[5], "extrac-",       "wrapText line 5 -> 'extrac-'");
-  t.is (lines[6], "tion.",         "wrapText line 6 -> 'tion.'");
-
-  text = "one two three\n  four";
-  lines.clear ();
-  wrapText (lines, text, 13, true);
-  t.is (lines.size (), (size_t) 2, "wrapText 'one two three\\n  four' -> 2 lines");
-  t.is (lines[0], "one two three", "wrapText line 0 -> 'one two three'");
-  t.is (lines[1], "  four",        "wrapText line 1 -> '  four'");
-
-  // void extractLine (std::string& text, std::string& line, int length, bool hyphenate, unsigned int& offset)
-  text = "This ☺ is a test of utf8 line extraction.";
-  unsigned int offset = 0;
-  std::string line;
-  extractLine (line, text, 7, true, offset);
-  t.is (line, "This ☺", "extractLine 7 'This \\u263a is a test of utf8 line extraction.' -> 'This \\u263a'");
-
-  // void extractLine (std::string& text, std::string& line, int length, bool hyphenate, unsigned int& offset)
-  text = "line 1\nlengthy second line that exceeds width";
-  offset = 0;
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "line 1", "extractLine 10 'line 1\\nlengthy second line that exceeds width' -> 'line 1'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "lengthy", "extractLine 10 'lengthy second line that exceeds width' -> 'lengthy'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "second", "extractLine 10 'second line that exceeds width' -> 'second'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "line that", "extractLine 10 'line that exceeds width' -> 'line that'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "exceeds", "extractLine 10 'exceeds width' -> 'exceeds'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "width", "extractLine 10 'width' -> 'width'");
-
-  t.notok (extractLine (line, text, 10, true, offset), "extractLine 10 '' -> ''");
-
-  text = "AAAAAAAAAABBBBBBBBBB";
-  offset = 0;
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "AAAAAAAAA-", "extractLine hyphenated unbreakable line 'AAAAAAAAAABBBBBBBBBB'/10 -> 'AAAAAAAAA-'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "ABBBBBBBB-", "extractLine hyphenated unbreakable line 'AAAAAAAAAABBBBBBBBBB'/10 -> 'ABBBBBBBB-'");
-
-  extractLine (line, text, 10, true, offset);
-  t.is (line, "BB", "extractLine hyphenated unbreakable line 'AAAAAAAAAABBBBBBBBBB'/10 -> 'BB'");
-
-  text = "4444 333  ";
-  offset = 0;
-  while (extractLine (line, text, 9, true, offset))
-    std::cout << "# line '" << line << "' offset " << offset << "\n";
-
-  // void split (std::vector<std::string>& results, const std::string& input, const char delimiter)
-  std::vector <std::string> items;
-  std::string unsplit = "";
-  split (items, unsplit, '-');
-  t.is (items.size (), (size_t) 0, "split '' '-' -> 0 items");
-
-  unsplit = "a";
-  split (items, unsplit, '-');
-  t.is (items.size (), (size_t) 1, "split 'a' '-' -> 1 item");
-  t.is (items[0], "a",             "split 'a' '-' -> 'a'");
-
-  split (items, unsplit, '-');
-  t.is (items.size (), (size_t) 1, "split 'a' '-' -> 1 item");
-  t.is (items[0], "a",             "split 'a' '-' -> 'a'");
-
-  unsplit = "-";
-  split (items, unsplit, '-');
-  t.is (items.size (), (size_t) 2, "split '-' '-' -> '' ''");
-  t.is (items[0], "",              "split '-' '-' -> [0] ''");
-  t.is (items[1], "",              "split '-' '-' -> [1] ''");
-
-  unsplit = "-a-bc-def";
-  split (items, unsplit, '-');
-  t.is (items.size (), (size_t) 4, "split '-a-bc-def' '-' -> '' 'a' 'bc' 'def'");
-  t.is (items[0], "",              "split '-a-bc-def' '-' -> [0] ''");
-  t.is (items[1], "a",             "split '-a-bc-def' '-' -> [1] 'a'");
-  t.is (items[2], "bc",            "split '-a-bc-def' '-' -> [2] 'bc'");
-  t.is (items[3], "def",           "split '-a-bc-def' '-' -> [3] 'def'");
-
-  // void split (std::vector<std::string>& results, const std::string& input, const std::string& delimiter)
-  unsplit = "";
-  split (items, unsplit, "--");
-  t.is (items.size (), (size_t) 0, "split '' '--' -> 0 items");
-
-  unsplit = "a";
-  split (items, unsplit, "--");
-  t.is (items.size (), (size_t) 1, "split 'a' '--' -> 1 item");
-  t.is (items[0], "a",             "split 'a' '-' -> 'a'");
-
-  unsplit = "--";
-  split (items, unsplit, "--");
-  t.is (items.size (), (size_t) 2, "split '-' '--' -> '' ''");
-  t.is (items[0], "",              "split '-' '-' -> [0] ''");
-  t.is (items[1], "",              "split '-' '-' -> [1] ''");
-
-  unsplit = "--a--bc--def";
-  split (items, unsplit, "--");
-  t.is (items.size (), (size_t) 4, "split '-a-bc-def' '--' -> '' 'a' 'bc' 'def'");
-  t.is (items[0], "",              "split '-a-bc-def' '--' -> [0] ''");
-  t.is (items[1], "a",             "split '-a-bc-def' '--' -> [1] 'a'");
-  t.is (items[2], "bc",            "split '-a-bc-def' '--' -> [2] 'bc'");
-  t.is (items[3], "def",           "split '-a-bc-def' '--' -> [3] 'def'");
-
-  unsplit = "one\ntwo\nthree";
-  split (items, unsplit, "\n");
-  t.is (items.size (), (size_t) 3, "split 'one\\ntwo\\nthree' -> 'one', 'two', 'three'");
-  t.is (items[0], "one",           "split 'one\\ntwo\\nthree' -> [0] 'one'");
-  t.is (items[1], "two",           "split 'one\\ntwo\\nthree' -> [1] 'two'");
-  t.is (items[2], "three",         "split 'one\\ntwo\\nthree' -> [2] 'three'");
-
-  // void join (std::string& result, const std::string& separator, const std::vector<std::string>& items)
-  std::vector <std::string> unjoined;
-  std::string joined;
-
-  join (joined, "", unjoined);
-  t.is (joined.length (), (size_t) 0,  "join -> length 0");
-  t.is (joined,           "",          "join -> ''");
-
-  unjoined = {"", "a", "bc", "def"};
-  join (joined, "", unjoined);
-  t.is (joined.length (), (size_t) 6, "join '' 'a' 'bc' 'def' -> length 6");
-  t.is (joined,           "abcdef",   "join '' 'a' 'bc' 'def' -> 'abcdef'");
-
-  join (joined, "-", unjoined);
-  t.is (joined.length (), (size_t) 9,  "join '' - 'a' - 'bc' - 'def' -> length 9");
-  t.is (joined,           "-a-bc-def", "join '' - 'a' - 'bc' - 'def' -> '-a-bc-def'");
-
-  // void join (std::string& result, const std::string& separator, const std::vector<int>& items)
-  std::vector <int> unjoined2;
-
-  join (joined, "", unjoined2);
-  t.is (joined.length (), (size_t) 0, "join -> length 0");
-  t.is (joined,           "",         "join -> ''");
-
-  unjoined2 = {0, 1, 2};
-  join (joined, "", unjoined2);
-  t.is (joined.length (), (size_t) 3, "join 0 1 2 -> length 3");
-  t.is (joined,           "012",      "join 0 1 2 -> '012'");
-
-  join (joined, "-", unjoined2);
-  t.is (joined.length (), (size_t) 5, "join 0 1 2 -> length 5");
-  t.is (joined,           "0-1-2",    "join 0 1 2 -> '0-1-2'");
-
-  // std::string unquoteText (const std::string& text)
-  t.is (unquoteText (""),         "",     "unquoteText '' -> ''");
-  t.is (unquoteText ("x"),        "x",    "unquoteText 'x' -> 'x'");
-  t.is (unquoteText ("'x"),       "'x",   "unquoteText ''x' -> ''x'");
-  t.is (unquoteText ("x'"),       "x'",   "unquoteText 'x'' -> 'x''");
-  t.is (unquoteText ("\"x"),      "\"x",  "unquoteText '\"x' -> '\"x'");
-  t.is (unquoteText ("x\""),      "x\"",  "unquoteText 'x\"' -> 'x\"'");
-  t.is (unquoteText ("''"),       "",     "unquoteText '''' -> ''");
-  t.is (unquoteText ("'''"),      "'",    "unquoteText ''''' -> '''");
-  t.is (unquoteText ("\"\""),     "",     "unquoteText '\"\"' -> ''");
-  t.is (unquoteText ("\"\"\""),    "\"",  "unquoteText '\"\"\"' -> '\"'");
-  t.is (unquoteText ("''''"),     "''",   "unquoteText '''''' -> ''''");
-  t.is (unquoteText ("\"\"\"\""), "\"\"", "unquoteText '\"\"\"\"' -> '\"\"'");
-  t.is (unquoteText ("'\"\"'"),   "\"\"", "unquoteText '''\"\"' -> '\"\"'");
-  t.is (unquoteText ("\"''\""),   "''",   "unquoteText '\"''\"' -> ''''");
-  t.is (unquoteText ("'x'"),      "x",    "unquoteText ''x'' -> 'x'");
-  t.is (unquoteText ("\"x\""),    "x",    "unquoteText '\"x\"' -> 'x'");
-
-  // int longestWord (const std::string&)
-  t.is (longestWord ("    "),                   0, "longestWord (    ) --> 0");
-  t.is (longestWord ("this is a test"),         4, "longestWord (this is a test) --> 4");
-  t.is (longestWord ("this is a better test"),  6, "longestWord (this is a better test) --> 6");
-  t.is (longestWord ("house Çirçös clown"),     6, "longestWord (house ...... clown) --> 6");
-
-  // int longestLine (const std::string&)
-  t.is (longestLine ("one two three four"),    18, "longestLine (one two three four) --> 18");
-  t.is (longestLine ("one\ntwo three four"),   14, "longestLine (one\\ntwo three four) --> 14");
-  t.is (longestLine ("one\ntwo\nthree\nfour"),  5, "longestLine (one\\ntwo\\nthree\\nfour) --> 5");
+  UnitTest t (14);
 
   // bool nontrivial (const std::string&);
   t.notok (nontrivial (""),                       "nontrivial '' -> false");
@@ -248,66 +50,6 @@ int main (int, char**)
   t.ok    (nontrivial ("  \t\ta"),                "nontrivial '  \\t\\ta' -> true");
   t.ok    (nontrivial ("a\t\t  "),                "nontrivial 'a\\t\\t  ' -> true");
 
-  // bool compare (const std::string&, const std::string&, bool caseless = false);
-  // Make sure degenerate cases are handled.
-  t.ok    (compare ("", ""),    "'' == ''");
-  t.notok (compare ("foo", ""), "foo != ''");
-  t.notok (compare ("", "foo"), "'' != foo");
-
-  // Make sure the default is case-sensitive.
-  t.ok    (compare ("foo", "foo"), "foo == foo");
-  t.notok (compare ("foo", "FOO"), "foo != foo");
-
-  // Test case-sensitive.
-  t.notok (compare ("foo", "xx", true),  "foo != xx");
-
-  t.ok    (compare ("foo", "foo", true), "foo == foo");
-  t.notok (compare ("foo", "FOO", true), "foo != FOO");
-  t.notok (compare ("FOO", "foo", true), "FOO != foo");
-  t.ok    (compare ("FOO", "FOO", true), "FOO == FOO");
-
-  // Test case-insensitive.
-  t.notok (compare ("foo", "xx", false),   "foo != foo (caseless)");
-
-  t.ok    (compare ("foo", "foo", false),  "foo == foo (caseless)");
-  t.ok    (compare ("foo", "FOO", false),  "foo == FOO (caseless)");
-  t.ok    (compare ("FOO", "foo", false),  "FOO == foo (caseless)");
-  t.ok    (compare ("FOO", "FOO", false),  "FOO == FOO (caseless)");
-
-  // std::string::size_type find (const std::string&, const std::string&, bool caseless = false);
-  // Make sure degenerate cases are handled.
-  t.is ((int) find ("foo", ""), (int) 0,                 "foo !contains ''");
-  t.is ((int) find ("", "foo"), (int) std::string::npos, "'' !contains foo");
-
-  // Make sure the default is case-sensitive.
-  t.is ((int) find ("foo", "fo"), 0,                       "foo contains fo");
-  t.is ((int) find ("foo", "FO"), (int) std::string::npos, "foo !contains fo");
-
-  // Test case-sensitive.
-  t.is ((int) find ("foo", "xx", true), (int) std::string::npos, "foo !contains xx");
-  t.is ((int) find ("foo", "oo", true), 1,                       "foo contains oo");
-
-  t.is ((int) find ("foo", "fo", true), 0,                       "foo contains fo");
-  t.is ((int) find ("foo", "FO", true), (int) std::string::npos, "foo !contains fo");
-  t.is ((int) find ("FOO", "fo", true), (int) std::string::npos, "foo !contains fo");
-  t.is ((int) find ("FOO", "FO", true), 0,                       "foo contains fo");
-
-  // Test case-insensitive.
-  t.is ((int) find ("foo", "xx", false),  (int) std::string::npos, "foo !contains xx (caseless)");
-  t.is ((int) find ("foo", "oo", false),  1,                       "foo contains oo (caseless)");
-
-  t.is ((int) find ("foo", "fo", false),  0, "foo contains fo (caseless)");
-  t.is ((int) find ("foo", "FO", false),  0, "foo contains FO (caseless)");
-  t.is ((int) find ("FOO", "fo", false),  0, "FOO contains fo (caseless)");
-  t.is ((int) find ("FOO", "FO", false),  0, "FOO contains FO (caseless)");
-
-  // Test start offset.
-  t.is ((int) find ("one two three", "e",  3, true), (int) 11, "offset obeyed");
-  t.is ((int) find ("one two three", "e", 11, true), (int) 11, "offset obeyed");
-
-  t.is ((int) find ("one two three", "e",  3, false), (int) 11, "offset obeyed");
-  t.is ((int) find ("one two three", "e", 11, false), (int) 11, "offset obeyed");
-
   // int strippedLength (const std::string&);
   t.is (strippedLength (std::string ("")),                                  0, "strippedLength                              -> 0");
   t.is (strippedLength (std::string ("abc")),                               3, "strippedLength abc                          -> 3");
@@ -315,69 +57,6 @@ int main (int, char**)
   t.is (strippedLength (std::string ("\033[0m")),                           0, "strippedLength ^[[0m                        -> 0");
   t.is (strippedLength (std::string ("\033[1m\033[0m")),                    0, "strippedLength ^[[1m^[[0m                   -> 0");
 
-  // std::string format (char);
-  t.is (format ('A'), "A", "format ('A') -> A");
-
-  // std::string format (int);
-  t.is (format (0),  "0",  "format (0) -> 0");
-  t.is (format (-1), "-1", "format (-1) -> -1");
-
-  // std::string formatHex (int);
-  t.is (formatHex (0),   "0",  "formatHex (0) -> 0");
-  t.is (formatHex (10),  "a",  "formatHex (10) -> a");
-  t.is (formatHex (123), "7b", "formatHex (123) -> 7b");
-
-  // std::string format (float, int, int);
-  t.is (format (0.12345678, 8, 4),      "  0.1235",     "format (0.12345678,    8,   4) -> __0.1235");
-
-  t.is (format (1.23456789, 8, 1),      "       1",     "format (1.23456789,    8,   1) -> _______1");
-  t.is (format (1.23456789, 8, 2),      "     1.2",     "format (1.23456789,    8,   2) -> _____1.2");
-  t.is (format (1.23456789, 8, 3),      "    1.23",     "format (1.23456789,    8,   3) -> ____1.23");
-  t.is (format (1.23456789, 8, 4),      "   1.235",     "format (1.23456789,    8,   4) -> ___1.235");
-  t.is (format (1.23456789, 8, 5),      "  1.2346",     "format (1.23456789,    8,   5) -> __1.2346");
-  t.is (format (1.23456789, 8, 6),      " 1.23457",     "format (1.23456789,    8,   6) ->  1.23457");
-  t.is (format (1.23456789, 8, 7),      "1.234568",     "format (1.23456789,    8,   7) -> 1.234568");
-  t.is (format (1.23456789, 8, 8),      "1.2345679",    "format (1.23456789,    8,   8) -> 1.2345679");
-  t.is (format (2444238.56789, 12, 11), "2444238.5679", "format (2444238.56789, 12, 11) -> 2444238.5679");
-
-  // std::string format (double, int, int);
-
-  // std::string leftJustify (const std::string&, const int);
-  t.is (leftJustify (123, 3), "123",   "leftJustify 123,3 -> '123'");
-  t.is (leftJustify (123, 4), "123 ",  "leftJustify 123,4 -> '123 '");
-  t.is (leftJustify (123, 5), "123  ", "leftJustify 123,5 -> '123  '");
-
-  // std::string leftJustify (const std::string&, const int);
-  t.is (leftJustify ("foo", 3), "foo",   "leftJustify foo,3 -> 'foo'");
-  t.is (leftJustify ("foo", 4), "foo ",  "leftJustify foo,4 -> 'foo '");
-  t.is (leftJustify ("foo", 5), "foo  ", "leftJustify foo,5 -> 'foo  '");
-  t.is (leftJustify ("föo", 5), "föo  ", "leftJustify f:oo,5 -> 'f:oo  '");
-
-  // When a string doesn't fit in the space necessary‥
-  t.is (leftJustify ("foo", 2), "fo",    "leftJustify foo,2 -> 'fo'");
-
-  // std::string rightJustify (const std::string&, const int);
-  t.is (rightJustify (123, 3), "123",   "rightJustify 123,3 -> '123'");
-  t.is (rightJustify (123, 4), " 123",  "rightJustify 123,4 -> ' 123'");
-  t.is (rightJustify (123, 5), "  123", "rightJustify 123,5 -> '  123'");
-
-  // std::string rightJustify (const std::string&, const int);
-  t.is (rightJustify ("foo", 3), "foo",   "rightJustify foo,3 -> 'foo'");
-  t.is (rightJustify ("foo", 4), " foo",  "rightJustify foo,4 -> ' foo'");
-  t.is (rightJustify ("foo", 5), "  foo", "rightJustify foo,5 -> '  foo'");
-  t.is (rightJustify ("föo", 5), "  föo", "rightJustify f:oo,5 -> '  f:oo'");
-
-  // bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0);
-  t.ok (closeEnough ("foobar", "foobar"),      "closeEnough foobar == foobar");
-  t.ok (closeEnough ("foobar", "foobar", 0),   "closeEnough foobar == foobar,0");
-  t.ok (closeEnough ("foobar", "foobar", 1),   "closeEnough foobar == foobar,1");
-  t.ok (closeEnough ("foobar", "foobar", 2),   "closeEnough foobar == foobar,2");
-  t.ok (closeEnough ("foobar", "foobar", 3),   "closeEnough foobar == foobar,3");
-  t.ok (closeEnough ("foobar", "foobar", 4),   "closeEnough foobar == foobar,4");
-  t.ok (closeEnough ("foobar", "foobar", 5),   "closeEnough foobar == foobar,5");
-  t.ok (closeEnough ("foobar", "foobar", 6),   "closeEnough foobar == foobar,6");
-  t.ok (closeEnough ("foobar", "foo", 3),      "closeEnough foobar == foo,3");
-
   return 0;
 }
 

From 8462120c0a655d654be5de44c6ae37a1772eed52 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Dec 2016 01:18:25 -0500
Subject: [PATCH 149/879] Tests: Removed migrated autoComplete tests

---
 test/.gitignore         |  1 -
 test/CMakeLists.txt     | 10 +------
 test/autocomplete.t.cpp | 66 -----------------------------------------
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 test/autocomplete.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index b7c6be1a1..8cdb4cf86 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -3,7 +3,6 @@
 *.data
 *.log
 *.runlog
-autocomplete.t
 col.t
 color.t
 config.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index daf1442c0..1492287b0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,15 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t
-               msg.t nibbler.t t.t tdb2.t text.t util.t view.t
-               lexer.t iso8601d.t iso8601p.t eval.t dates.t
-               variant_add.t variant_and.t variant_cast.t variant_divide.t
-               variant_equal.t variant_exp.t variant_gt.t variant_gte.t
-               variant_inequal.t variant_lt.t variant_lte.t variant_match.t
-               variant_math.t variant_modulo.t variant_multiply.t
-               variant_nomatch.t variant_not.t variant_or.t variant_partial.t
-               variant_subtract.t variant_xor.t)
+set (test_SRCS col.t color.t config.t msg.t nibbler.t t.t tdb2.t text.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/autocomplete.t.cpp b/test/autocomplete.t.cpp
deleted file mode 100644
index 728df22aa..000000000
--- a/test/autocomplete.t.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <test.h>
-#include <util.h>
-#include <main.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (8);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  std::vector <std::string> options {"abc", "abcd", "abcde", "bcdef", "cdefg"};
-  std::vector <std::string> matches;
-  int result = autoComplete ("", options, matches);
-  t.is (result, 0, "no match on empty string");
-
-  result = autoComplete ("x", options, matches);
-  t.is (result, 0, "no match on wrong string");
-
-  result = autoComplete ("abcd", options, matches);
-  t.is (result, 1, "exact match on 'abcd'");
-  t.is (matches[0], "abcd", "exact match on 'abcd'");
-
-  result = autoComplete ("ab", options, matches);
-  t.is (result, 3, "partial match on 'ab'");
-  t.is (matches[0], "abc", "partial match on 'abc'");
-  t.is (matches[1], "abcd", "partial match on 'abcd'");
-  t.is (matches[2], "abcde", "partial match on 'abcde'");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 4232f1a599ed92d4e11440dccbc38d8aee191635 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 16:08:47 -0500
Subject: [PATCH 150/879] Task: Migrated unquoteText to Lexer::dequote

---
 src/Task.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index a284b849e..ed9544a8d 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -662,14 +662,17 @@ void Task::parseJSON (const json::object* root_obj)
       // TW-1274 Standardization.
       else if (i.first == "modification")
       {
-        ISO8601d d (unquoteText (i.second->dump ()));
+        auto text = i.second->dump ();
+        Lexer::dequote (text);
+        ISO8601d d (text);
         set ("modified", d.toEpochString ());
       }
 
       // Dates are converted from ISO to epoch.
       else if (type == "date")
       {
-        std::string text = unquoteText (i.second->dump ());
+        auto text = i.second->dump ();
+        Lexer::dequote (text);
         ISO8601d d (text);
         set (i.first, text == "" ? "" : d.toEpochString ());
       }

From f0988b52d047b95edbc87965a05cf5325a1f43a3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 16:09:16 -0500
Subject: [PATCH 151/879] CLI2: Corrected str_replace calls

---
 src/CLI2.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 55dfc1aa5..1baf8ecc5 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -399,6 +399,7 @@ void CLI2::lexArguments ()
   {
     bool quoted = Lexer::wasQuoted (_original_args[i].attribute ("raw"));
 
+    // Process single-token arguments.
     std::string lexeme;
     Lexer::Type type;
     Lexer lex (_original_args[i].attribute ("raw"));
@@ -422,11 +423,13 @@ void CLI2::lexArguments ()
 
       _args.push_back (a);
     }
+
+    // Process muktiple-token arguments.
     else
     {
       std::string quote = "'";
       std::string escaped = _original_args[i].attribute ("raw");
-      str_replace (escaped, quote, "\\'");
+      escaped = str_replace (escaped, quote, "\\'");
 
       std::string::size_type cursor = 0;
       std::string word;

From 98278eff2af71040a929d7ec3b602ca03f80dfd5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 16:09:37 -0500
Subject: [PATCH 152/879] Task: Corrected str_replace calls

---
 src/Task.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index ed9544a8d..a8a2e2ef1 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1643,12 +1643,8 @@ void Task::validate_before (const std::string& left, const std::string& right)
 //   ]  -> &close;
 const std::string Task::encode (const std::string& value) const
 {
-  std::string modified = value;
-
-  str_replace (modified, "[",  "&open;");
-  str_replace (modified, "]",  "&close;");
-
-  return modified;
+  auto modified = str_replace (value,    "[", "&open;");
+  return          str_replace (modified, "]", "&close;");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1661,18 +1657,11 @@ const std::string Task::encode (const std::string& value) const
 //   :  <- &colon;
 const std::string Task::decode (const std::string& value) const
 {
-  if (value.find ('&') != std::string::npos)
-  {
-    std::string modified = value;
+  if (value.find ('&') == std::string::npos)
+    return value;
 
-    // Supported encodings.
-    str_replace (modified, "&open;",  "[");
-    str_replace (modified, "&close;", "]");
-
-    return modified;
-  }
-
-  return value;
+  auto modified = str_replace (value,    "&open;",  "[");
+  return          str_replace (modified, "&close;", "]");
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From ecd0ae1b164c9caa5890307095904e6ef40400a6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 16:52:01 -0500
Subject: [PATCH 153/879] libshared: Updated to
 dfb31a41ced0fe48d98efa2b55689201d8e19667

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 2af7d0375..dfb31a41c 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 2af7d037559f84450fffa812829fc553498a7ae4
+Subproject commit dfb31a41ced0fe48d98efa2b55689201d8e19667

From b9f55997aeb01e2a1ff256383c374ab3d5073d82 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 16:53:28 -0500
Subject: [PATCH 154/879] Context: GC timing correction not always needed

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 61c591531..b4292ca7f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -326,7 +326,7 @@ int Context::run ()
 
       << " init:"   << time_init_us
       << " load:"   << time_load_us
-      << " gc:"     << time_gc_us - time_load_us
+      << " gc:"     << (time_gc_us > 0 ? time_gc_us - time_load_us : time_gc_us)
       << " filter:" << time_filter_us
       << " commit:" << time_commit_us
       << " sort:"   << time_sort_us

From 9ae171f57c9808aac031fb6c98caafca1fdbe76d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:29:03 -0500
Subject: [PATCH 155/879] util: Migrated obfuscateText from text

---
 src/ViewTask.cpp |  2 +-
 src/ViewText.cpp |  2 +-
 src/text.cpp     | 32 --------------------------------
 src/text.h       |  1 -
 src/util.cpp     | 33 +++++++++++++++++++++++++++++++++
 src/util.h       |  1 +
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 4c2f9bff1..37e82e40f 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -29,7 +29,7 @@
 #include <numeric>
 #include <Context.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <utf8.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/ViewText.cpp b/src/ViewText.cpp
index c1d8455d8..98dc225ba 100644
--- a/src/ViewText.cpp
+++ b/src/ViewText.cpp
@@ -28,7 +28,7 @@
 #include <ViewText.h>
 #include <Context.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <utf8.h>
 #include <main.h>
 
diff --git a/src/text.cpp b/src/text.cpp
index 1709e6a84..c1a4ffb0f 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -92,35 +92,3 @@ int strippedLength (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::string obfuscateText (const std::string& input)
-{
-  std::stringstream output;
-  std::string::size_type i = 0;
-  int character;
-  bool inside = false;
-
-  while ((character = utf8_next_char (input, i)))
-  {
-    if (inside)
-    {
-      output << (char) character;
-
-      if (character == 'm')
-        inside = false;
-    }
-    else
-    {
-      if (character == 033)
-        inside = true;
-
-      if (inside || character == ' ')
-        output << (char) character;
-      else
-        output << 'x';
-    }
-  }
-
-  return output.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/text.h b/src/text.h
index de92b5263..3154a9ff6 100644
--- a/src/text.h
+++ b/src/text.h
@@ -36,7 +36,6 @@
 const char* optionalBlankLine ();
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
-const std::string obfuscateText (const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.cpp b/src/util.cpp
index 50fc940cd..b718b07f6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -54,6 +54,7 @@
 
 #include <Lexer.h>
 #include <text.h>
+#include <utf8.h>
 #include <main.h>
 #include <i18n.h>
 
@@ -283,3 +284,35 @@ std::string osName ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const std::string obfuscateText (const std::string& input)
+{
+  std::stringstream output;
+  std::string::size_type i = 0;
+  int character;
+  bool inside = false;
+
+  while ((character = utf8_next_char (input, i)))
+  {
+    if (inside)
+    {
+      output << (char) character;
+
+      if (character == 'm')
+        inside = false;
+    }
+    else
+    {
+      if (character == 033)
+        inside = true;
+
+      if (inside || character == ' ')
+        output << (char) character;
+      else
+        output << 'x';
+    }
+  }
+
+  return output.str ();
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index 404c0a1b9..766e8ce73 100644
--- a/src/util.h
+++ b/src/util.h
@@ -61,6 +61,7 @@ const std::vector <std::string> extractParents (
 #endif
 
 std::string osName ();
+const std::string obfuscateText (const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From 14e3038571ce741b50bc8254567dbaf26b30700b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:34:50 -0500
Subject: [PATCH 156/879] util: Migrated nontrivial from text

---
 src/Hooks.cpp   |  2 +-
 src/text.cpp    | 12 ------------
 src/text.h      |  1 -
 src/util.cpp    | 12 ++++++++++++
 src/util.h      |  1 +
 test/text.t.cpp | 13 +------------
 test/util.t.cpp | 13 ++++++++++++-
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 109aa0490..f779b6b59 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -44,7 +44,7 @@
 #include <Timer.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/text.cpp b/src/text.cpp
index c1a4ffb0f..3b64eea1c 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -52,18 +52,6 @@ const char* optionalBlankLine ()
   return context.verbose ("blank") ? newline : noline;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-bool nontrivial (const std::string& input)
-{
-  std::string::size_type i = 0;
-  int character;
-  while ((character = utf8_next_char (input, i)))
-    if (! Lexer::isWhitespace (character))
-      return true;
-
-  return false;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Return the length, in characters, of the input, subtracting color control
 // codes.
diff --git a/src/text.h b/src/text.h
index 3154a9ff6..683cd825d 100644
--- a/src/text.h
+++ b/src/text.h
@@ -34,7 +34,6 @@
 
 // text.cpp, Non-UTF-8 aware.
 const char* optionalBlankLine ();
-bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
 
 #endif
diff --git a/src/util.cpp b/src/util.cpp
index b718b07f6..ee6703cb7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -316,3 +316,15 @@ const std::string obfuscateText (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+bool nontrivial (const std::string& input)
+{
+  std::string::size_type i = 0;
+  int character;
+  while ((character = utf8_next_char (input, i)))
+    if (! Lexer::isWhitespace (character))
+      return true;
+
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index 766e8ce73..bce568846 100644
--- a/src/util.h
+++ b/src/util.h
@@ -62,6 +62,7 @@ const std::vector <std::string> extractParents (
 
 std::string osName ();
 const std::string obfuscateText (const std::string&);
+bool nontrivial (const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/text.t.cpp b/test/text.t.cpp
index 651a04e78..dd4d980ec 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -37,18 +37,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (14);
-
-  // bool nontrivial (const std::string&);
-  t.notok (nontrivial (""),                       "nontrivial '' -> false");
-  t.notok (nontrivial ("   "),                    "nontrivial '   ' -> false");
-  t.notok (nontrivial ("\t\t"),                   "nontrivial '\\t\\t' -> false");
-  t.notok (nontrivial (" \t \t"),                 "nontrivial ' \\t \\t' -> false");
-  t.ok    (nontrivial ("a"),                      "nontrivial 'a' -> true");
-  t.ok    (nontrivial ("   a"),                   "nontrivial '   a' -> true");
-  t.ok    (nontrivial ("a   "),                   "nontrivial 'a   ' -> true");
-  t.ok    (nontrivial ("  \t\ta"),                "nontrivial '  \\t\\ta' -> true");
-  t.ok    (nontrivial ("a\t\t  "),                "nontrivial 'a\\t\\t  ' -> true");
+  UnitTest t (5);
 
   // int strippedLength (const std::string&);
   t.is (strippedLength (std::string ("")),                                  0, "strippedLength                              -> 0");
diff --git a/test/util.t.cpp b/test/util.t.cpp
index fb199dea9..03050d360 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -36,7 +36,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (22);
+  UnitTest t (19);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -75,6 +75,17 @@ int main (int, char**)
   t.is (indentProject ("one.two"),       "  two",         "indentProject 'one.two' -> '  two'");
   t.is (indentProject ("one.two.three"), "    three", "indentProject 'one.two.three' -> '    three'");
 
+  // bool nontrivial (const std::string&);
+  t.notok (nontrivial (""),                       "nontrivial '' -> false");
+  t.notok (nontrivial ("   "),                    "nontrivial '   ' -> false");
+  t.notok (nontrivial ("\t\t"),                   "nontrivial '\\t\\t' -> false");
+  t.notok (nontrivial (" \t \t"),                 "nontrivial ' \\t \\t' -> false");
+  t.ok    (nontrivial ("a"),                      "nontrivial 'a' -> true");
+  t.ok    (nontrivial ("   a"),                   "nontrivial '   a' -> true");
+  t.ok    (nontrivial ("a   "),                   "nontrivial 'a   ' -> true");
+  t.ok    (nontrivial ("  \t\ta"),                "nontrivial '  \\t\\ta' -> true");
+  t.ok    (nontrivial ("a\t\t  "),                "nontrivial 'a\\t\\t  ' -> true");
+
   return 0;
 }
 

From b4e4727887dfd91a23efac10cd56ea4c00bd00a9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:39:11 -0500
Subject: [PATCH 157/879] util: Migrated strippedLength from text

---
 src/text.cpp    | 27 ---------------------------
 src/util.cpp    | 27 +++++++++++++++++++++++++++
 src/util.h      |  1 +
 test/text.t.cpp |  9 +--------
 test/util.t.cpp |  9 ++++++++-
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/text.cpp b/src/text.cpp
index 3b64eea1c..214412026 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -53,30 +53,3 @@ const char* optionalBlankLine ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Return the length, in characters, of the input, subtracting color control
-// codes.
-int strippedLength (const std::string& input)
-{
-  int length = input.length ();
-  bool inside = false;
-  int count = 0;
-  for (int i = 0; i < length; ++i)
-  {
-    if (inside)
-    {
-      if (input[i] == 'm')
-        inside = false;
-    }
-    else
-    {
-      if (input[i] == 033)
-        inside = true;
-      else
-        ++count;
-    }
-  }
-
-  return count;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.cpp b/src/util.cpp
index ee6703cb7..66dfefe5c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -328,3 +328,30 @@ bool nontrivial (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Return the length, in characters, of the input, subtracting color control
+// codes.
+int strippedLength (const std::string& input)
+{
+  int length = input.length ();
+  bool inside = false;
+  int count = 0;
+  for (int i = 0; i < length; ++i)
+  {
+    if (inside)
+    {
+      if (input[i] == 'm')
+        inside = false;
+    }
+    else
+    {
+      if (input[i] == 033)
+        inside = true;
+      else
+        ++count;
+    }
+  }
+
+  return count;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index bce568846..845e0668d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -63,6 +63,7 @@ const std::vector <std::string> extractParents (
 std::string osName ();
 const std::string obfuscateText (const std::string&);
 bool nontrivial (const std::string&);
+int strippedLength (const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/text.t.cpp b/test/text.t.cpp
index dd4d980ec..b188d4bc3 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -37,14 +37,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (5);
-
-  // int strippedLength (const std::string&);
-  t.is (strippedLength (std::string ("")),                                  0, "strippedLength                              -> 0");
-  t.is (strippedLength (std::string ("abc")),                               3, "strippedLength abc                          -> 3");
-  t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
-  t.is (strippedLength (std::string ("\033[0m")),                           0, "strippedLength ^[[0m                        -> 0");
-  t.is (strippedLength (std::string ("\033[1m\033[0m")),                    0, "strippedLength ^[[1m^[[0m                   -> 0");
+  UnitTest t (0);
 
   return 0;
 }
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 03050d360..5c8104a71 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -36,7 +36,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (19);
+  UnitTest t (24);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -86,6 +86,13 @@ int main (int, char**)
   t.ok    (nontrivial ("  \t\ta"),                "nontrivial '  \\t\\ta' -> true");
   t.ok    (nontrivial ("a\t\t  "),                "nontrivial 'a\\t\\t  ' -> true");
 
+  // int strippedLength (const std::string&);
+  t.is (strippedLength (std::string ("")),                                  0, "strippedLength                              -> 0");
+  t.is (strippedLength (std::string ("abc")),                               3, "strippedLength abc                          -> 3");
+  t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
+  t.is (strippedLength (std::string ("\033[0m")),                           0, "strippedLength ^[[0m                        -> 0");
+  t.is (strippedLength (std::string ("\033[1m\033[0m")),                    0, "strippedLength ^[[1m^[[0m                   -> 0");
+
   return 0;
 }
 

From 026a8aa9a14e0cbe070bbbdb265d51f054b9072b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:40:40 -0500
Subject: [PATCH 158/879] Tests: Eliminated empty text.t test

---
 test/.gitignore     |  1 -
 test/CMakeLists.txt |  2 +-
 test/text.t.cpp     | 45 ---------------------------------------------
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 test/text.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 8cdb4cf86..c0a96c1c5 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -16,7 +16,6 @@ nibbler.t
 t.t
 taskmod.t
 tdb2.t
-text.t
 uri.t
 util.t
 variant_add.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1492287b0..3dc02f2ba 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t color.t config.t msg.t nibbler.t t.t tdb2.t text.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t color.t config.t msg.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/text.t.cpp b/test/text.t.cpp
deleted file mode 100644
index b188d4bc3..000000000
--- a/test/text.t.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <main.h>
-#include <text.h>
-#include <utf8.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (0);
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From ec84d0f3721331d0bc76abe24d8448da7d9dd60a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:46:06 -0500
Subject: [PATCH 159/879] util: Migrated optionalBlankLine from text

---
 src/columns/ColString.cpp    | 2 +-
 src/commands/CmdCalendar.cpp | 2 +-
 src/commands/CmdColumns.cpp  | 2 +-
 src/commands/CmdCommands.cpp | 2 +-
 src/commands/CmdContext.cpp  | 2 +-
 src/commands/CmdCustom.cpp   | 2 +-
 src/commands/CmdHistory.cpp  | 2 +-
 src/commands/CmdInfo.cpp     | 2 +-
 src/commands/CmdLogo.cpp     | 2 +-
 src/commands/CmdReports.cpp  | 2 +-
 src/commands/CmdTags.cpp     | 2 +-
 src/text.cpp                 | 9 ---------
 src/text.h                   | 2 --
 src/util.cpp                 | 9 +++++++++
 src/util.h                   | 1 +
 15 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp
index 5befb51e5..5313b0ad0 100644
--- a/src/columns/ColString.cpp
+++ b/src/columns/ColString.cpp
@@ -29,7 +29,7 @@
 #include <Context.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 6bc259051..cd7ff484c 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -35,7 +35,7 @@
 #include <i18n.h>
 #include <shared.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <utf8.h>
 #include <main.h>
 
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 8772a9e85..6f2c94f4f 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -31,7 +31,7 @@
 #include <ViewText.h>
 #include <Color.h>
 #include <shared.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 #include <main.h>
 
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 728b9c50c..f11a147f2 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -33,7 +33,7 @@
 #include <ViewText.h>
 #include <Command.h>
 #include <ColString.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 057b8d6f8..c4de69c88 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -35,7 +35,7 @@
 #include <i18n.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
+#include <util.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 27a8eeb11..cadf326c5 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -38,7 +38,7 @@
 #include <i18n.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
+#include <util.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 2d7e5b4c7..a8d71eb7f 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -32,7 +32,7 @@
 #include <ViewText.h>
 #include <main.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 #include <ISO8601.h>
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 4134413ae..9aa8b9b6c 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -35,7 +35,7 @@
 #include <main.h>
 #include <shared.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 1c25fbc06..a55b457fa 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <CmdLogo.h>
 #include <Context.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 0fa52cb0c..75dd585b4 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -31,7 +31,7 @@
 #include <Context.h>
 #include <ViewText.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 5f75b85b3..4187a03dc 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -33,7 +33,7 @@
 #include <Filter.h>
 #include <ViewText.h>
 #include <format.h>
-#include <text.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/text.cpp b/src/text.cpp
index 214412026..85290a073 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -43,13 +43,4 @@
 
 extern Context context;
 
-static const char* newline = "\n";
-static const char* noline  = "";
-
-////////////////////////////////////////////////////////////////////////////////
-const char* optionalBlankLine ()
-{
-  return context.verbose ("blank") ? newline : noline;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/text.h b/src/text.h
index 683cd825d..16b91c3c1 100644
--- a/src/text.h
+++ b/src/text.h
@@ -33,8 +33,6 @@
 #include <vector>
 
 // text.cpp, Non-UTF-8 aware.
-const char* optionalBlankLine ();
-int strippedLength (const std::string&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.cpp b/src/util.cpp
index 66dfefe5c..e001c2e4c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -60,6 +60,9 @@
 
 extern Context context;
 
+static const char* newline = "\n";
+static const char* noline  = "";
+
 //////////////////////////////////////////////////////////////////////////////// 
 static void signal_handler (int s)
 {
@@ -355,3 +358,9 @@ int strippedLength (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const char* optionalBlankLine ()
+{
+  return context.verbose ("blank") ? newline : noline;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index 845e0668d..c1ed270ef 100644
--- a/src/util.h
+++ b/src/util.h
@@ -64,6 +64,7 @@ std::string osName ();
 const std::string obfuscateText (const std::string&);
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
+const char* optionalBlankLine ();
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From a6c8303839ac8d9621b761c1cef840cad85f3d50 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 17:51:44 -0500
Subject: [PATCH 160/879] text: Eliminated module

---
 src/CMakeLists.txt           |  1 -
 src/columns/ColStart.cpp     |  1 -
 src/commands/CmdImport.cpp   |  1 -
 src/commands/CmdProjects.cpp |  1 -
 src/commands/CmdStats.cpp    |  1 -
 src/commands/CmdSummary.cpp  |  1 -
 src/commands/CmdUDAs.cpp     |  1 -
 src/rules.cpp                |  1 -
 src/text.cpp                 | 46 ------------------------------------
 src/text.h                   | 38 -----------------------------
 src/util.cpp                 |  1 -
 11 files changed, 93 deletions(-)
 delete mode 100644 src/text.cpp
 delete mode 100644 src/text.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3d4e5f9d3..564c68f73 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,6 @@ add_library (task CLI2.cpp CLI2.h
                   recur.cpp
                   rules.cpp
                   sort.cpp
-                  text.cpp text.h
                   util.cpp util.h)
 
 add_library (libshared libshared/src/Datetime.cpp      libshared/src/Datetime.h
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index fdb3fd600..df807d045 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -27,7 +27,6 @@
 #include <cmake.h>
 #include <ColStart.h>
 #include <Context.h>
-#include <text.h>
 #include <utf8.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 657a438ff..f5f1e98a5 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -33,7 +33,6 @@
 #include <Filter.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 8d7defea4..7606472c4 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -32,7 +32,6 @@
 #include <Filter.h>
 #include <ViewText.h>
 #include <format.h>
-#include <text.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 0ef70197c..5d2df249a 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -35,7 +35,6 @@
 #include <Filter.h>
 #include <main.h>
 #include <format.h>
-#include <text.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 1e45e6189..85272c11a 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -34,7 +34,6 @@
 #include <ViewText.h>
 #include <ISO8601.h>
 #include <format.h>
-#include <text.h>
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 685adeefd..f1ca5023c 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -34,7 +34,6 @@
 #include <main.h>
 #include <format.h>
 #include <shared.h>
-#include <text.h>
 #include <util.h>
 #include <i18n.h>
 
diff --git a/src/rules.cpp b/src/rules.cpp
index c9715030e..0ebd1f10d 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <ISO8601.h>
-#include <text.h>
 #include <shared.h>
 #include <main.h>
 
diff --git a/src/text.cpp b/src/text.cpp
deleted file mode 100644
index 85290a073..000000000
--- a/src/text.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <string>
-#include <strings.h>
-#include <Context.h>
-#include <Lexer.h>
-#include <math.h>
-#include <util.h>
-#include <shared.h>
-#include <text.h>
-#include <utf8.h>
-#include <i18n.h>
-
-extern Context context;
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/text.h b/src/text.h
deleted file mode 100644
index 16b91c3c1..000000000
--- a/src/text.h
+++ /dev/null
@@ -1,38 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_TEXT
-#define INCLUDED_TEXT
-
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-// text.cpp, Non-UTF-8 aware.
-
-#endif
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.cpp b/src/util.cpp
index e001c2e4c..bd330eceb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -53,7 +53,6 @@
 #include <sys/select.h>
 
 #include <Lexer.h>
-#include <text.h>
 #include <utf8.h>
 #include <main.h>
 #include <i18n.h>

From 06f177534db8704e22688bf2b63095662e5959a9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 19:56:59 -0500
Subject: [PATCH 161/879] libshared: Updated to
 9685a22c90ca6f832748f8c71bae3cfad352bc64

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index dfb31a41c..9685a22c9 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit dfb31a41ced0fe48d98efa2b55689201d8e19667
+Subproject commit 9685a22c90ca6f832748f8c71bae3cfad352bc64

From f684e821d47cbb54d6090e8dab709c0aa6abc9ca Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 20:00:30 -0500
Subject: [PATCH 162/879] Task: Migrated from Nibbler to Pig

---
 src/Task.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index a8a2e2ef1..e8b82905c 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -39,7 +39,7 @@
 #include <Lexer.h>
 #ifdef PRODUCT_TASKWARRIOR
 #include <Context.h>
-#include <Nibbler.h>
+#include <Pig.h>
 #endif
 #include <ISO8601.h>
 #ifdef PRODUCT_TASKWARRIOR
@@ -576,24 +576,24 @@ void Task::parse (const std::string& input)
 
     if (input[0] == '[')
     {
-      Nibbler n (input);
+      Pig pig (input);
       std::string line;
-      if (n.skip     ('[')       &&
-          n.getUntil (']', line) &&
-          n.skip     (']')       &&
-          (n.skip ('\n') || n.depleted ()))
+      if (pig.skip     ('[')       &&
+          pig.getUntil (']', line) &&
+          pig.skip     (']')       &&
+          (pig.skip ('\n') || pig.eos ()))
       {
         if (line.length () == 0)
           throw std::string (STRING_RECORD_EMPTY);
 
-        Nibbler nl (line);
+        Pig attLine (line);
         std::string name;
         std::string value;
-        while (!nl.depleted ())
+        while (!attLine.eos ())
         {
-          if (nl.getUntil (':', name) &&
-              nl.skip (':')           &&
-              nl.getQuoted ('"', value))
+          if (attLine.getUntil (':', name) &&
+              attLine.skip (':')           &&
+              attLine.getQuoted ('"', value))
           {
 #ifdef PRODUCT_TASKWARRIOR
             legacyAttributeMap (name);
@@ -605,11 +605,11 @@ void Task::parse (const std::string& input)
             data[name] = decode (json::decode (value));
           }
 
-          nl.skip (' ');
+          attLine.skip (' ');
         }
 
         std::string remainder;
-        nl.getUntilEOS (remainder);
+        attLine.getRemainder (remainder);
         if (remainder.length ())
           throw std::string (STRING_RECORD_JUNK_AT_EOL);
       }

From c571f6b4fb4084073806b07b182350de679670e6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 20:33:13 -0500
Subject: [PATCH 163/879] Msg: Migrated to use libshared

---
 src/CMakeLists.txt  |   2 +-
 src/Msg.cpp         | 107 --------------------------------------------
 src/Msg.h           |  53 ----------------------
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/msg.t.cpp      |  73 ------------------------------
 6 files changed, 2 insertions(+), 236 deletions(-)
 delete mode 100644 src/Msg.cpp
 delete mode 100644 src/Msg.h
 delete mode 100644 test/msg.t.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 564c68f73..d6ae2e22a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library (task CLI2.cpp CLI2.h
                   Hooks.cpp Hooks.h
                   ISO8601.cpp ISO8601.h
                   Lexer.cpp Lexer.h
-                  Msg.cpp Msg.h
                   Nibbler.cpp Nibbler.h
                   TDB2.cpp TDB2.h
                   Task.cpp Task.h
@@ -38,6 +37,7 @@ add_library (libshared libshared/src/Datetime.cpp      libshared/src/Datetime.h
                        libshared/src/Duration.cpp      libshared/src/Duration.h
                        libshared/src/FS.cpp            libshared/src/FS.h
                        libshared/src/JSON.cpp          libshared/src/JSON.h
+                       libshared/src/Msg.cpp           libshared/src/Msg.h
                        libshared/src/Pig.cpp           libshared/src/Pig.h
                        libshared/src/RX.cpp            libshared/src/RX.h
                        libshared/src/Table.cpp         libshared/src/Table.h
diff --git a/src/Msg.cpp b/src/Msg.cpp
deleted file mode 100644
index 86efa0930..000000000
--- a/src/Msg.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Msg.h>
-#include <Lexer.h>
-#include <shared.h>
-
-////////////////////////////////////////////////////////////////////////////////
-void Msg::set (const std::string& name, const std::string& value)
-{
-  _header[name] = value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Msg::get (const std::string& name) const
-{
-  auto i = _header.find (name);
-  if (i != _header.end ())
-    return i->second;
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Msg::setPayload (const std::string& payload)
-{
-  _payload = payload;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Msg::getPayload () const
-{
-  return _payload;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> Msg::all () const
-{
-  std::vector <std::string> names;
-  for (auto& i : _header)
-    names.push_back (i.first);
-
-  return names;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Msg::serialize () const
-{
-  std::string output;
-  for (auto& i : _header)
-    output += i.first + ": " + i.second + '\n';
-
-  output += '\n' + _payload + '\n';
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Msg::parse (const std::string& input)
-{
-  _header.clear ();
-  _payload = "";
-
-  auto separator = input.find ("\n\n");
-  if (separator == std::string::npos)
-    throw std::string ("ERROR: Malformed message");
-
-  // Parse header.
-  for (auto& i : split (input.substr (0, separator), '\n'))
-  {
-    auto delimiter = i.find (':');
-    if (delimiter == std::string::npos)
-      throw std::string ("ERROR: Malformed message header '") + i + '\'';
-
-    _header[Lexer::trim (i.substr (0, delimiter))] = Lexer::trim (i.substr (delimiter + 1));
-  }
-
-  // Parse payload.
-  _payload = input.substr (separator + 2);
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Msg.h b/src/Msg.h
deleted file mode 100644
index 72736b6d2..000000000
--- a/src/Msg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_MSG
-#define INCLUDED_MSG
-
-#include <map>
-#include <vector>
-#include <string>
-
-class Msg
-{
-public:
-  void set (const std::string&, const std::string&);
-  std::string get (const std::string&) const;
-
-  void setPayload (const std::string&);
-  std::string getPayload () const;
-
-  std::vector <std::string> all () const;
-  std::string serialize () const;
-  bool parse (const std::string&);
-
-private:
-  std::map <std::string, std::string> _header {};
-  std::string _payload                        {""};
-};
-
-#endif
-
diff --git a/test/.gitignore b/test/.gitignore
index c0a96c1c5..0d38f628a 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -11,7 +11,6 @@ eval.t
 iso8601d.t
 iso8601p.t
 lexer.t
-msg.t
 nibbler.t
 t.t
 taskmod.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3dc02f2ba..20a3c0512 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t color.t config.t msg.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t color.t config.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/msg.t.cpp b/test/msg.t.cpp
deleted file mode 100644
index dd5f469dd..000000000
--- a/test/msg.t.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Context.h>
-#include <Msg.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (13);
-
-  Msg m;
-  t.is (m.serialize (), "\n\n",        "Msg::serialize '' --> '\\n\\n'");
-
-  m.set ("name", "value");
-  t.is (m.serialize (), "name: value\n\n\n",
-                                       "Msg::serialize 1 var");
-
-  m.set ("foo", "bar");
-  t.is (m.serialize (), "foo: bar\nname: value\n\n\n",
-                                       "Msg::serialize 2 vars");
-
-  m.setPayload ("payload");
-  t.is (m.serialize (), "foo: bar\nname: value\n\npayload\n",
-                                       "Msg::serialize 2 vars + payload");
-
-  Msg m2;
-  t.ok (m2.parse ("foo: bar\nname: value\n\npayload\n"),
-                                       "Msg::parse ok");
-  t.is (m2.get ("foo"),   "bar",       "Msg::get");
-  t.is (m2.get ("name"),  "value",     "Msg::get");
-  t.is (m2.getPayload (), "payload\n", "Msg::getPayload");
-
-  Msg m3;
-  t.ok (m3.parse ("foo:bar\nname:   value\n\npayload\n"),
-                                       "Msg::parse ok");
-  t.is (m3.get ("foo"),   "bar",       "Msg::get");
-  t.is (m3.get ("name"),  "value",     "Msg::get");
-  t.is (m3.getPayload (), "payload\n", "Msg::getPayload");
-  t.ok (m3.all () == std::vector <std::string> {"foo", "name"},
-                                       "Msg::all --> {'foo', 'name'}");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 6bfb3fab3c6018511719408a9c4160618525b067 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 20:52:54 -0500
Subject: [PATCH 164/879] DOM: Migrated from Nibbler to Lexer

---
 src/DOM.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 88b6c3c65..74f063bbe 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -30,6 +30,7 @@
 #include <map>
 #include <stdlib.h>
 #include <Variant.h>
+#include <Lexer.h>
 #include <Context.h>
 #include <ISO8601.h>
 #include <shared.h>
@@ -193,26 +194,25 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
   auto elements = split (name, '.');
 
   Task ref (task);
-  Nibbler n (elements[0]);
-  n.save ();
-  int id;
-  std::string uuid;
-
-  // If elements[0] is a UUID, load that task (if necessary), and clobber ref.
-  if (n.getPartialUUID (uuid) && n.depleted ())
+  Lexer lexer (elements[0]);
+  std::string token;
+  Lexer::Type type;
+  if (lexer.token (token, type))
   {
-    if (uuid != ref.get ("uuid"))
-      context.tdb2.get (uuid, ref);
-
-    // Eat elements[0]/UUID.
-    elements.erase (elements.begin ());
-  }
-  else
-  {
-    // If elements[0] is a ID, load that task (if necessary), and clobber ref.
-    if (n.getInt (id) && n.depleted ())
+    if (type == Lexer::Type::uuid &&
+        token.length () == elements[0].length ())
     {
-      if (id != ref.id)
+      if (token != ref.get ("uuid"))
+        context.tdb2.get (token, ref);
+
+      // Eat elements[0]/UUID.
+      elements.erase (elements.begin ());
+    }
+    else if (type == Lexer::Type::number &&
+             token.find ('.') == std::string::npos)
+    {
+      auto id = strtol (token.c_str (), NULL, 10);
+      if (id && id != ref.id)
         context.tdb2.get (id, ref);
 
       // Eat elements[0]/ID.

From b344f95e9786472c6b4062aea9d988a37527a9be Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:03:15 -0500
Subject: [PATCH 165/879] Variant: Converted from ISO8601p to Duration

---
 src/Variant.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index a4a287515..0bcdbe898 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -32,6 +32,8 @@
 #include <stdlib.h>
 #include <Variant.h>
 #include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <Lexer.h>
 #include <RX.h>
 #include <shared.h>
@@ -1730,10 +1732,10 @@ Variant::operator std::string () const
     return _string;
 
   case type_date:
-    return ISO8601d (_date).toISOLocalExtended ();
+    return Datetime (_date).toISOLocalExtended ();
 
   case type_duration:
-    return ISO8601p (_duration).format ();
+    return Duration (_duration).formatISO ();
   }
 
   return "";
@@ -1836,11 +1838,11 @@ void Variant::cast (const enum type new_type)
         }
 
         pos = 0;
-        ISO8601p isop;
+        Duration isop;
         if (isop.parse (_string, pos) &&
             pos == _string.length ())
         {
-          _date = ISO8601d ().toEpoch () + (time_t) isop;
+          _date = ISO8601d ().toEpoch () + isop.toTime_t ();
           break;
         }
 
@@ -1855,11 +1857,11 @@ void Variant::cast (const enum type new_type)
       {
         _duration = 0;
         std::string::size_type pos = 0;
-        ISO8601p iso;
+        Duration iso;
         if (iso.parse (_string, pos) &&
             pos == _string.length ())
         {
-          _duration = (time_t) iso;
+          _duration = iso.toTime_t ();
         }
       }
       break;

From 43d49d17d0802c9d2daf21959cd9e2d930342227 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:07:06 -0500
Subject: [PATCH 166/879] sort: Converted from ISO8601p to Duration

---
 src/sort.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sort.cpp b/src/sort.cpp
index 055fc6f66..35c8194cc 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -30,7 +30,7 @@
 #include <string>
 #include <stdlib.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Duration.h>
 #include <Task.h>
 #include <shared.h>
 #include <format.h>
@@ -190,8 +190,8 @@ static bool sort_compare (int left, int right)
       if (left_string == right_string)
         continue;
 
-      ISO8601p left_duration (left_string);
-      ISO8601p right_duration (right_string);
+      Duration left_duration (left_string);
+      Duration right_duration (right_string);
       return ascending ? (left_duration < right_duration)
                        : (left_duration > right_duration);
     }
@@ -266,8 +266,8 @@ static bool sort_compare (int left, int right)
         if (left_string == right_string)
           continue;
 
-        ISO8601p left_duration (left_string);
-        ISO8601p right_duration (right_string);
+        Duration left_duration (left_string);
+        Duration right_duration (right_string);
         return ascending ? (left_duration < right_duration)
                          : (left_duration > right_duration);
       }

From 12459e8c8bd607e3570a7849e746bb5639aea105 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:13:07 -0500
Subject: [PATCH 167/879] Task: Converted from ISO8601p to Duration

---
 src/Task.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index e8b82905c..552bc2729 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -41,6 +41,7 @@
 #include <Context.h>
 #include <Pig.h>
 #endif
+#include <Duration.h>
 #include <ISO8601.h>
 #ifdef PRODUCT_TASKWARRIOR
 #include <RX.h>
@@ -1544,9 +1545,9 @@ void Task::validate (bool applyDefault /* = true */)
     {
       if (context.columns["due"]->validate (Task::defaultDue))
       {
-        ISO8601p dur (Task::defaultDue);
-        if ((time_t) dur != 0)
-          set ("due", (ISO8601d () + dur).toEpoch ());
+        Duration dur (Task::defaultDue);
+        if (dur.toTime_t () != 0)
+          set ("due", (ISO8601d () + dur.toTime_t ()).toEpoch ());
         else
           set ("due", ISO8601d (Task::defaultDue).toEpoch ());
       }
@@ -1612,7 +1613,7 @@ void Task::validate (bool applyDefault /* = true */)
     std::string value = get ("recur");
     if (value != "")
     {
-      ISO8601p p;
+      Duration p;
       std::string::size_type i = 0;
       if (! p.parse (value, i))
         throw format (STRING_TASK_VALID_RECUR, value);

From cf4bd29d4429c456106904f913a519efe1305010 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:32:41 -0500
Subject: [PATCH 168/879] recur: Converted from ISO8601p to Duration

---
 src/recur.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 9a09f9a12..d2800f244 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -40,6 +40,7 @@
 #include <Context.h>
 #include <Lexer.h>
 #include <ISO8601.h>
+#include <Duration.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -364,14 +365,12 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
   }
 
   // Add the period to current, and we're done.
-  int secs = 0;
   std::string::size_type idx = 0;
-  ISO8601p p;
+  Duration p;
   if (! p.parse (period, idx))
     throw std::string (format (STRING_TASK_VALID_RECUR, period));
 
-  secs = (time_t) p;
-  return current + secs;
+  return current + p.toTime_t ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 26aa2761c01ff4d432ac4f585f7ff7044a8c502d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:39:27 -0500
Subject: [PATCH 169/879] feedback: Migrated from ISO8601 to Datetime/Duration

---
 src/feedback.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/feedback.cpp b/src/feedback.cpp
index 3a96f473d..bbb9e057b 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -33,7 +33,8 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <Lexer.h>
 #include <main.h>
 #include <shared.h>
@@ -183,7 +184,7 @@ std::string taskInfoDifferences (
     else if (name == "start")
     {
       out << format (STRING_FEEDBACK_ATT_DEL_DUR, Lexer::ucFirst (name),
-                     ISO8601p (current_timestamp - last_timestamp).format ())
+                     Duration (current_timestamp - last_timestamp).format ())
           << "\n";
     }
     else
@@ -272,7 +273,7 @@ std::string renderAttribute (const std::string& name, const std::string& value,
         col->type () == "date" &&
         value != "")
     {
-      ISO8601d d ((time_t)strtol (value.c_str (), NULL, 10));
+      Datetime d ((time_t)strtol (value.c_str (), NULL, 10));
       if (format == "")
         return d.toString (context.config.get ("dateformat"));
 

From c0c476e53dca00297c75158b3577a9d3fd3c2e95 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:46:46 -0500
Subject: [PATCH 170/879] DOM: Converted from ISO8601 to Datetime/Duration

- In addition fixed the week number of 2011-09-01 to 35, therefore the
  tests change also.
---
 src/DOM.cpp | 13 +++++++------
 test/dom.t  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 74f063bbe..eba6b30aa 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -32,7 +32,8 @@
 #include <Variant.h>
 #include <Lexer.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <shared.h>
 #include <format.h>
 #include <util.h>
@@ -261,12 +262,12 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
       {
         auto period = ref.get (canonical);
 
-        ISO8601p iso;
+        Duration iso;
         std::string::size_type cursor = 0;
         if (iso.parse (period, cursor))
-          value = Variant ((time_t) iso, Variant::type_duration);
+          value = Variant (iso.toTime_t (), Variant::type_duration);
         else
-          value = Variant ((time_t) ISO8601p (ref.get (canonical)), Variant::type_duration);
+          value = Variant (Duration (ref.get (canonical)).toTime_t (), Variant::type_duration);
       }
       else if (column->type () == "numeric")
         value = Variant (ref.get_float (canonical));
@@ -284,7 +285,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 
     if (ref.data.size () && size == 2 && column && column->type () == "date")
     {
-      ISO8601d date (ref.get_date (canonical));
+      Datetime date (ref.get_date (canonical));
            if (elements[1] == "year")    { value = Variant (static_cast<int> (date.year ()));      return true; }
       else if (elements[1] == "month")   { value = Variant (static_cast<int> (date.month ()));     return true; }
       else if (elements[1] == "day")     { value = Variant (static_cast<int> (date.day ()));       return true; }
@@ -348,7 +349,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
         // <annotations>.<N>.entry.hour
         // <annotations>.<N>.entry.minute
         // <annotations>.<N>.entry.second
-        ISO8601d date (i.first.substr (11));
+        Datetime date (i.first.substr (11));
              if (elements[3] == "year")    { value = Variant (static_cast<int> (date.year ()));      return true; }
         else if (elements[3] == "month")   { value = Variant (static_cast<int> (date.month ()));     return true; }
         else if (elements[3] == "day")     { value = Variant (static_cast<int> (date.day ()));       return true; }
diff --git a/test/dom.t b/test/dom.t
index d26032836..b741603f8 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -124,7 +124,7 @@ class TestDOM(TestCase):
     def test_dom_due_week(self):
         """ DOM 3.due.week """
         code, out, err = self.t("_get 3.due.week")
-        self.assertEqual("36\n", out)
+        self.assertEqual("35\n", out)
 
     def test_dom_due_weekday(self):
         """ DOM 3.due.weekday """

From 28bcb7e491c619023157ffd721099a5062b1da25 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 21:52:30 -0500
Subject: [PATCH 171/879] ColTypeDate: Converted fomr ISO8601 to
 Datetime/Duration

---
 src/columns/ColTypeDate.cpp | 57 +++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index c996f3f4f..357c9d6ce 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -27,7 +27,8 @@
 #include <cmake.h>
 #include <ColTypeDate.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
@@ -54,16 +55,16 @@ ColumnTypeDate::ColumnTypeDate ()
                 "remaining",
                 "countdown"};
 
-  ISO8601d now;
+  Datetime now;
   now -= 125; // So that "age" is non-zero.
   _examples = {now.toString (context.config.get ("dateformat")),
                format (now.toJulian (), 13, 12),
                now.toEpochString (),
                now.toISO (),
-               ISO8601p (ISO8601d () - now).formatVague (),
-               '-' + ISO8601p (ISO8601d () - now).formatVague (),
+               Duration (Datetime () - now).formatVague (),
+               '-' + Duration (Datetime () - now).formatVague (),
                "",
-               ISO8601p (ISO8601d () - now).format ()};
+               Duration (Datetime () - now).format ()};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -74,7 +75,7 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
 
   if (task.has (_name))
   {
-    ISO8601d date (task.get_date (_name));
+    Datetime date (task.get_date (_name));
 
     if (_style == "default" ||
         _style == "formatted")
@@ -89,12 +90,12 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
       if (format == "")
         format = context.config.get ("dateformat");
 
-      minimum = maximum = ISO8601d::length (format);
+      minimum = maximum = Datetime::length (format);
     }
     else if (_style == "countdown")
     {
-      ISO8601d now;
-      minimum = maximum = ISO8601p (now - date).formatVague ().length ();
+      Datetime now;
+      minimum = maximum = Duration (now - date).formatVague ().length ();
     }
     else if (_style == "julian")
     {
@@ -110,25 +111,25 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
     }
     else if (_style == "age")
     {
-      ISO8601d now;
+      Datetime now;
       if (now > date)
-        minimum = maximum = ISO8601p (now - date).formatVague ().length ();
+        minimum = maximum = Duration (now - date).formatVague ().length ();
       else
-        minimum = maximum = ISO8601p (date - now).formatVague ().length () + 1;
+        minimum = maximum = Duration (date - now).formatVague ().length () + 1;
     }
     else if (_style == "relative")
     {
-      ISO8601d now;
+      Datetime now;
       if (now < date)
-        minimum = maximum = ISO8601p (date - now).formatVague ().length ();
+        minimum = maximum = Duration (date - now).formatVague ().length ();
       else
-        minimum = maximum = ISO8601p (now - date).formatVague ().length () + 1;
+        minimum = maximum = Duration (now - date).formatVague ().length () + 1;
     }
     else if (_style == "remaining")
     {
-      ISO8601d now;
+      Datetime now;
       if (date > now)
-        minimum = maximum = ISO8601p (date - now).formatVague ().length ();
+        minimum = maximum = Duration (date - now).formatVague ().length ();
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -144,7 +145,7 @@ void ColumnTypeDate::render (
 {
   if (task.has (_name))
   {
-    ISO8601d date (task.get_date (_name));
+    Datetime date (task.get_date (_name));
 
     if (_style == "default" ||
         _style == "formatted")
@@ -165,8 +166,8 @@ void ColumnTypeDate::render (
     }
     else if (_style == "countdown")
     {
-      ISO8601d now;
-      renderStringRight (lines, width, color, ISO8601p (now - date).formatVague ());
+      Datetime now;
+      renderStringRight (lines, width, color, Duration (now - date).formatVague ());
     }
     else if (_style == "julian")
       renderStringRight (lines, width, color, format (date.toJulian (), 13, 12));
@@ -179,26 +180,26 @@ void ColumnTypeDate::render (
 
     else if (_style == "age")
     {
-      ISO8601d now;
+      Datetime now;
       if (now > date)
-        renderStringLeft (lines, width, color, ISO8601p (now - date).formatVague ());
+        renderStringLeft (lines, width, color, Duration (now - date).formatVague ());
       else
-        renderStringLeft (lines, width, color, '-' + ISO8601p (date - now).formatVague ());
+        renderStringLeft (lines, width, color, '-' + Duration (date - now).formatVague ());
     }
     else if (_style == "relative")
     {
-      ISO8601d now;
+      Datetime now;
       if (now < date)
-        renderStringLeft (lines, width, color, ISO8601p (date - now).formatVague ());
+        renderStringLeft (lines, width, color, Duration (date - now).formatVague ());
       else
-        renderStringLeft (lines, width, color, '-' + ISO8601p (now - date).formatVague ());
+        renderStringLeft (lines, width, color, '-' + Duration (now - date).formatVague ());
     }
 
     else if (_style == "remaining")
     {
-      ISO8601d now;
+      Datetime now;
       if (date > now)
-        renderStringRight (lines, width, color, ISO8601p (date - now).formatVague ());
+        renderStringRight (lines, width, color, Duration (date - now).formatVague ());
     }
   }
 }

From 1a4db03d5e8c8c59c7063d60540095270900300d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 22:06:47 -0500
Subject: [PATCH 172/879] CmdEdit: Converted from ISO8601 to Datetime/Duration

---
 src/commands/CmdEdit.cpp | 53 ++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index a43e99bde..9e6b52e80 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -33,7 +33,8 @@
 #include <algorithm>
 #include <unistd.h>
 #include <cerrno>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <Context.h>
 #include <Lexer.h>
 #include <Filter.h>
@@ -174,10 +175,7 @@ std::string CmdEdit::formatDate (
 {
   std::string value = task.get (attribute);
   if (value.length ())
-  {
-    ISO8601d dt (value);
-    value = dt.toString (dateformat);
-  }
+    value = Datetime (value).toString (dateformat);
 
   return value;
 }
@@ -189,10 +187,7 @@ std::string CmdEdit::formatDuration (
 {
   std::string value = task.get (attribute);
   if (value.length ())
-  {
-    ISO8601p dur (value);
-    value = dur.format ();
-  }
+    value = Duration (value).formatISO ();
 
   return value;
 }
@@ -258,12 +253,12 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   task.getAnnotations (annotations);
   for (auto& anno : annotations)
   {
-    ISO8601d dt (strtol (anno.first.substr (11).c_str (), NULL, 10));
+    Datetime dt (strtol (anno.first.substr (11).c_str (), NULL, 10));
     before << "  Annotation:        " << dt.toString (dateformat)
            << " -- "                  << json::encode (anno.second) << '\n';
   }
 
-  ISO8601d now;
+  Datetime now;
   before << "  Annotation:        " << now.toString (dateformat) << " -- \n";
 
   // Add dependencies here.
@@ -386,7 +381,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     if (formatted != value)
     {
       context.footnote (STRING_EDIT_ENTRY_MOD);
-      task.set ("entry", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("entry", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
@@ -403,13 +398,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_START_MOD);
-        task.set ("start", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("start", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
       context.footnote (STRING_EDIT_START_MOD);
-      task.set ("start", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("start", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
@@ -432,7 +427,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_END_MOD);
-        task.set ("end", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("end", Datetime (value, dateformat).toEpochString ());
       }
     }
     else if (task.getStatus () != Task::deleted)
@@ -459,13 +454,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_SCHED_MOD);
-        task.set ("scheduled", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("scheduled", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
       context.footnote (STRING_EDIT_SCHED_MOD);
-      task.set ("scheduled", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("scheduled", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
@@ -489,13 +484,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_DUE_MOD);
-        task.set ("due", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("due", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
       context.footnote (STRING_EDIT_DUE_MOD);
-      task.set ("due", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("due", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
@@ -526,13 +521,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_UNTIL_MOD);
-        task.set ("until", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("until", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
       context.footnote (STRING_EDIT_UNTIL_MOD);
-      task.set ("until", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("until", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
@@ -550,7 +545,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      ISO8601p p;
+      Duration p;
       std::string::size_type idx = 0;
       if (p.parse (value, idx))
       {
@@ -588,14 +583,14 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (formatted != value)
       {
         context.footnote (STRING_EDIT_WAIT_MOD);
-        task.set ("wait", ISO8601d (value, dateformat).toEpochString ());
+        task.set ("wait", Datetime (value, dateformat).toEpochString ());
         task.setStatus (Task::waiting);
       }
     }
     else
     {
       context.footnote (STRING_EDIT_WAIT_MOD);
-      task.set ("wait", ISO8601d (value, dateformat).toEpochString ());
+      task.set ("wait", Datetime (value, dateformat).toEpochString ());
       task.setStatus (Task::waiting);
     }
   }
@@ -649,7 +644,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
         // for each line: if the annotation is the same, then it is copied; if
         // the annotation is modified, then its original date may be kept; and
         // if there is no corresponding id, then a new unique date is created).
-        ISO8601d when (value.substr (0, gap), dateformat);
+        Datetime when (value.substr (0, gap), dateformat);
 
         // If the map already contains a annotation for a given timestamp
         // we need to increment until we find an unused key
@@ -694,9 +689,9 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       std::string value = findValue (after, "\n  UDA " + col.first + ":");
       if ((task.get (col.first) != value) && (type != "date" ||
-           (task.get (col.first) != ISO8601d (value, dateformat).toEpochString ())) &&
+           (task.get (col.first) != Datetime (value, dateformat).toEpochString ())) &&
            (type != "duration" ||
-           (task.get (col.first) != (std::string) ISO8601p (value))))
+           (task.get (col.first) != Duration (value).toString ())))
       {
         if (value != "")
         {
@@ -718,11 +713,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
           }
           else if (type == "date")
           {
-            task.set (col.first, ISO8601d (value, dateformat).toEpochString ());
+            task.set (col.first, Datetime (value, dateformat).toEpochString ());
           }
           else if (type == "duration")
           {
-            task.set (col.first, (time_t) ISO8601p (value));
+            task.set (col.first, Duration (value).toTime_t ());
           }
         }
         else

From 046763750023a2567bc9196513204fa776ed5780 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 22:21:06 -0500
Subject: [PATCH 173/879] ColRecur: Converted from ISO8601 to Duration

---
 src/columns/ColRecur.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index aa1c85397..129c0e4ac 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <ColRecur.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Duration.h>
 #include <Eval.h>
 #include <Variant.h>
 #include <Lexer.h>
@@ -73,7 +73,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     if (_style == "default" ||
         _style == "duration")
     {
-      minimum = maximum = ISO8601p (task.get ("recur")).format ().length ();
+      minimum = maximum = Duration (task.get ("recur")).formatISO ().length ();
     }
     else if (_style == "indicator")
     {
@@ -98,7 +98,7 @@ void ColumnRecur::render (
   {
     if (_style == "default" ||
         _style == "duration")
-      renderStringRight (lines, width, color, ISO8601p (task.get ("recur")).format ());
+      renderStringRight (lines, width, color, Duration (task.get ("recur")).formatISO ());
 
     else if (_style == "indicator")
       renderStringRight (lines, width, color, context.config.get ("recurrence.indicator"));

From d26fa9b04ba8320880e914a76006e96a8edbb6fd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 22:23:53 -0500
Subject: [PATCH 174/879] ColUDA: Converted from ISO8601 to Datetime/Duration

---
 src/columns/ColUDA.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index d2f316a3c..b59e4c562 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -27,7 +27,8 @@
 #include <cmake.h>
 #include <ColUDA.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
@@ -265,14 +266,14 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
         //   rc.report.<report>.dateformat
         //   rc.dateformat.report
         //   rc.dateformat
-        ISO8601d date ((time_t) strtol (value.c_str (), NULL, 10));
+        Datetime date ((time_t) strtol (value.c_str (), NULL, 10));
         std::string format = context.config.get ("report." + _report + ".dateformat");
         if (format == "")
           format = context.config.get ("dateformat.report");
         if (format == "")
           format = context.config.get ("dateformat");
 
-        minimum = maximum = ISO8601d::length (format);
+        minimum = maximum = Datetime::length (format);
       }
     }
     else if (_style == "indicator")
@@ -318,7 +319,7 @@ void ColumnUDADate::render (
           format = context.config.get ("dateformat");
       }
 
-      renderStringLeft (lines, width, color, ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
+      renderStringLeft (lines, width, color, Datetime ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
     }
     else if (_style == "indicator")
     {
@@ -374,7 +375,7 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int
     {
       std::string value = task.get (_name);
       if (value != "")
-        minimum = maximum = ISO8601p (value).format ().length ();
+        minimum = maximum = Duration (value).formatISO ().length ();
     }
     else if (_style == "indicator")
     {
@@ -406,7 +407,7 @@ void ColumnUDADuration::render (
     if (_style == "default")
     {
       std::string value = task.get (_name);
-      renderStringRight (lines, width, color, ISO8601p (value).format ());
+      renderStringRight (lines, width, color, Duration (value).formatISO ());
     }
     else if (_style == "indicator")
     {

From 86d3ec5cee9e2d2b7495780405fc9aebd7a9c11b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 22:27:18 -0500
Subject: [PATCH 175/879] CmdInfo: Converted from ISO8601 to Datetime/Duration

---
 src/commands/CmdInfo.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 9aa8b9b6c..7b87870ae 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -31,7 +31,8 @@
 #include <math.h>
 #include <Context.h>
 #include <Filter.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <main.h>
 #include <shared.h>
 #include <format.h>
@@ -114,7 +115,7 @@ int CmdInfo::execute (std::string& output)
       view.colorHeader (label);
     }
 
-    ISO8601d now;
+    Datetime now;
 
     // id
     int row = view.addRow ();
@@ -134,7 +135,7 @@ int CmdInfo::execute (std::string& output)
     for (auto& anno : annotations)
       description += '\n'
                    + std::string (indent, ' ')
-                   + ISO8601d (anno.first.substr (11)).toString (dateformatanno)
+                   + Datetime (anno.first.substr (11)).toString (dateformatanno)
                    + ' '
                    + anno.second;
 
@@ -222,15 +223,15 @@ int CmdInfo::execute (std::string& output)
     // entry
     row = view.addRow ();
     view.set (row, 0, STRING_COLUMN_LABEL_ENTERED);
-    ISO8601d dt (task.get_date ("entry"));
+    Datetime dt (task.get_date ("entry"));
     std::string entry = dt.toString (dateformat);
 
     std::string age;
     std::string created = task.get ("entry");
     if (created.length ())
     {
-      ISO8601d dt (strtol (created.c_str (), NULL, 10));
-      age = ISO8601p (now - dt).formatVague ();
+      Datetime dt (strtol (created.c_str (), NULL, 10));
+      age = Duration (now - dt).formatVague ();
     }
 
     view.set (row, 1, entry + " (" + age + ')');
@@ -240,7 +241,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_WAITING);
-      view.set (row, 1, ISO8601d (task.get_date ("wait")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("wait")).toString (dateformat));
     }
 
     // scheduled
@@ -248,7 +249,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_SCHED);
-      view.set (row, 1, ISO8601d (task.get_date ("scheduled")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("scheduled")).toString (dateformat));
     }
 
     // start
@@ -256,7 +257,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_START);
-      view.set (row, 1, ISO8601d (task.get_date ("start")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("start")).toString (dateformat));
     }
 
     // due (colored)
@@ -264,7 +265,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_DUE);
-      view.set (row, 1, ISO8601d (task.get_date ("due")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("due")).toString (dateformat));
     }
 
     // end
@@ -272,7 +273,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_COLUMN_LABEL_END);
-      view.set (row, 1, ISO8601d (task.get_date ("end")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("end")).toString (dateformat));
     }
 
     // until
@@ -280,7 +281,7 @@ int CmdInfo::execute (std::string& output)
     {
       row = view.addRow ();
       view.set (row, 0, STRING_CMD_INFO_UNTIL);
-      view.set (row, 1, ISO8601d (task.get_date ("until")).toString (dateformat));
+      view.set (row, 1, Datetime (task.get_date ("until")).toString (dateformat));
     }
 
     // modified
@@ -289,8 +290,8 @@ int CmdInfo::execute (std::string& output)
       row = view.addRow ();
       view.set (row, 0, STRING_CMD_INFO_MODIFIED);
 
-      ISO8601d mod (task.get_date ("modified"));
-      std::string age = ISO8601p (now - mod).formatVague ();
+      Datetime mod (task.get_date ("modified"));
+      std::string age = Duration (now - mod).formatVague ();
       view.set (row, 1, mod.toString (dateformat) + " (" + age + ')');
     }
 
@@ -375,13 +376,13 @@ int CmdInfo::execute (std::string& output)
             view.set (row, 0, col->label ());
 
             if (type == "date")
-              value = ISO8601d (value).toString (dateformat);
+              value = Datetime (value).toString (dateformat);
             else if (type == "duration")
             {
-              ISO8601p iso;
+              Duration iso;
               std::string::size_type cursor = 0;
               if (iso.parse (value, cursor))
-                value = (std::string) Variant ((time_t) iso, Variant::type_duration);
+                value = (std::string) Variant (iso.toTime_t (), Variant::type_duration);
               else
                 value = "PT0S";
             }
@@ -546,7 +547,7 @@ int CmdInfo::execute (std::string& output)
           {
             int row = journal.addRow ();
 
-            ISO8601d timestamp (strtol (undo[when].substr (5).c_str (), NULL, 10));
+            Datetime timestamp (strtol (undo[when].substr (5).c_str (), NULL, 10));
             journal.set (row, 0, timestamp.toString (dateformat));
 
             Task before (undo[previous].substr (4));

From 6b55c54af90a023cf6f191135b66dad2fec891e8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 23:13:27 -0500
Subject: [PATCH 176/879] CmdBurndown: Converted from ISO8601 to Duration

---
 src/commands/CmdBurndown.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index ad43dd664..0bfd94475 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -35,6 +35,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <ISO8601.h>
+#include <Duration.h>
 #include <main.h>
 #include <i18n.h>
 #include <shared.h>
@@ -838,14 +839,14 @@ void Chart::calculateRates ()
     rate_message << "Chart::calculateRates Net reduction is "
                  << (_peak_count - _current_count)
                  << " tasks in "
-                 << ISO8601p (now.toEpoch () - _peak_epoch).format ()
+                 << Duration (now.toEpoch () - _peak_epoch).formatISO ()
                  << " = "
                  << _net_fix_rate
                  << " tasks/d";
     context.debug (rate_message.str ());
 
-    ISO8601p delta (static_cast <time_t> (_current_count / fix_rate));
-    ISO8601d end = now + delta;
+    Duration delta (static_cast <time_t> (_current_count / fix_rate));
+    ISO8601d end = now + delta.toTime_t ();
 
     // Prefer dateformat.report over dateformat.
     std::string format = context.config.get ("dateformat.report");

From b53a585756c86c555c3b836824ffa6f9148872f1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 23:48:39 -0500
Subject: [PATCH 177/879] CmdSummary: Converted from ISO8601 to Duration

---
 src/commands/CmdSummary.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 85272c11a..f18d41278 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -32,7 +32,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <ViewText.h>
-#include <ISO8601.h>
+#include <Duration.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -175,7 +175,7 @@ int CmdSummary::execute (std::string& output)
 
       view.set (row, 1, countPending[i.first]);
       if (counter[i.first])
-        view.set (row, 2, ISO8601p ((int) (sumEntry[i.first] / (double)counter[i.first])).formatVague ());
+        view.set (row, 2, Duration ((int) (sumEntry[i.first] / (double)counter[i.first])).formatVague ());
 
       int c = countCompleted[i.first];
       int p = countPending[i.first];

From 2fb589b131a6b3613025cfc12862f9f3f737e5dd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Dec 2016 23:52:18 -0500
Subject: [PATCH 178/879] CmdStats: Converted from ISO8601 to Datetime/Duration

---
 src/commands/CmdStats.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 5d2df249a..eab173f39 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -30,7 +30,8 @@
 #include <iomanip>
 #include <stdlib.h>
 #include <ViewText.h>
-#include <ISO8601.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
@@ -90,7 +91,7 @@ int CmdStats::execute (std::string& output)
   std::vector <Task> filtered;
   filter.subset (all, filtered);
 
-  ISO8601d now;
+  Datetime now;
   time_t earliest   = time (NULL);
   time_t latest     = 1;
   int totalT        = 0;
@@ -238,47 +239,47 @@ int CmdStats::execute (std::string& output)
 
   if (filtered.size ())
   {
-    ISO8601d e (earliest);
+    Datetime e (earliest);
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_OLDEST);
     view.set (row, 1, e.toString (dateformat));
 
-    ISO8601d l (latest);
+    Datetime l (latest);
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_NEWEST);
     view.set (row, 1, l.toString (dateformat));
 
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_USED_FOR);
-    view.set (row, 1, ISO8601p (latest - earliest).formatVague ());
+    view.set (row, 1, Duration (latest - earliest).formatVague ());
   }
 
   if (totalT)
   {
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_ADD_EVERY);
-    view.set (row, 1, ISO8601p (((latest - earliest) / totalT)).formatVague ());
+    view.set (row, 1, Duration (((latest - earliest) / totalT)).formatVague ());
   }
 
   if (completedT)
   {
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_COMP_EVERY);
-    view.set (row, 1, ISO8601p ((latest - earliest) / completedT).formatVague ());
+    view.set (row, 1, Duration ((latest - earliest) / completedT).formatVague ());
   }
 
   if (deletedT)
   {
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_DEL_EVERY);
-    view.set (row, 1, ISO8601p ((latest - earliest) / deletedT).formatVague ());
+    view.set (row, 1, Duration ((latest - earliest) / deletedT).formatVague ());
   }
 
   if (pendingT || completedT)
   {
     row = view.addRow ();
     view.set (row, 0, STRING_CMD_STATS_AVG_PEND);
-    view.set (row, 1, ISO8601p ((int) ((daysPending / (pendingT + completedT)) * 86400)).formatVague ());
+    view.set (row, 1, Duration ((int) ((daysPending / (pendingT + completedT)) * 86400)).formatVague ());
   }
 
   if (totalT)

From b463c56c93749c74469b05fd42131091419991b7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 12 Dec 2016 08:28:06 -0500
Subject: [PATCH 179/879] Context: Removed unused class global

---
 src/Context.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index b4292ca7f..d330cfda3 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -38,6 +38,7 @@
 #include <FS.h>
 #include <Eval.h>
 #include <Variant.h>
+#include <Datetime.h>
 #include <ISO8601.h>
 #include <shared.h>
 #include <format.h>
@@ -689,7 +690,7 @@ void Context::staticInitialization ()
   Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
   Task::regex               = Variant::searchUsingRegex    = config.getBoolean ("regex");
   Lexer::dateFormat         = Variant::dateFormat          = config.get ("dateformat");
-  ISO8601p::isoEnabled      = ISO8601d::isoEnabled         = config.getBoolean ("date.iso");
+  Datetime::isoEnabled      = ISO8601d::isoEnabled         = config.getBoolean ("date.iso");
 
   TDB2::debug_mode          = config.getBoolean ("debug");
 

From abac5bdf487cb9482aab84b8a4ad8cf8d37156bf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 12 Dec 2016 08:28:24 -0500
Subject: [PATCH 180/879] util: Added missing include

---
 src/util.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util.cpp b/src/util.cpp
index bd330eceb..1752b39c1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -54,6 +54,7 @@
 
 #include <Lexer.h>
 #include <utf8.h>
+#include <util.h>
 #include <main.h>
 #include <i18n.h>
 

From 0721aae3538e928b91111fdb003409dbb621e50f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 12:59:05 -0500
Subject: [PATCH 181/879] L10N: Removed unused strings

---
 src/l10n/deu-DEU.h | 18 ------------------
 src/l10n/eng-USA.h | 18 ------------------
 src/l10n/epo-RUS.h | 18 ------------------
 src/l10n/esp-ESP.h | 18 ------------------
 src/l10n/fra-FRA.h | 18 ------------------
 src/l10n/ita-ITA.h | 18 ------------------
 src/l10n/jpn-JPN.h | 18 ------------------
 src/l10n/pol-POL.h | 18 ------------------
 src/l10n/por-PRT.h | 18 ------------------
 9 files changed, 162 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 8e7496067..aae7aea89 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
 #define STRING_FEEDBACK_BACKLOG      "Lokale Änderungen.  Datenabgleich erforderlich."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior hat die erforderlichen Rechte auf '{1}' nicht."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Fehler: Fehlender Wert nach ',' an Position {1}"
-#define STRING_JSON_MISSING_VALUE2   "Fehler: Fehlender Wert an Position {1}"
-#define STRING_JSON_MISSING_BRACKET  "Fehler: Fehlendes ']' an Position {1}"
-#define STRING_JSON_MISSING_BRACE    "Fehler: Fehlendes '}' an Position {1}"
-#define STRING_JSON_MISSING_COLON    "Fehler: Fehlendes ':' an Position {1}"
-#define STRING_JSON_MISSING_OPEN     "Fehler: '{' oder '[' an Position {1} erwartet"
-#define STRING_JSON_EXTRA_CHARACTERS "Fehler: Überschüssige Zeichen an position {1} gefunden"
-
 // Record
 #define STRING_RECORD_EMPTY          "Leerer Datensatz in der Eingabe."
 #define STRING_RECORD_JUNK_AT_EOL    "Unerkannte Zeichen am Ende der Eingabe."
@@ -1014,17 +1001,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (ja/nein) "
 #define STRING_UTIL_CONFIRM_YES      "ja"
 #define STRING_UTIL_CONFIRM_YES_U    "Ja"
 #define STRING_UTIL_CONFIRM_NO       "nein"
 #define STRING_UTIL_CONFIRM_ALL      "alle"
 #define STRING_UTIL_CONFIRM_ALL_U    "Alle"
 #define STRING_UTIL_CONFIRM_QUIT     "abbrechen"
-#define STRING_UTIL_GIBIBYTES        "GiB"
-#define STRING_UTIL_MEBIBYTES        "MiB"
-#define STRING_UTIL_KIBIBYTES        "KiB"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 75916f5f1..c0e477f1a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -793,10 +793,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
 #define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -815,15 +811,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Error: missing value after ',' at position {1}"
-#define STRING_JSON_MISSING_VALUE2   "Error: missing value at position {1}"
-#define STRING_JSON_MISSING_BRACKET  "Error: missing ']' at position {1}"
-#define STRING_JSON_MISSING_BRACE    "Error: missing '}' at position {1}"
-#define STRING_JSON_MISSING_COLON    "Error: missing ':' at position {1}"
-#define STRING_JSON_MISSING_OPEN     "Error: expected '{' or '[' at position {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Error: extra characters found at position {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
@@ -1009,17 +996,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (yes/no) "
 #define STRING_UTIL_CONFIRM_YES      "yes"
 #define STRING_UTIL_CONFIRM_YES_U    "Yes"
 #define STRING_UTIL_CONFIRM_NO       "no"
 #define STRING_UTIL_CONFIRM_ALL      "all"
 #define STRING_UTIL_CONFIRM_ALL_U    "All"
 #define STRING_UTIL_CONFIRM_QUIT     "quit"
-#define STRING_UTIL_GIBIBYTES        "GiB"
-#define STRING_UTIL_MEBIBYTES        "MiB"
-#define STRING_UTIL_KIBIBYTES        "KiB"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0c02e4caa..fd6fa3785 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
 #define STRING_FEEDBACK_BACKLOG      "Estas lokaj ŝanĝoj. Sinkronigo devita."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior ne havas la bezonatan permeson por '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Eraro: mankas valoro post ',' ĉe pozicio {1}"
-#define STRING_JSON_MISSING_VALUE2   "Eraro: mankas valoro ĉe pozicio {1}"
-#define STRING_JSON_MISSING_BRACKET  "Eraro: mankas ']' ĉe pozicio {1}"
-#define STRING_JSON_MISSING_BRACE    "Eraro: mankas '}' ĉe pozicio {1}"
-#define STRING_JSON_MISSING_COLON    "Eraro: mankas ':' ĉe pozicio {1}"
-#define STRING_JSON_MISSING_OPEN     "Eraro: anticipis '{' aŭ '[' ĉe pozicio {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Eraro: trovis pliajn signojn ĉe pozicio {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Malplena rikordo en la inigo."
 #define STRING_RECORD_JUNK_AT_EOL    "Nekonataj signoj ĉe vicfino."
@@ -1011,17 +998,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (jes/ne) "
 #define STRING_UTIL_CONFIRM_YES      "jes"
 #define STRING_UTIL_CONFIRM_YES_U    "Jes"
 #define STRING_UTIL_CONFIRM_NO       "ne"
 #define STRING_UTIL_CONFIRM_ALL      "ĉia"
 #define STRING_UTIL_CONFIRM_ALL_U    "Ĉia"
 #define STRING_UTIL_CONFIRM_QUIT     "eliru"
-#define STRING_UTIL_GIBIBYTES        "GiB"
-#define STRING_UTIL_MEBIBYTES        "MiB"
-#define STRING_UTIL_KIBIBYTES        "KiB"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e48f429ce..1e612e9b5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -804,10 +804,6 @@
 #define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
 #define STRING_FEEDBACK_BACKLOG      "Hay modificaciones locales.  Se require una sincronización."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior no tiene los permisos adecuados para '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."
 #define STRING_HELPER_PROJECT_COMPL  "El proyecto '{1}' está completado en un {2}%"
@@ -826,15 +822,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON debe ser para la misma tarea: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: se esperaba retro-alimentación desde un hook script que falló."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Error: falta valor después de ',' en posición {1}"
-#define STRING_JSON_MISSING_VALUE2   "Error: falta valor en posición {1}"
-#define STRING_JSON_MISSING_BRACKET  "Error: falta ']' en posición {1}"
-#define STRING_JSON_MISSING_BRACE    "Error: falta '}' en posición {1}"
-#define STRING_JSON_MISSING_COLON    "Error: falta ':' en posición {1}"
-#define STRING_JSON_MISSING_OPEN     "Error: se esperaba '{' or '[' en posición {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Error: encontrados caracteres extra en posición {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Registro vacío en la entrada."
 #define STRING_RECORD_JUNK_AT_EOL    "Caracteres no reconocidos al final de línea."
@@ -1036,17 +1023,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (sí/no) "
 #define STRING_UTIL_CONFIRM_YES      "sí"
 #define STRING_UTIL_CONFIRM_YES_U    "Sí"
 #define STRING_UTIL_CONFIRM_NO       "no"  // |esp-ESP|==|eng-USA|
 #define STRING_UTIL_CONFIRM_ALL      "todos"
 #define STRING_UTIL_CONFIRM_ALL_U    "Todos"
 #define STRING_UTIL_CONFIRM_QUIT     "canc"
-#define STRING_UTIL_GIBIBYTES        "GiB"  // |esp-ESP|==|eng-USA|
-#define STRING_UTIL_MEBIBYTES        "MiB"  // |esp-ESP|==|eng-USA|
-#define STRING_UTIL_KIBIBYTES        "KiB"  // |esp-ESP|==|eng-USA|
-#define STRING_UTIL_BYTES            "B"  // |esp-ESP|==|eng-USA|
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Encontrado atributo anticuado.  Por favor, cambie '{1}' a '{2}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index ac468a930..2ca31651e 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
 #define STRING_FEEDBACK_BACKLOG      "Il y a des changements locaux.  Synchronisation requise."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Erreur : valeur manquante après ',' à la position {1}"
-#define STRING_JSON_MISSING_VALUE2   "Erreur : valeur manquante à la position {1}"
-#define STRING_JSON_MISSING_BRACKET  "Erreur : il manque ']' à la position {1}"
-#define STRING_JSON_MISSING_BRACE    "Erreur : il manque '}' à la position {1}"
-#define STRING_JSON_MISSING_COLON    "Erreur : il manque ':' à la position {1}"
-#define STRING_JSON_MISSING_OPEN     "Erreur : '{' or '[' attendu à la position {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Erreur : caractères superflus à la position {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
@@ -1011,17 +998,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (oui/non) "
 #define STRING_UTIL_CONFIRM_YES      "oui"
 #define STRING_UTIL_CONFIRM_YES_U    "Oui"
 #define STRING_UTIL_CONFIRM_NO       "non"
 #define STRING_UTIL_CONFIRM_ALL      "tous"
 #define STRING_UTIL_CONFIRM_ALL_U    "Tous"
 #define STRING_UTIL_CONFIRM_QUIT     "quitter"
-#define STRING_UTIL_GIBIBYTES        "Gio"
-#define STRING_UTIL_MEBIBYTES        "Mio"
-#define STRING_UTIL_KIBIBYTES        "kio"
-#define STRING_UTIL_BYTES            "o"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index eaff151c9..768d14001 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -794,10 +794,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
 #define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior non dispone dei permessi corretti per '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
 #define STRING_HELPER_PROJECT_COMPL  "Il progetto '{1}' è {2}% completo"
@@ -816,15 +812,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Errore: mancato valore dopo ',' alla posizione {1}"
-#define STRING_JSON_MISSING_VALUE2   "Errore: mancato valore alla posizione {1}"
-#define STRING_JSON_MISSING_BRACKET  "Errore: mancato ']' alla posizione {1}"
-#define STRING_JSON_MISSING_BRACE    "Errore: mancato '}' alla posizione {1}"
-#define STRING_JSON_MISSING_COLON    "Errore: mancato ':' alla posizione {1}"
-#define STRING_JSON_MISSING_OPEN     "Errore: atteso '{' o '[' alla posizione {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Errore: caratteri in eccesso alla posizione {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Voce vuota in ingresso."
 #define STRING_RECORD_JUNK_AT_EOL    "Carattere non riconosciuto a fine riga."
@@ -1010,17 +997,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (si/no) "
 #define STRING_UTIL_CONFIRM_YES      "si"
 #define STRING_UTIL_CONFIRM_YES_U    "Si"
 #define STRING_UTIL_CONFIRM_NO       "no"
 #define STRING_UTIL_CONFIRM_ALL      "tutti"
 #define STRING_UTIL_CONFIRM_ALL_U    "Tutti"
 #define STRING_UTIL_CONFIRM_QUIT     "esci"
-#define STRING_UTIL_GIBIBYTES        "Gb"
-#define STRING_UTIL_MEBIBYTES        "Mb"
-#define STRING_UTIL_KIBIBYTES        "Kb"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 14560d743..42a41b724 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
 #define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior does not have the correct permissions for '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Error: missing value after ',' at position {1}"
-#define STRING_JSON_MISSING_VALUE2   "Error: missing value at position {1}"
-#define STRING_JSON_MISSING_BRACKET  "Error: missing ']' at position {1}"
-#define STRING_JSON_MISSING_BRACE    "Error: missing '}' at position {1}"
-#define STRING_JSON_MISSING_COLON    "Error: missing ':' at position {1}"
-#define STRING_JSON_MISSING_OPEN     "Error: expected '{' or '[' at position {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Error: extra characters found at position {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
@@ -1011,17 +998,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (yes/no) "
 #define STRING_UTIL_CONFIRM_YES      "yes"
 #define STRING_UTIL_CONFIRM_YES_U    "Yes"
 #define STRING_UTIL_CONFIRM_NO       "no"
 #define STRING_UTIL_CONFIRM_ALL      "all"
 #define STRING_UTIL_CONFIRM_ALL_U    "All"
 #define STRING_UTIL_CONFIRM_QUIT     "quit"
-#define STRING_UTIL_GIBIBYTES        "GiB"
-#define STRING_UTIL_MEBIBYTES        "MiB"
-#define STRING_UTIL_KIBIBYTES        "KiB"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "古い属性が見つかった。'{1}' を '{2}' に変更してください。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 382dd8528..d3ddabdb3 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
 #define STRING_FEEDBACK_BACKLOG      "Wykryto lokalne zmiany. Wymagana synchronizacja."
 
-// File
-#define STRING_FILE_PERMS            "Taskwarrior nie posiada praw dostępu do '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Błąd: brak wartości po ',' na pozycji {1}"
-#define STRING_JSON_MISSING_VALUE2   "Błąd: brak wartości na pozycji {1}"
-#define STRING_JSON_MISSING_BRACKET  "Błąd: brak ']' na pozycji {1}"
-#define STRING_JSON_MISSING_BRACE    "Błąd: brak '}' na pozycji {1}"
-#define STRING_JSON_MISSING_COLON    "Błąd: brak ':' na pozycji {1}"
-#define STRING_JSON_MISSING_OPEN     "Błąd: oczekiwany '{' lub '[' na pozycji {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Błąd: nadmiarowy znak na pozycji {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Pusty wpis na wejściu."
 #define STRING_RECORD_JUNK_AT_EOL    "Nierozpoznawalny znak na koncu lini."
@@ -1011,17 +998,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (tak/nie) "
 #define STRING_UTIL_CONFIRM_YES      "tak"
 #define STRING_UTIL_CONFIRM_YES_U    "Tak"
 #define STRING_UTIL_CONFIRM_NO       "nie"
 #define STRING_UTIL_CONFIRM_ALL      "wszystko"
 #define STRING_UTIL_CONFIRM_ALL_U    "Wszystko"
 #define STRING_UTIL_CONFIRM_QUIT     "wyjście"
-#define STRING_UTIL_GIBIBYTES        "GiB"
-#define STRING_UTIL_MEBIBYTES        "MiB"
-#define STRING_UTIL_KIBIBYTES        "KiB"
-#define STRING_UTIL_BYTES            "B"
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d11655965..f710f3f81 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -795,10 +795,6 @@
 #define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
 #define STRING_FEEDBACK_BACKLOG      "Há modificações locais. Necessário sincronizar (sync)."
 
-// File
-#define STRING_FILE_PERMS            "O taskwarrior não encontrou as permissões corretas em '{1}'."
-#define STRING_FILE_TRUNCATE         "Could not truncate file: {1} {2}"
-
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
 #define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
@@ -817,15 +813,6 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
 
-// JSON
-#define STRING_JSON_MISSING_VALUE    "Erro: valor em falta após ',' na posição {1}"
-#define STRING_JSON_MISSING_VALUE2   "Erro: valor em falta na posição {1}"
-#define STRING_JSON_MISSING_BRACKET  "Erro: ']' em falta na posição {1}"
-#define STRING_JSON_MISSING_BRACE    "Erro: '}' em falta na posição {1}"
-#define STRING_JSON_MISSING_COLON    "Erro: ':' em falta na posição {1}"
-#define STRING_JSON_MISSING_OPEN     "Erro: esperado '{' ou '[' na posição {1}"
-#define STRING_JSON_EXTRA_CHARACTERS "Erro: caracteres extra encontrados na posição {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Registo vazio na entrada fornecida."
 #define STRING_RECORD_JUNK_AT_EOL    "Caracteres desconhecidos no fim da linha."
@@ -1011,17 +998,12 @@
 */
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (sim/não) "
 #define STRING_UTIL_CONFIRM_YES      "sim"
 #define STRING_UTIL_CONFIRM_YES_U    "Sim"
 #define STRING_UTIL_CONFIRM_NO       "não"
 #define STRING_UTIL_CONFIRM_ALL      "todas"
 #define STRING_UTIL_CONFIRM_ALL_U    "Todas"
 #define STRING_UTIL_CONFIRM_QUIT     "Sair"
-#define STRING_UTIL_GIBIBYTES        "GiB"  // |por-PRT|==|eng-USA|
-#define STRING_UTIL_MEBIBYTES        "MiB"  // |por-PRT|==|eng-USA|
-#define STRING_UTIL_KIBIBYTES        "KiB"  // |por-PRT|==|eng-USA|
-#define STRING_UTIL_BYTES            "B"  // |por-PRT|==|eng-USA|
 
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."

From a79e1d65a748ff68543f462c3e26d43669632c44 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:24:39 -0500
Subject: [PATCH 182/879] libshared: Updated to
 c3f1919945bd370b397314dc1ec245960a401820

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 9685a22c9..c3f191994 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 9685a22c90ca6f832748f8c71bae3cfad352bc64
+Subproject commit c3f1919945bd370b397314dc1ec245960a401820

From 624ccd12fca8a1da569591ac0c45689f9eca6811 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:27:20 -0500
Subject: [PATCH 183/879] CmdVersion: Migrated from ViewText to Table

---
 src/commands/CmdVersion.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index b8ec3c52d..b9763bcfc 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -29,7 +29,7 @@
 #include <sstream>
 #include <stdlib.h>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
@@ -61,15 +61,15 @@ int CmdVersion::execute (std::string& output)
 
   // Create a table for the disclaimer.
   int width = context.getWidth ();
-  ViewText disclaimer;
+  Table disclaimer;
   disclaimer.width (width);
-  disclaimer.add (Column::factory ("string", ""));
+  disclaimer.add ("");
   disclaimer.set (disclaimer.addRow (), 0, STRING_CMD_VERSION_MIT);
 
   // Create a table for the URL.
-  ViewText link;
+  Table link;
   link.width (width);
-  link.add (Column::factory ("string", ""));
+  link.add ("");
   link.set (link.addRow (), 0, STRING_CMD_VERSION_DOCS);
 
   Color bold;

From 7a0707342b13fb84b895c94ae0a5b5ffb3fafb0e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:34:27 -0500
Subject: [PATCH 184/879] CmdTags: Migrated from ViewText to Table

---
 src/commands/CmdTags.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 4187a03dc..839974cc8 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -92,10 +92,10 @@ int CmdTags::execute (std::string& output)
   if (unique.size ())
   {
     // Render a list of tags names from the map.
-    ViewText view;
+    Table view;
     view.width (context.getWidth ());
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_TAG));
-    view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_COUNT));
+    view.add (STRING_COLUMN_LABEL_TAG);
+    view.add (STRING_COLUMN_LABEL_COUNT, false);
 
     Color bold;
     if (context.color ())

From cd2fe40a594d0d6caa522ed4674e70aa8c6a1c28 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:36:06 -0500
Subject: [PATCH 185/879] CmdHelp: Migrated from ViewText to Table

---
 src/commands/CmdHelp.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index e04641b78..756f6a76d 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <CmdHelp.h>
 #include <algorithm>
-#include <ViewText.h>
+#include <Table.h>
 #include <Context.h>
 #include <i18n.h>
 #include <shared.h>
@@ -72,11 +72,11 @@ int CmdHelp::execute (std::string& output)
 ////////////////////////////////////////////////////////////////////////////////
 std::string CmdHelp::composeUsage () const
 {
-  ViewText view;
+  Table view;
   view.width (context.getWidth ());
-  view.add (Column::factory ("string.left", ""));
-  view.add (Column::factory ("string.left", ""));
-  view.add (Column::factory ("string.left", ""));
+  view.add ("");
+  view.add ("");
+  view.add ("");
 
   // Static first row.
   int row = view.addRow ();

From a4c2ec04409275f5eae3aad76ea6338ccb578778 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:37:12 -0500
Subject: [PATCH 186/879] CmdReports: Migrated from ViewText to Table

---
 src/commands/CmdReports.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 75dd585b4..610d018cd 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -29,7 +29,7 @@
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -86,10 +86,10 @@ int CmdReports::execute (std::string& output)
 
   // Compose the output.
   std::stringstream out;
-  ViewText view;
+  Table view;
   view.width (context.getWidth ());
-  view.add (Column::factory ("string", STRING_CMD_REPORTS_REPORT));
-  view.add (Column::factory ("string", STRING_CMD_REPORTS_DESC));
+  view.add (STRING_CMD_REPORTS_REPORT);
+  view.add (STRING_CMD_REPORTS_DESC);
 
   if (context.color ())
   {

From 8db15d143be699ef2c5c06ae21e2318c0b0438db Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:38:53 -0500
Subject: [PATCH 187/879] CmdStats: Migrated from ViewText to Table

---
 src/commands/CmdStats.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index eab173f39..b77915e85 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -29,7 +29,7 @@
 #include <sstream>
 #include <iomanip>
 #include <stdlib.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Datetime.h>
 #include <Duration.h>
 #include <Context.h>
@@ -159,11 +159,11 @@ int CmdStats::execute (std::string& output)
   }
 
   // Create a table for output.
-  ViewText view;
+  Table view;
   view.width (context.getWidth ());
   view.intraPadding (2);
-  view.add (Column::factory ("string", STRING_CMD_STATS_CATEGORY));
-  view.add (Column::factory ("string", STRING_CMD_STATS_DATA));
+  view.add (STRING_CMD_STATS_CATEGORY);
+  view.add (STRING_CMD_STATS_DATA);
 
   if (context.color ())
   {

From ff6dcee84cb8efc579304dda7d28125d93b6ffb5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 13:40:46 -0500
Subject: [PATCH 188/879] CmdColor: Migrated from ViewText to Table

---
 src/commands/CmdColor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 231bf3ab7..cb9474b84 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <CmdColor.h>
 #include <sstream>
-#include <ViewText.h>
+#include <Table.h>
 #include <Context.h>
 #include <main.h>
 #include <Color.h>
@@ -74,10 +74,10 @@ int CmdColor::execute (std::string& output)
     {
       out << '\n' << STRING_CMD_COLOR_HERE << '\n';
 
-      ViewText view;
+      Table view;
       view.width (context.getWidth ());
-      view.add (Column::factory ("string", STRING_CMD_COLOR_COLOR));
-      view.add (Column::factory ("string", STRING_CMD_COLOR_DEFINITION));
+      view.add (STRING_CMD_COLOR_COLOR);
+      view.add (STRING_CMD_COLOR_DEFINITION);
 
       for (auto& item : context.config)
       {

From 2ec89e68ba221d70eba933ba4d85176202186e84 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:19:25 -0500
Subject: [PATCH 189/879] CmdColor: Conencted rc.color to Table::forceColor

---
 src/commands/CmdColor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index cb9474b84..a751b0bce 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -76,6 +76,8 @@ int CmdColor::execute (std::string& output)
 
       Table view;
       view.width (context.getWidth ());
+      if (context.config.getBoolean ("color"))
+        view.forceColor ();
       view.add (STRING_CMD_COLOR_COLOR);
       view.add (STRING_CMD_COLOR_DEFINITION);
 

From d551dff4cfe6487fa1280b0af571169929624fe3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:20:07 -0500
Subject: [PATCH 190/879] CmdTimesheet: Migrated from ViewText to Table

---
 src/commands/CmdTimesheet.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 65c1f6055..dd344d20c 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <ISO8601.h>
 #include <main.h>
 #include <i18n.h>
@@ -102,12 +102,12 @@ int CmdTimesheet::execute (std::string& output)
         << '\n';
 
     // Render the completed table.
-    ViewText completed;
+    Table completed;
     completed.width (context.getWidth ());
-    completed.add (Column::factory ("string",       "   "));
-    completed.add (Column::factory ("string",       STRING_COLUMN_LABEL_PROJECT));
-    completed.add (Column::factory ("string.right", STRING_COLUMN_LABEL_DUE));
-    completed.add (Column::factory ("string",       STRING_COLUMN_LABEL_DESC));
+    completed.add ("   ");
+    completed.add (STRING_COLUMN_LABEL_PROJECT);
+    completed.add (STRING_COLUMN_LABEL_DUE, false);
+    completed.add (STRING_COLUMN_LABEL_DESC);
 
     Color label;
     if (context.color ())
@@ -163,12 +163,12 @@ int CmdTimesheet::execute (std::string& output)
           << '\n';
 
     // Now render the started table.
-    ViewText started;
+    Table started;
     started.width (context.getWidth ());
-    started.add (Column::factory ("string",       "   "));
-    started.add (Column::factory ("string",       STRING_COLUMN_LABEL_PROJECT));
-    started.add (Column::factory ("string.right", STRING_COLUMN_LABEL_DUE));
-    started.add (Column::factory ("string",       STRING_COLUMN_LABEL_DESC));
+    started.add ("   ");
+    started.add (STRING_COLUMN_LABEL_PROJECT);
+    started.add (STRING_COLUMN_LABEL_DUE, false);
+    started.add (STRING_COLUMN_LABEL_DESC);
     started.colorHeader (label);
 
     for (auto& task : all)

From 90424774152ee2dfe0aba55ebd1d96b4f083ab4e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:21:48 -0500
Subject: [PATCH 191/879] CmdShow: Migrated from ViewText to Table

---
 src/commands/CmdShow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 296c0be66..c140c1f2e 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -34,7 +34,7 @@
 #include <main.h>
 #include <Context.h>
 #include <FS.h>
-#include <ViewText.h>
+#include <Table.h>
 
 extern Context context;
 
@@ -258,10 +258,10 @@ int CmdShow::execute (std::string& output)
       default_values.push_back (i.first);
 
   // Create output view.
-  ViewText view;
+  Table view;
   view.width (width);
-  view.add (Column::factory ("string", STRING_CMD_SHOW_CONF_VAR));
-  view.add (Column::factory ("string", STRING_CMD_SHOW_CONF_VALUE));
+  view.add (STRING_CMD_SHOW_CONF_VAR);
+  view.add (STRING_CMD_SHOW_CONF_VALUE);
 
   Color error;
   Color warning;

From 245b0c58c6243719716eeaa7b227f82e555e89b5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:22:37 -0500
Subject: [PATCH 192/879] CmdColumns: Migrated from ViewText to Table

---
 src/commands/CmdColumns.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 6f2c94f4f..ea59ff612 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -28,7 +28,7 @@
 #include <CmdColumns.h>
 #include <algorithm>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Color.h>
 #include <shared.h>
 #include <util.h>
@@ -70,13 +70,13 @@ int CmdColumns::execute (std::string& output)
   std::sort (names.begin (), names.end ());
 
   // Render a list of column names, formats and examples.
-  ViewText formats;
+  Table formats;
   formats.width (context.getWidth ());
-  formats.add (Column::factory ("string", STRING_COLUMN_LABEL_COLUMN));
-  formats.add (Column::factory ("string", STRING_COLUMN_LABEL_TYPE));
-  formats.add (Column::factory ("string", STRING_COLUMN_LABEL_MODIFY));
-  formats.add (Column::factory ("string", STRING_COLUMN_LABEL_STYLES));
-  formats.add (Column::factory ("string", STRING_COLUMN_LABEL_EXAMPLES));
+  formats.add (STRING_COLUMN_LABEL_COLUMN);
+  formats.add (STRING_COLUMN_LABEL_TYPE);
+  formats.add (STRING_COLUMN_LABEL_MODIFY);
+  formats.add (STRING_COLUMN_LABEL_STYLES);
+  formats.add (STRING_COLUMN_LABEL_EXAMPLES);
 
   if (context.color ())
   {

From c1d4cea63844e033780048d6b65131cd9faa79dc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:46:19 -0500
Subject: [PATCH 193/879] CmdCommands: Migrated from ViewText to Table

---
 src/commands/CmdCommands.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index f11a147f2..3295fff4f 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <stdlib.h>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Command.h>
 #include <ColString.h>
 #include <util.h>
@@ -57,18 +57,18 @@ CmdCommands::CmdCommands ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCommands::execute (std::string& output)
 {
-  ViewText view;
+  Table view;
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",       STRING_COLUMN_LABEL_COMMAND));
-  view.add (Column::factory ("string",       STRING_COLUMN_LABEL_CATEGORY));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_RO));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_SHOWS_ID));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_GC));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_CONTEXT));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_FILTER));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_MODS));
-  view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_MISC));
-  view.add (Column::factory ("string.left",  STRING_COLUMN_LABEL_DESC));
+  view.add (STRING_COLUMN_LABEL_COMMAND);
+  view.add (STRING_COLUMN_LABEL_CATEGORY);
+  view.add (STRING_COLUMN_LABEL_RO,       false);
+  view.add (STRING_COLUMN_LABEL_SHOWS_ID, false);
+  view.add (STRING_COLUMN_LABEL_GC,       false);
+  view.add (STRING_COLUMN_LABEL_CONTEXT,  false);
+  view.add (STRING_COLUMN_LABEL_FILTER,   false);
+  view.add (STRING_COLUMN_LABEL_MODS,     false);
+  view.add (STRING_COLUMN_LABEL_MISC,     false);
+  view.add (STRING_COLUMN_LABEL_DESC);
 
   if (context.color ())
   {

From c69dfba6bbc681a3238dd959ce9d10f83b2ed80a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 14:47:12 -0500
Subject: [PATCH 194/879] CmdProjects: Migrated from ViewText to Table

---
 src/commands/CmdProjects.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 7606472c4..819ad59d4 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -30,7 +30,7 @@
 #include <sstream>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
@@ -105,10 +105,10 @@ int CmdProjects::execute (std::string& output)
   if (unique.size ())
   {
     // Render a list of project names from the map.
-    ViewText view;
+    Table view;
     view.width (context.getWidth ());
-    view.add (Column::factory ("string",       STRING_COLUMN_LABEL_PROJECT));
-    view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_TASKS));
+    view.add (STRING_COLUMN_LABEL_PROJECT);
+    view.add (STRING_COLUMN_LABEL_TASKS, false);
 
     if (context.color ())
     {

From 142d097ef02f1f7e8fefbe273690a9c5a4659265 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 16:36:23 -0500
Subject: [PATCH 195/879] libshared: Updated to
 1aa5c92f925a1eeec16639766994f2e6f70bcf8f

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index c3f191994..1aa5c92f9 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit c3f1919945bd370b397314dc1ec245960a401820
+Subproject commit 1aa5c92f925a1eeec16639766994f2e6f70bcf8f

From 31eb477a0efd149441630d8298d8e8f1ae676340 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 16:53:28 -0500
Subject: [PATCH 196/879] libshared: Updated to
 6d35bef52da4b881fcfb9946dddb01f603e225c8

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 1aa5c92f9..6d35bef52 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 1aa5c92f925a1eeec16639766994f2e6f70bcf8f
+Subproject commit 6d35bef52da4b881fcfb9946dddb01f603e225c8

From 74e50359b569ad8a59c319824854c4318b738605 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 16:54:11 -0500
Subject: [PATCH 197/879] util: Migrated obfuscateText calls to libshared

---
 src/util.cpp | 32 --------------------------------
 src/util.h   |  1 -
 2 files changed, 33 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 1752b39c1..747eb1f34 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -286,38 +286,6 @@ std::string osName ()
 #endif
 }
 
-////////////////////////////////////////////////////////////////////////////////
-const std::string obfuscateText (const std::string& input)
-{
-  std::stringstream output;
-  std::string::size_type i = 0;
-  int character;
-  bool inside = false;
-
-  while ((character = utf8_next_char (input, i)))
-  {
-    if (inside)
-    {
-      output << (char) character;
-
-      if (character == 'm')
-        inside = false;
-    }
-    else
-    {
-      if (character == 033)
-        inside = true;
-
-      if (inside || character == ' ')
-        output << (char) character;
-      else
-        output << 'x';
-    }
-  }
-
-  return output.str ();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool nontrivial (const std::string& input)
 {
diff --git a/src/util.h b/src/util.h
index c1ed270ef..fd06f6535 100644
--- a/src/util.h
+++ b/src/util.h
@@ -61,7 +61,6 @@ const std::vector <std::string> extractParents (
 #endif
 
 std::string osName ();
-const std::string obfuscateText (const std::string&);
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
 const char* optionalBlankLine ();

From 2c07858bd38d535b90284adfe8bdea7ad66534d6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 17:30:44 -0500
Subject: [PATCH 198/879] CmdInfo: Migrated from ViewText to Table

---
 src/commands/CmdInfo.cpp | 36 ++++++++++++++++++++++--------------
 src/commands/CmdInfo.h   |  4 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 7b87870ae..db4d9643f 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -99,10 +99,12 @@ int CmdInfo::execute (std::string& output)
   std::stringstream out;
   for (auto& task : filtered)
   {
-    ViewText view;
+    Table view;
     view.width (context.getWidth ());
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_NAME));
-    view.add (Column::factory ("string", STRING_COLUMN_LABEL_VALUE));
+    if (context.config.getBoolean ("obfuscate"))
+      view.obfuscate ();
+    view.add (STRING_COLUMN_LABEL_NAME);
+    view.add (STRING_COLUMN_LABEL_VALUE);
 
     // If an alternating row color is specified, notify the table.
     if (context.color ())
@@ -407,7 +409,7 @@ int CmdInfo::execute (std::string& output)
     }
 
     // Create a second table, containing urgency details, if necessary.
-    ViewText urgencyDetails;
+    Table urgencyDetails;
     if (task.urgency () != 0.0)
     {
       if (context.color ())
@@ -420,13 +422,16 @@ int CmdInfo::execute (std::string& output)
         urgencyDetails.colorHeader (label);
       }
 
+      if (context.config.getBoolean ("obfuscate"))
+        urgencyDetails.obfuscate ();
+
       urgencyDetails.width (context.getWidth ());
-      urgencyDetails.add (Column::factory ("string", "")); // Attribute
-      urgencyDetails.add (Column::factory ("string", "")); // Value
-      urgencyDetails.add (Column::factory ("string", "")); // *
-      urgencyDetails.add (Column::factory ("string", "")); // Coefficient
-      urgencyDetails.add (Column::factory ("string", "")); // =
-      urgencyDetails.add (Column::factory ("string", "")); // Result
+      urgencyDetails.add (""); // Attribute
+      urgencyDetails.add (""); // Value
+      urgencyDetails.add (""); // *
+      urgencyDetails.add (""); // Coefficient
+      urgencyDetails.add (""); // =
+      urgencyDetails.add (""); // Result
 
       urgencyTerm (urgencyDetails, "project",     task.urgency_project (),     Task::urgencyProjectCoefficient);
       urgencyTerm (urgencyDetails, "active",      task.urgency_active (),      Task::urgencyActiveCoefficient);
@@ -506,7 +511,7 @@ int CmdInfo::execute (std::string& output)
     }
 
     // Create a third table, containing undo log change details.
-    ViewText journal;
+    Table journal;
 
     // If an alternating row color is specified, notify the table.
     if (context.color ())
@@ -519,9 +524,12 @@ int CmdInfo::execute (std::string& output)
       journal.colorHeader (label);
     }
 
+    if (context.config.getBoolean ("obfuscate"))
+      journal.obfuscate ();
+
     journal.width (context.getWidth ());
-    journal.add (Column::factory ("string", STRING_COLUMN_LABEL_DATE));
-    journal.add (Column::factory ("string", STRING_CMD_INFO_MODIFICATION));
+    journal.add (STRING_COLUMN_LABEL_DATE);
+    journal.add (STRING_CMD_INFO_MODIFICATION);
 
     if (context.config.getBoolean ("journal.info") &&
         undo.size () > 3)
@@ -577,7 +585,7 @@ int CmdInfo::execute (std::string& output)
 
 ////////////////////////////////////////////////////////////////////////////////
 void CmdInfo::urgencyTerm (
-  ViewText& view,
+  Table& view,
   const std::string& label,
   float measure,
   float coefficient) const
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index 941569e4b..e3ad8da7b 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <Command.h>
-#include <ViewText.h>
+#include <Table.h>
 
 class CmdInfo : public Command
 {
@@ -38,7 +38,7 @@ public:
   int execute (std::string&);
 
 private:
-  void urgencyTerm (ViewText&, const std::string&, float, float) const;
+  void urgencyTerm (Table&, const std::string&, float, float) const;
 };
 
 #endif

From 9be14943574d4179692208bc36a570a2eaf716da Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 17:31:21 -0500
Subject: [PATCH 199/879] CmdInfo: Added Table::forceColor

---
 src/commands/CmdInfo.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index db4d9643f..b35404d50 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -103,6 +103,8 @@ int CmdInfo::execute (std::string& output)
     view.width (context.getWidth ());
     if (context.config.getBoolean ("obfuscate"))
       view.obfuscate ();
+    if (context.config.getBoolean ("color"))
+      view.forceColor ();
     view.add (STRING_COLUMN_LABEL_NAME);
     view.add (STRING_COLUMN_LABEL_VALUE);
 
@@ -424,6 +426,8 @@ int CmdInfo::execute (std::string& output)
 
       if (context.config.getBoolean ("obfuscate"))
         urgencyDetails.obfuscate ();
+      if (context.config.getBoolean ("color"))
+        view.forceColor ();
 
       urgencyDetails.width (context.getWidth ());
       urgencyDetails.add (""); // Attribute
@@ -526,6 +530,8 @@ int CmdInfo::execute (std::string& output)
 
     if (context.config.getBoolean ("obfuscate"))
       journal.obfuscate ();
+    if (context.config.getBoolean ("color"))
+      journal.forceColor ();
 
     journal.width (context.getWidth ());
     journal.add (STRING_COLUMN_LABEL_DATE);

From d8d5a1532111f9421a704b87bf4bdc5d556aace2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 17:36:11 -0500
Subject: [PATCH 200/879] Tests: Broke one tests into eight, so it is clear
 which one fails

---
 test/fontunderline.t | 49 ++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/test/fontunderline.t b/test/fontunderline.t
index 52205de54..79305aace 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -36,51 +36,56 @@ from basetest import Task, TestCase
 
 
 class TestUnderline(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
+    @classmethod
+    def setUpClass(cls):
+        cls.t = Task()
+        cls.t("add foo")
 
-    def test_version(self):
-        """Verify that underlineѕ table headers are used at the right time"""
+    # Test the fontunderline config variable.  The following truth table defines
+    # the different results which are to be confirmed.
+    #
+    #   color  _forcecolor  fontunderline  result
+    #   -----  -----------  -------------  ---------
+    #       0            0              0  dashes
+    #       0            0              1  dashes
+    #       0            1              0  dashes
+    #       0            1              1  underline
+    #       1*           0              0  dashes
+    #       1*           0              1  dashes
+    #       1*           1              0  dashes
+    #       1*           1              1  underline
+    #
+    # * When isatty (fileno (stdout)) is false, color is automatically disabled.
 
-        # Test the fontunderline config variable.  The following truth table defines
-        # the different results which are to be confirmed.
-        #
-        #   color  _forcecolor  fontunderline  result
-        #   -----  -----------  -------------  ---------
-        #       0            0              0  dashes
-        #       0            0              1  dashes
-        #       0            1              0  dashes
-        #       0            1              1  underline
-        #       1*           0              0  dashes
-        #       1*           0              1  dashes
-        #       1*           1              0  dashes
-        #       1*           1              1  underline
-        #
-        # * When isatty (fileno (stdout)) is false, color is automatically disabled.
-
-        self.t("add foo")
+    def test_nocolor_noforce_nounderline(self):
         code, out, err = self.t("1 info rc.color:off rc._forcecolor:off rc.fontunderline:off")
         self.assertIn("--------", out)
 
+    def test_nocolor_noforce_underline(self):
         code, out, err = self.t("1 info rc.color:off rc._forcecolor:off rc.fontunderline:on")
         self.assertIn("--------", out)
 
+    def test_nocolor_force_nounderline(self):
         code, out, err = self.t("1 info rc.color:off rc._forcecolor:on rc.fontunderline:off")
         self.assertIn("--------", out)
 
+    def test_nocolor_force_underline(self):
         code, out, err = self.t("1 info rc.color:off rc._forcecolor:on rc.fontunderline:on")
         self.assertNotIn("--------", out)
 
+    def test_color_noforce_nounderline(self):
         code, out, err = self.t("1 info rc.color:on rc._forcecolor:off rc.fontunderline:off")
         self.assertIn("--------", out)
 
+    def test_color_noforce_underline(self):
         code, out, err = self.t("1 info rc.color:on rc._forcecolor:off rc.fontunderline:on")
         self.assertIn("--------", out)
 
+    def test_color_force_nounderline(self):
         code, out, err = self.t("1 info rc.color:on rc._forcecolor:on rc.fontunderline:off")
         self.assertIn("--------", out)
 
+    def test_color_force_underline(self):
         code, out, err = self.t("1 info rc.color:on rc._forcecolor:on rc.fontunderline:on")
         self.assertNotIn("--------", out)
 

From cc438b44117d3bac261269f6794444150686768c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 17:37:47 -0500
Subject: [PATCH 201/879] CmdCalendar: Migrated from ViewText to Table

---
 src/commands/CmdCalendar.cpp | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index cd7ff484c..d500d6e0d 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -30,7 +30,7 @@
 #include <iomanip>
 #include <stdlib.h>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Lexer.h>
 #include <i18n.h>
 #include <shared.h>
@@ -368,10 +368,10 @@ int CmdCalendar::execute (std::string& output)
     // Table with holiday information
     if (context.config.get ("calendar.holidays") == "full")
     {
-      ViewText holTable;
+      Table holTable;
       holTable.width (context.getWidth ());
-      holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_DATE));
-      holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_HOL));
+      holTable.add (STRING_CMD_CAL_LABEL_DATE);
+      holTable.add (STRING_CMD_CAL_LABEL_HOL);
       holTable.colorHeader (color_label);
 
       std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
@@ -434,32 +434,32 @@ std::string CmdCalendar::renderMonths (
   // Build table for the number of months to be displayed.
   Color label (context.config.get ("color.label"));
 
-  ViewText view;
+  Table view;
   view.colorHeader (label);
   view.width (context.getWidth ());
   for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
   {
     if (weekStart == 1)
     {
-      view.add (Column::factory ("string.right", ""));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
+      view.add ("", false);
+      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
     }
     else
     {
-      view.add (Column::factory ("string.right", ""));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2)));
+      view.add ("", false);
+      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
     }
   }
 

From 17fc9e5a9121af3389ec4fc7d481bd89ed42d4ee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 20:02:49 -0500
Subject: [PATCH 202/879] CmdHistory: Migrated from ViewText to Table

---
 src/commands/CmdHistory.cpp | 50 +++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index a8d71eb7f..562b69abd 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -29,7 +29,7 @@
 #include <sstream>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <main.h>
 #include <format.h>
 #include <util.h>
@@ -103,14 +103,16 @@ int CmdHistoryMonthly::execute (std::string& output)
   }
 
   // Now build the view.
-  ViewText view;
+  Table view;
+  if (context.config.getBoolean ("color"))
+    view.forceColor ();
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",       STRING_CMD_HISTORY_YEAR));
-  view.add (Column::factory ("string",       STRING_CMD_HISTORY_MONTH));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_ADDED));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_COMP));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_DEL));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_NET));
+  view.add (STRING_CMD_HISTORY_YEAR);
+  view.add (STRING_CMD_HISTORY_MONTH);
+  view.add (STRING_CMD_HISTORY_ADDED, false);
+  view.add (STRING_CMD_HISTORY_COMP,  false);
+  view.add (STRING_CMD_HISTORY_DEL,   false);
+  view.add (STRING_CMD_HISTORY_NET,   false);
 
   if (context.color ())
   {
@@ -268,13 +270,15 @@ int CmdHistoryAnnual::execute (std::string& output)
   }
 
   // Now build the view.
-  ViewText view;
+  Table view;
+  if (context.config.getBoolean ("color"))
+    view.forceColor ();
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",       STRING_CMD_HISTORY_YEAR));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_ADDED));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_COMP));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_DEL));
-  view.add (Column::factory ("string.right", STRING_CMD_HISTORY_NET));
+  view.add (STRING_CMD_HISTORY_YEAR);
+  view.add (STRING_CMD_HISTORY_ADDED, false);
+  view.add (STRING_CMD_HISTORY_COMP,  false);
+  view.add (STRING_CMD_HISTORY_DEL,   false);
+  view.add (STRING_CMD_HISTORY_NET,   false);
 
   if (context.color ())
   {
@@ -432,11 +436,13 @@ int CmdGHistoryMonthly::execute (std::string& output)
   int widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
 
   // Now build the view.
-  ViewText view;
+  Table view;
+  if (context.config.getBoolean ("color"))
+    view.forceColor ();
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",            STRING_CMD_GHISTORY_YEAR));
-  view.add (Column::factory ("string",            STRING_CMD_GHISTORY_MONTH));
-  view.add (Column::factory ("string.left_fixed", STRING_CMD_GHISTORY_NUMBER));
+  view.add (STRING_CMD_GHISTORY_YEAR);
+  view.add (STRING_CMD_GHISTORY_MONTH);
+  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
 
   Color color_add    (context.config.get ("color.history.add"));
   Color color_done   (context.config.get ("color.history.done"));
@@ -632,10 +638,12 @@ int CmdGHistoryAnnual::execute (std::string& output)
   int widthOfBar = context.getWidth () - 5;   // 5 == strlen ("YYYY ")
 
   // Now build the view.
-  ViewText view;
+  Table view;
+  if (context.config.getBoolean ("color"))
+    view.forceColor ();
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",            STRING_CMD_GHISTORY_YEAR));
-  view.add (Column::factory ("string.left_fixed", STRING_CMD_GHISTORY_NUMBER));
+  view.add (STRING_CMD_GHISTORY_YEAR);
+  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
 
   Color color_add    (context.config.get ("color.history.add"));
   Color color_done   (context.config.get ("color.history.done"));

From 6c90de197431325a4d9da6b2d3c45e32f5cac050 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 20:10:21 -0500
Subject: [PATCH 203/879] TDB2: Migrated from ViewText to Table

---
 src/TDB2.cpp | 15 ++++++++-------
 src/TDB2.h   |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index b8caae2b0..69790c5c6 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -37,6 +37,7 @@
 #include <Color.h>
 #include <ISO8601.h>
 #include <i18n.h>
+#include <Table.h>
 #include <shared.h>
 #include <format.h>
 #include <main.h>
@@ -1043,12 +1044,12 @@ void TDB2::show_diff (
 
     // Attributes are all there is, so figure the different attribute names
     // between before and after.
-    ViewText view;
+    Table view;
     view.width (context.getWidth ());
     view.intraPadding (2);
-    view.add (Column::factory ("string", ""));
-    view.add (Column::factory ("string", STRING_TDB2_UNDO_PRIOR));
-    view.add (Column::factory ("string", STRING_TDB2_UNDO_CURRENT));
+    view.add ("");
+    view.add (STRING_TDB2_UNDO_PRIOR);
+    view.add (STRING_TDB2_UNDO_CURRENT);
 
     Color label (context.config.get ("color.label"));
     view.colorHeader (label);
@@ -1141,11 +1142,11 @@ void TDB2::show_diff (
     Task after (current);
 
     // Generate table header.
-    ViewText view;
+    Table view;
     view.width (context.getWidth ());
     view.intraPadding (2);
-    view.add (Column::factory ("string", ""));
-    view.add (Column::factory ("string", ""));
+    view.add ("");
+    view.add ("");
 
     int row = view.addRow ();
     view.set (row, 0, STRING_TDB2_DIFF_PREV, color_red);
diff --git a/src/TDB2.h b/src/TDB2.h
index a830355e4..0b6f7ea34 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -33,7 +33,6 @@
 #include <vector>
 #include <string>
 #include <stdio.h>
-#include <ViewText.h>
 #include <FS.h>
 #include <Task.h>
 

From 7001e38c300ea88957c7f37e8939b7b7b94032ce Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 20:14:13 -0500
Subject: [PATCH 204/879] CmdSummary: Migrated from ViewText to Table

---
 src/commands/CmdSummary.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index f18d41278..b84ed1b56 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <Filter.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Duration.h>
 #include <format.h>
 #include <util.h>
@@ -131,13 +131,13 @@ int CmdSummary::execute (std::string& output)
   }
 
   // Create a table for output.
-  ViewText view;
+  Table view;
   view.width (context.getWidth ());
-  view.add (Column::factory ("string",            STRING_CMD_SUMMARY_PROJECT));
-  view.add (Column::factory ("string.right",      STRING_CMD_SUMMARY_REMAINING));
-  view.add (Column::factory ("string.right",      STRING_CMD_SUMMARY_AVG_AGE));
-  view.add (Column::factory ("string.right",      STRING_CMD_SUMMARY_COMPLETE));
-  view.add (Column::factory ("string.left_fixed", "0%                        100%"));
+  view.add (STRING_CMD_SUMMARY_PROJECT);
+  view.add (STRING_CMD_SUMMARY_REMAINING, false);
+  view.add (STRING_CMD_SUMMARY_AVG_AGE,   false);
+  view.add (STRING_CMD_SUMMARY_COMPLETE,  false);
+  view.add ("0%                        100%");
 
   Color bar_color;
   Color bg_color;

From cdac253556988bab7a67f6793bc3938672aa9d6a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 20:23:36 -0500
Subject: [PATCH 205/879] ViewText: Eliminated

---
 src/CMakeLists.txt |   1 -
 src/ViewText.cpp   | 316 ---------------------------------------------
 src/ViewText.h     |  92 -------------
 test/view.t.cpp    |  36 +-----
 4 files changed, 1 insertion(+), 444 deletions(-)
 delete mode 100644 src/ViewText.cpp
 delete mode 100644 src/ViewText.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6ae2e22a..cd7bfb672 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,6 @@ add_library (task CLI2.cpp CLI2.h
                   TLSClient.cpp TLSClient.h
                   Variant.cpp Variant.h
                   ViewTask.cpp ViewTask.h
-                  ViewText.cpp ViewText.h
                   dependency.cpp
                   feedback.cpp
                   i18n.h
diff --git a/src/ViewText.cpp b/src/ViewText.cpp
deleted file mode 100644
index 98dc225ba..000000000
--- a/src/ViewText.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <ViewText.h>
-#include <Context.h>
-#include <format.h>
-#include <util.h>
-#include <utf8.h>
-#include <main.h>
-
-extern Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-ViewText::ViewText ()
-: _width (0)
-, _left_margin (0)
-, _header (0)
-, _odd (0)
-, _even (0)
-, _intra_padding (1)
-, _intra_odd (0)
-, _intra_even (0)
-, _extra_padding (0)
-, _extra_odd (0)
-, _extra_even (0)
-, _truncate_lines (0)
-, _truncate_rows (0)
-, _lines (0)
-, _rows (0)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ViewText::~ViewText ()
-{
-  for (auto& col : _columns)
-    delete col;
-
-  _columns.clear ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ViewText::addRow ()
-{
-  _data.push_back (std::vector <std::string> (_columns.size (), ""));
-  _color.push_back (std::vector <Color> (_columns.size (), Color::nocolor));
-  return _data.size () - 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ViewText::set (int row, int col, const std::string& value, Color color)
-{
-  _data[row][col] = value;
-
-  if (color.nontrivial () &&
-      context.color ())
-    _color[row][col] = color;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ViewText::set (int row, int col, int value, Color color)
-{
-  std::string string_value = format (value);
-  _data[row][col] = string_value;
-
-  if (color.nontrivial () &&
-      context.color ())
-    _color[row][col] = color;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ViewText::set (int row, int col, Color color)
-{
-  if (color.nontrivial () &&
-      context.color ())
-    _color[row][col] = color;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string ViewText::render ()
-{
-  bool const obfuscate = context.config.getBoolean ("obfuscate");
-
-  // Determine minimal, ideal column widths.
-  std::vector <int> minimal;
-  std::vector <int> ideal;
-  for (unsigned int col = 0; col < _columns.size (); ++col)
-  {
-    // Headers factor in to width calculations.
-    unsigned int global_min = utf8_width (_columns[col]->label ());
-    unsigned int global_ideal = global_min;
-
-    for (unsigned int row = 0; row < _data.size (); ++row)
-    {
-      // Determine minimum and ideal width for this column.
-      unsigned int min = 0;
-      unsigned int ideal = 0;
-      _columns[col]->measure (_data[row][col], min, ideal);
-
-      if (min   > global_min)   global_min   = min;
-      if (ideal > global_ideal) global_ideal = ideal;
-
-      // If a fixed-width column was just measured, there is no point repeating
-      // the measurement for all tasks.
-      if (_columns[col]->is_fixed_width ())
-        break;
-    }
-
-    minimal.push_back (global_min);
-    ideal.push_back (global_ideal);
-  }
-
-  // Sum the minimal widths.
-  int sum_minimal = 0;
-  for (auto& c : minimal)
-    sum_minimal += c;
-
-  // Sum the ideal widths.
-  int sum_ideal = 0;
-  for (auto& c : ideal)
-    sum_ideal += c;
-
-  // Calculate final column widths.
-  int overage = _width
-              - _left_margin
-              - (2 * _extra_padding)
-              - ((_columns.size () - 1) * _intra_padding);
-
-  std::vector <int> widths;
-  if (sum_ideal <= overage)
-    widths = ideal;
-  else if (sum_minimal > overage || overage < 0)
-    widths = minimal;
-  else if (overage > 0)
-  {
-    widths = minimal;
-    overage -= sum_minimal;
-
-    // Spread 'overage' among columns where width[i] < ideal[i]
-    while (overage)
-    {
-      for (unsigned int i = 0; i < _columns.size () && overage; ++i)
-      {
-        if (widths[i] < ideal[i])
-        {
-          ++widths[i];
-          --overage;
-        }
-      }
-    }
-  }
-
-  // Compose column headers.
-  unsigned int max_lines = 0;
-  std::vector <std::vector <std::string>> headers;
-  for (unsigned int c = 0; c < _columns.size (); ++c)
-  {
-    headers.push_back (std::vector <std::string> ());
-    _columns[c]->renderHeader (headers[c], widths[c], _header);
-
-    if (headers[c].size () > max_lines)
-      max_lines = headers[c].size ();
-  }
-
-  // Output string.
-  std::string out;
-  _lines = 0;
-
-  // Render column headers.
-  std::string left_margin = std::string (_left_margin, ' ');
-  std::string extra       = std::string (_extra_padding, ' ');
-  std::string intra       = std::string (_intra_padding, ' ');
-
-  std::string extra_odd   = context.color () ? _extra_odd.colorize  (extra) : extra;
-  std::string extra_even  = context.color () ? _extra_even.colorize (extra) : extra;
-  std::string intra_odd   = context.color () ? _intra_odd.colorize  (intra) : intra;
-  std::string intra_even  = context.color () ? _intra_even.colorize (intra) : intra;
-
-  for (unsigned int i = 0; i < max_lines; ++i)
-  {
-    out += left_margin + extra;
-
-    for (unsigned int c = 0; c < _columns.size (); ++c)
-    {
-      if (c)
-        out += intra;
-
-      if (headers[c].size () < max_lines - i)
-        out += _header.colorize (std::string (widths[c], ' '));
-      else
-        out += headers[c][i];
-    }
-
-    out += extra;
-
-    // Trim right.
-    out.erase (out.find_last_not_of (" ") + 1);
-    out += "\n";
-
-    // Stop if the line limit is exceeded.
-    if (++_lines >= _truncate_lines && _truncate_lines != 0)
-      return out;
-  }
-
-  // Compose, render columns, in sequence.
-  _rows = 0;
-  std::vector <std::vector <std::string>> cells;
-  for (unsigned int row = 0; row < _data.size (); ++row)
-  {
-    max_lines = 0;
-
-    // Alternate rows based on |s % 2|
-    bool odd = (row % 2) ? true : false;
-    Color row_color = odd ? _odd : _even;
-
-    // TODO row_color.blend (provided color);
-    // TODO Problem: colors for columns are specified, not rows,
-    //      therefore there are only cell colors, not intra colors.
-
-    Color cell_color;
-    for (unsigned int col = 0; col < _columns.size (); ++col)
-    {
-      if (context.color ())
-      {
-        cell_color = row_color;
-        cell_color.blend (_color[row][col]);
-      }
-
-      cells.push_back (std::vector <std::string> ());
-      _columns[col]->render (cells[col], _data[row][col], widths[col], cell_color);
-
-      if (cells[col].size () > max_lines)
-        max_lines = cells[col].size ();
-
-      if (obfuscate)
-        if (_columns[col]->type () == "string")
-          for (unsigned int line = 0; line < cells[col].size (); ++line)
-            cells[col][line] = obfuscateText (cells[col][line]);
-    }
-
-    for (unsigned int i = 0; i < max_lines; ++i)
-    {
-      out += left_margin + (odd ? extra_odd : extra_even);
-
-      for (unsigned int col = 0; col < _columns.size (); ++col)
-      {
-        if (col)
-        {
-          if (row_color.nontrivial ())
-            out += row_color.colorize (intra);
-          else
-            out += (odd ? intra_odd : intra_even);
-        }
-
-        if (i < cells[col].size ())
-          out += cells[col][i];
-        else
-        {
-          if (context.color ())
-          {
-            cell_color = row_color;
-            cell_color.blend (_color[row][col]);
-
-            out += cell_color.colorize (std::string (widths[col], ' '));
-          }
-          else
-            out += std::string (widths[col], ' ');
-        }
-      }
-
-      out += (odd ? extra_odd : extra_even);
-
-      // Trim right.
-      out.erase (out.find_last_not_of (" ") + 1);
-      out += "\n";
-
-      // Stop if the line limit is exceeded.
-      if (++_lines >= _truncate_lines && _truncate_lines != 0)
-        return out;
-    }
-
-    cells.clear ();
-
-    // Stop if the row limit is exceeded.
-    if (++_rows >= _truncate_rows && _truncate_rows != 0)
-      return out;
-  }
-
-  return out;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/ViewText.h b/src/ViewText.h
deleted file mode 100644
index f2b7804d0..000000000
--- a/src/ViewText.h
+++ /dev/null
@@ -1,92 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_VIEWTEXT
-#define INCLUDED_VIEWTEXT
-
-#include <string>
-#include <vector>
-#include <Task.h>
-#include <Color.h>
-#include <Column.h>
-
-class ViewText
-{
-public:
-  ViewText ();
-  ~ViewText ();
-
-  // View specifications.
-  void add (Column* col)          { _columns.push_back (col);    }
-  void width (int width)          { _width = width;              }
-  void leftMargin (int margin)    { _left_margin = margin;       }
-  void colorHeader (Color& c)     { _header = c;                 }
-  void colorOdd (Color& c)        { _odd = c;                    }
-  void colorEven (Color& c)       { _even = c;                   }
-  void intraPadding (int padding) { _intra_padding = padding;    }
-  void intraColorOdd (Color& c)   { _intra_odd = c;              }
-  void intraColorEven (Color& c)  { _intra_even = c;             }
-  void extraPadding (int padding) { _extra_padding = padding;    }
-  void extraColorOdd (Color& c)   { _extra_odd = c;              }
-  void extraColorEven (Color& c)  { _extra_even = c;             }
-  void truncateLines (int n)      { _truncate_lines = n;         }
-  void truncateRows (int n)       { _truncate_rows = n;          }
-  int lines ()                    { return _lines;               }
-  int rows ()                     { return (int) _data.size ();  }
-
-  // Data provision.
-  int addRow ();
-  void set (int, int, const std::string&, Color color = Color::nocolor);
-  void set (int, int, int, Color color = Color::nocolor);
-  void set (int, int, Color);
-
-  // View rendering.
-  std::string render ();
-
-private:
-  std::vector <std::vector <std::string>> _data;
-  std::vector <std::vector <Color>>       _color;
-  std::vector <Column*>                   _columns;
-  int                                     _width;
-  int                                     _left_margin;
-  Color                                   _header;
-  Color                                   _odd;
-  Color                                   _even;
-  int                                     _intra_padding;
-  Color                                   _intra_odd;
-  Color                                   _intra_even;
-  int                                     _extra_padding;
-  Color                                   _extra_odd;
-  Color                                   _extra_even;
-  int                                     _truncate_lines;
-  int                                     _truncate_rows;
-  int                                     _lines;
-  int                                     _rows;
-};
-
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 95e8334bd..26956d8f1 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -33,7 +33,6 @@
 #include <Column.h>
 #include <Task.h>
 #include <ViewTask.h>
-#include <ViewText.h>
 #include <test.h>
 #include <main.h>
 
@@ -42,7 +41,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (2);
+  UnitTest t (1);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -145,39 +144,6 @@ int main (int, char**)
     // Now render a string-only grid.
     context.config.set ("fontunderline", false);
     Color single_cell ("bold white on red");
-
-    ViewText string_view;
-    string_view.width (context.getWidth ());
-    string_view.leftMargin (4);
-    string_view.extraPadding (0);
-    string_view.intraPadding (1);
-    string_view.colorHeader (header_color);
-    string_view.colorOdd (odd_color);
-    string_view.colorEven (even_color);
-    string_view.intraColorOdd (odd_color);
-    string_view.intraColorEven (even_color);
-
-    string_view.add (Column::factory ("string", "One"));
-    string_view.add (Column::factory ("string", "Two"));
-    string_view.add (Column::factory ("string", "Three"));
-
-    int row = string_view.addRow ();
-    string_view.set (row, 0, "top left");
-    string_view.set (row, 1, "top center");
-    string_view.set (row, 2, "top right");
-
-    row = string_view.addRow ();
-    string_view.set (row, 0, "bottom left", single_cell);
-    string_view.set (row, 1, "bottom center, containing sufficient text that "
-                             "wrapping will occur because it exceeds all "
-                             "reasonable values for default width.  Even in a "
-                             "very wide terminal window.  Just look at the "
-                             "lengths we must go to, to get passing unit tests "
-                             "and not flaky tests.");
-    string_view.set (row, 2, "bottom right");
-
-    std::cout << string_view.render ();
-    t.ok (string_view.lines () > 4, "View::lines > 4");
   }
 
   catch (const std::string& e)

From 29300ea9e1bd5556d2501dedd2aa24d7fbff4c8f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:19:50 -0500
Subject: [PATCH 206/879] Config: Migrated form ISO8601d to Datetime

---
 src/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 794dd5b16..6d904e5d8 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -35,7 +35,7 @@
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <FS.h>
 #include <Timer.h>
 #include <JSON.h>
@@ -490,7 +490,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
   auto loc = _defaults.find ("data.location=~/.task");
   //                                      loc+0^          +14^   +21^
 
-  ISO8601d now;
+  Datetime now;
   std::stringstream contents;
   contents << "# [Created by "
            << PACKAGE_STRING

From 4c8456a86d77f829ddb094e026bfcc77421fd45b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:22:31 -0500
Subject: [PATCH 207/879] TDB2: Migrated from ISO8601d to Datetime

---
 src/TDB2.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 69790c5c6..1961a8e9f 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -35,7 +35,7 @@
 #include <signal.h>
 #include <Context.h>
 #include <Color.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <i18n.h>
 #include <Table.h>
 #include <shared.h>
@@ -348,7 +348,7 @@ Task TF2::load_task (const std::string& line)
 // or needs to be 'woken'.
 void TF2::load_gc (Task& task)
 {
-  ISO8601d now;
+  Datetime now;
 
   std::string status = task.get ("status");
   if (status == "pending" ||
@@ -358,7 +358,7 @@ void TF2::load_gc (Task& task)
   }
   else if (status == "waiting")
   {
-    ISO8601d wait (task.get_date ("wait"));
+    Datetime wait (task.get_date ("wait"));
     if (wait < now)
     {
       task.set ("status", "pending");
@@ -709,7 +709,7 @@ void TDB2::update (
     // old <task>
     // new <task>
     // ---
-    undo.add_line ("time " + ISO8601d ().toEpochString () + '\n');
+    undo.add_line ("time " + Datetime ().toEpochString () + '\n');
     undo.add_line ("old " + original.composeF4 () + '\n');
     undo.add_line ("new " + task.composeF4 () + '\n');
     undo.add_line ("---\n");
@@ -728,7 +728,7 @@ void TDB2::update (
     //   time <time>
     //   new <task>
     //   ---
-    undo.add_line ("time " + ISO8601d ().toEpochString () + '\n');
+    undo.add_line ("time " + Datetime ().toEpochString () + '\n');
     undo.add_line ("new " + task.composeF4 () + '\n');
     undo.add_line ("---\n");
   }
@@ -1030,7 +1030,7 @@ void TDB2::show_diff (
   const std::string& prior,
   const std::string& when)
 {
-  ISO8601d lastChange (strtol (when.c_str (), NULL, 10));
+  Datetime lastChange (strtol (when.c_str (), NULL, 10));
 
   // Set the colors.
   Color color_red   (context.color () ? context.config.get ("color.undo.before") : "");

From c3d47f02d36261df48ca2221b9f73cff4367ec66 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:25:21 -0500
Subject: [PATCH 208/879] rules: Migrated from ISO8601d to Datetime

---
 src/rules.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rules.cpp b/src/rules.cpp
index 0ebd1f10d..0fc179138 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <stdlib.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <shared.h>
 #include <main.h>
 
@@ -35,7 +35,7 @@ extern Context context;
 
 static std::map <std::string, Color> gsColor;
 static std::vector <std::string> gsPrecedence;
-static ISO8601d now;
+static Datetime now;
 
 ////////////////////////////////////////////////////////////////////////////////
 void initializeColorRules ()
@@ -127,7 +127,7 @@ static void colorizeActive (Task& task, const Color& base, Color& c, bool merge)
 static void colorizeScheduled (Task& task, const Color& base, Color& c, bool merge)
 {
   if (task.has ("scheduled") &&
-      ISO8601d (task.get_date ("scheduled")) <= now)
+      Datetime (task.get_date ("scheduled")) <= now)
     applyColor (base, c, merge);
 }
 

From e15bf5105cebc6940080a26e7098fa6f56f11515 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:44:29 -0500
Subject: [PATCH 209/879] ColDescription: Migrated from ISO8601d to Datetime

---
 src/columns/ColDescription.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index f45358858..512ce02c1 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -28,7 +28,7 @@
 #include <ColDescription.h>
 #include <stdlib.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
@@ -55,7 +55,7 @@ ColumnDescription::ColumnDescription ()
   if (_dateformat == "")
     _dateformat = context.config.get ("dateformat");
 
-  std::string t  = ISO8601d ().toString (_dateformat);
+  std::string t  = Datetime ().toString (_dateformat);
   std::string d  = STRING_COLUMN_EXAMPLES_DESC;
   std::string a1 = STRING_COLUMN_EXAMPLES_ANNO1;
   std::string a2 = STRING_COLUMN_EXAMPLES_ANNO2;
@@ -97,7 +97,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
 
     if (task.annotation_count)
     {
-      unsigned int min_anno = _indent + ISO8601d::length (_dateformat);
+      unsigned int min_anno = _indent + Datetime::length (_dateformat);
       if (min_anno > minimum)
         minimum = min_anno;
 
@@ -127,7 +127,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
 
     if (task.annotation_count)
     {
-      auto min_anno = ISO8601d::length (_dateformat);
+      auto min_anno = Datetime::length (_dateformat);
       std::map <std::string, std::string> annos;
       task.getAnnotations (annos);
       for (auto& i : annos)
@@ -182,7 +182,7 @@ void ColumnDescription::render (
       task.getAnnotations (annos);
       for (const auto& i : annos)
       {
-        ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
+        Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
         description += '\n' + std::string (_indent, ' ') + dt.toString (_dateformat) + ' ' + i.second;
       }
     }
@@ -213,7 +213,7 @@ void ColumnDescription::render (
       task.getAnnotations (annos);
       for (const auto& i : annos)
       {
-        ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
+        Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
         description += ' ' + dt.toString (_dateformat) + ' ' + i.second;
       }
     }

From af4222d7d2c79310fc0bad8aefeafad19487d277 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:53:28 -0500
Subject: [PATCH 210/879] CmdTimesheet: Migrated from ISO8601d to Datetime

---
 src/commands/CmdTimesheet.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index dd344d20c..f9673d294 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -31,7 +31,7 @@
 #include <Context.h>
 #include <Filter.h>
 #include <Table.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <main.h>
 #include <i18n.h>
 #include <format.h>
@@ -64,18 +64,18 @@ int CmdTimesheet::execute (std::string& output)
   std::vector <Task> all = context.tdb2.all_tasks ();
 
   // What day of the week does the user consider the first?
-  int weekStart = ISO8601d::dayOfWeek (context.config.get ("weekstart"));
+  int weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
   if (weekStart != 0 && weekStart != 1)
     throw std::string (STRING_DATE_BAD_WEEKSTART);
 
   // Determine the date of the first day of the most recent report.
-  ISO8601d today;
-  ISO8601d start;
+  Datetime today;
+  Datetime start;
   start -= (((today.dayOfWeek () - weekStart) + 7) % 7) * 86400;
 
   // Roll back to midnight.
-  start = ISO8601d (start.month (), start.day (), start.year ());
-  ISO8601d end = start + (7 * 86400);
+  start = Datetime (start.year (), start.month (), start.day ());
+  Datetime end = start + (7 * 86400);
 
   // Determine how many reports to run.
   int quantity = 1;
@@ -86,7 +86,7 @@ int CmdTimesheet::execute (std::string& output)
   std::stringstream out;
   for (int week = 0; week < quantity; ++week)
   {
-    ISO8601d endString (end);
+    Datetime endString (end);
     endString -= 86400;
 
     std::string title = start.toString (context.config.get ("dateformat"))
@@ -121,7 +121,7 @@ int CmdTimesheet::execute (std::string& output)
       // If task completed within range.
       if (task.getStatus () == Task::completed)
       {
-        ISO8601d compDate (task.get_date ("end"));
+        Datetime compDate (task.get_date ("end"));
         if (compDate >= start && compDate < end)
         {
           Color c;
@@ -135,7 +135,7 @@ int CmdTimesheet::execute (std::string& output)
 
           if(task.has ("due"))
           {
-            ISO8601d dt (task.get_date ("due"));
+            Datetime dt (task.get_date ("due"));
             completed.set (row, 2, dt.toString (format));
           }
 
@@ -147,7 +147,7 @@ int CmdTimesheet::execute (std::string& output)
           for (auto& ann : annotations)
             description += '\n'
                          + std::string (indent, ' ')
-                         + ISO8601d (ann.first.substr (11)).toString (context.config.get ("dateformat"))
+                         + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))
                          + ' '
                          + ann.second;
 
@@ -177,7 +177,7 @@ int CmdTimesheet::execute (std::string& output)
       if (task.getStatus () == Task::pending &&
           task.has ("start"))
       {
-        ISO8601d startDate (task.get_date ("start"));
+        Datetime startDate (task.get_date ("start"));
         if (startDate >= start && startDate < end)
         {
           Color c;
@@ -191,7 +191,7 @@ int CmdTimesheet::execute (std::string& output)
 
           if (task.has ("due"))
           {
-            ISO8601d dt (task.get_date ("due"));
+            Datetime dt (task.get_date ("due"));
             started.set (row, 2, dt.toString (format));
           }
 
@@ -203,7 +203,7 @@ int CmdTimesheet::execute (std::string& output)
           for (auto& ann : annotations)
             description += '\n'
                          + std::string (indent, ' ')
-                         + ISO8601d (ann.first.substr (11)).toString (context.config.get ("dateformat"))
+                         + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))
                          + ' '
                          + ann.second;
 

From d455d2b9bffad2509e6dba48839147ae18f21abd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 21:56:18 -0500
Subject: [PATCH 211/879] Dates: Migrated from ISO8601d to Datetime

---
 src/Dates.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Dates.cpp b/src/Dates.cpp
index 1cb4273f0..5fc17e25d 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <shared.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <Lexer.h>
 #include <CLI2.h>
 #include <i18n.h>
@@ -38,14 +38,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 static bool isMonth (const std::string& name, int& i)
 {
-  i = ISO8601d::monthOfYear (name) - 1;
+  i = Datetime::monthOfYear (name) - 1;
   return i != -2 ? true : false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 static bool isDay (const std::string& name, int& i)
 {
-  i = ISO8601d::dayOfWeek (name);
+  i = Datetime::dayOfWeek (name);
   return i != -1 ? true : false;
 }
 
@@ -303,7 +303,7 @@ bool namedDates (const std::string& name, Variant& value)
     t->tm_hour = 24;
     t->tm_min = 0;
     t->tm_sec = -1;
-    t->tm_mday = ISO8601d::daysInMonth (t->tm_mon + 1, t->tm_year + 1900);
+    t->tm_mday = Datetime::daysInMonth (t->tm_year + 1900, t->tm_mon + 1);
     t->tm_isdst = -1;
     value = Variant (mktime (t), Variant::type_date);
   }
@@ -415,7 +415,7 @@ bool namedDates (const std::string& name, Variant& value)
 
         // If it is this month.
         if (d < number &&
-            number <= ISO8601d::daysInMonth (m, y))
+            number <= Datetime::daysInMonth (y, m))
         {
           t->tm_hour = t->tm_min = t->tm_sec = 0;
           t->tm_mon  = m - 1;

From 57f6e0c1a5060d65f427c0fcd4d5f7442ed7992c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:01:56 -0500
Subject: [PATCH 212/879] CmdBurndown: Migrated from ISO8601d to Datetime

---
 src/commands/CmdBurndown.cpp | 64 ++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 0bfd94475..a3860103d 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <Context.h>
 #include <Filter.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <Duration.h>
 #include <main.h>
 #include <i18n.h>
@@ -154,10 +154,10 @@ public:
 private:
   void generateBars ();
   void optimizeGrid ();
-  ISO8601d quantize (const ISO8601d&, char);
+  Datetime quantize (const Datetime&, char);
 
-  ISO8601d increment (const ISO8601d&, char);
-  ISO8601d decrement (const ISO8601d&, char);
+  Datetime increment (const Datetime&, char);
+  Datetime decrement (const Datetime&, char);
   void maxima ();
   void yLabels (std::vector <int>&);
   void calculateRates ();
@@ -175,7 +175,7 @@ public:
   int _estimated_bars;            // Estimated bar count
   int _actual_bars;               // Calculated bar count
   std::map <time_t, Bar> _bars;   // Epoch-indexed set of bars
-  ISO8601d _earliest;             // Date of earliest estimated bar
+  Datetime _earliest;             // Date of earliest estimated bar
   int _carryover_done;            // Number of 'done' tasks prior to chart range
   char _period;                   // D, W, M
   std::string _title;             // Additional description
@@ -231,11 +231,11 @@ void Chart::scanForPeak (std::vector <Task>& tasks)
   for (auto& task : tasks)
   {
     // The entry date is when the counting starts.
-    ISO8601d entry = ISO8601d (task.get_date ("entry"));
+    Datetime entry (task.get_date ("entry"));
 
-    ISO8601d end;
+    Datetime end;
     if (task.has ("end"))
-      end = ISO8601d (task.get_date ("end"));
+      end = Datetime (task.get_date ("end"));
 
     while (entry < end)
     {
@@ -269,13 +269,13 @@ void Chart::scan (std::vector <Task>& tasks)
   generateBars ();
 
   // Not quantized, so that "while (xxx < now)" is inclusive.
-  ISO8601d now;
+  Datetime now;
 
   time_t epoch;
   for (auto& task : tasks)
   {
     // The entry date is when the counting starts.
-    ISO8601d from = quantize (ISO8601d (task.get_date ("entry")), _period);
+    Datetime from = quantize (Datetime (task.get_date ("entry")), _period);
     epoch = from.toEpoch ();
 
     if (_bars.find (epoch) != _bars.end ())
@@ -289,7 +289,7 @@ void Chart::scan (std::vector <Task>& tasks)
     {
       if (task.has ("start"))
       {
-        ISO8601d start = quantize (ISO8601d (task.get_date ("start")), _period);
+        Datetime start = quantize (Datetime (task.get_date ("start")), _period);
         while (from < start)
         {
           epoch = from.toEpoch ();
@@ -323,7 +323,7 @@ void Chart::scan (std::vector <Task>& tasks)
     else if (status == Task::completed)
     {
       // Truncate history so it starts at 'earliest' for completed tasks.
-      ISO8601d end = quantize (ISO8601d (task.get_date ("end")), _period);
+      Datetime end = quantize (Datetime (task.get_date ("end")), _period);
       epoch = end.toEpoch ();
 
       if (_bars.find (epoch) != _bars.end ())
@@ -359,7 +359,7 @@ void Chart::scan (std::vector <Task>& tasks)
     else if (status == Task::deleted)
     {
       // Skip old deleted tasks.
-      ISO8601d end = quantize (ISO8601d (task.get_date ("end")), _period);
+      Datetime end = quantize (Datetime (task.get_date ("end")), _period);
       epoch = end.toEpoch ();
       if (_bars.find (epoch) != _bars.end ())
         ++_bars[epoch]._removed;
@@ -590,7 +590,7 @@ void Chart::optimizeGrid ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ISO8601d Chart::quantize (const ISO8601d& input, char period)
+Datetime Chart::quantize (const Datetime& input, char period)
 {
   if (period == 'D') return input.startOfDay ();
   if (period == 'W') return input.startOfWeek ();
@@ -600,7 +600,7 @@ ISO8601d Chart::quantize (const ISO8601d& input, char period)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ISO8601d Chart::increment (const ISO8601d& input, char period)
+Datetime Chart::increment (const Datetime& input, char period)
 {
   // Move to the next period.
   int d = input.day ();
@@ -612,7 +612,7 @@ ISO8601d Chart::increment (const ISO8601d& input, char period)
   switch (period)
   {
   case 'D':
-    if (++d > ISO8601d::daysInMonth (m, y))
+    if (++d > Datetime::daysInMonth (y, m))
     {
       d = 1;
 
@@ -626,7 +626,7 @@ ISO8601d Chart::increment (const ISO8601d& input, char period)
 
   case 'W':
     d += 7;
-    days = ISO8601d::daysInMonth (m, y);
+    days = Datetime::daysInMonth (y, m);
     if (d > days)
     {
       d -= days;
@@ -649,11 +649,11 @@ ISO8601d Chart::increment (const ISO8601d& input, char period)
     break;
   }
 
-  return ISO8601d (m, d, y, 0, 0, 0);
+  return Datetime (y, m, d, 0, 0, 0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ISO8601d Chart::decrement (const ISO8601d& input, char period)
+Datetime Chart::decrement (const Datetime& input, char period)
 {
   // Move to the previous period.
   int d = input.day ();
@@ -671,7 +671,7 @@ ISO8601d Chart::decrement (const ISO8601d& input, char period)
         --y;
       }
 
-      d = ISO8601d::daysInMonth (m, y);
+      d = Datetime::daysInMonth (y, m);
     }
     break;
 
@@ -685,7 +685,7 @@ ISO8601d Chart::decrement (const ISO8601d& input, char period)
         y--;
       }
 
-      d += ISO8601d::daysInMonth (m, y);
+      d += Datetime::daysInMonth (y, m);
     }
     break;
 
@@ -699,7 +699,7 @@ ISO8601d Chart::decrement (const ISO8601d& input, char period)
     break;
   }
 
-  return ISO8601d (m, d, y, 0, 0, 0);
+  return Datetime (y, m, d, 0, 0, 0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -709,12 +709,12 @@ void Chart::generateBars ()
   Bar bar;
 
   // Determine the last bar date.
-  ISO8601d cursor;
+  Datetime cursor;
   switch (_period)
   {
-  case 'D': cursor = ISO8601d ().startOfDay ();   break;
-  case 'W': cursor = ISO8601d ().startOfWeek ();  break;
-  case 'M': cursor = ISO8601d ().startOfMonth (); break;
+  case 'D': cursor = Datetime ().startOfDay ();   break;
+  case 'W': cursor = Datetime ().startOfWeek ();  break;
+  case 'M': cursor = Datetime ().startOfMonth (); break;
   }
 
   // Iterate and determine all the other bar dates.
@@ -726,7 +726,7 @@ void Chart::generateBars ()
     {
     case 'D': // month/day
       {
-        std::string month = ISO8601d::monthName (cursor.month ());
+        std::string month = Datetime::monthName (cursor.month ());
         bar._major_label = month.substr (0, 3);
 
         snprintf (str, 12, "%02d", cursor.day ());
@@ -738,7 +738,7 @@ void Chart::generateBars ()
       snprintf (str, 12, "%d", cursor.year ());
       bar._major_label = str;
 
-      snprintf (str, 12, "%02d", cursor.weekOfYear (0));
+      snprintf (str, 12, "%02d", cursor.week ());
       bar._minor_label = str;
       break;
 
@@ -814,7 +814,7 @@ void Chart::calculateRates ()
   peak_message << "Chart::calculateRates Maximum of "
                << _peak_count
                << " pending tasks on "
-               << (ISO8601d (_peak_epoch).toISO ())
+               << (Datetime (_peak_epoch).toISO ())
                << ", with currently "
                << _current_count
                << " pending tasks";
@@ -826,8 +826,8 @@ void Chart::calculateRates ()
     return;
 
   // If there is a net fix rate, and the peak was at least three days ago.
-  ISO8601d now;
-  ISO8601d peak (_peak_epoch);
+  Datetime now;
+  Datetime peak (_peak_epoch);
   if (_peak_count > _current_count &&
       (now - peak) > 3 * 86400)
   {
@@ -846,7 +846,7 @@ void Chart::calculateRates ()
     context.debug (rate_message.str ());
 
     Duration delta (static_cast <time_t> (_current_count / fix_rate));
-    ISO8601d end = now + delta.toTime_t ();
+    Datetime end = now + delta.toTime_t ();
 
     // Prefer dateformat.report over dateformat.
     std::string format = context.config.get ("dateformat.report");

From 70ad78d234360aa706393b58e3e19a5fdaa82c81 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:08:38 -0500
Subject: [PATCH 213/879] CmdCalendar: Migrated from ISO8601d to Datetime

---
 src/commands/CmdCalendar.cpp | 64 ++++++++++++++++++------------------
 src/commands/CmdCalendar.h   |  4 +--
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index d500d6e0d..1e27cb5af 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -76,7 +76,7 @@ int CmdCalendar::execute (std::string& output)
   handleRecurrence ();
   auto tasks = context.tdb2.pending.get_tasks ();
 
-  ISO8601d today;
+  Datetime today;
   bool getpendingdate = false;
   int monthsToDisplay = 1;
   int mFrom = today.month ();
@@ -100,7 +100,7 @@ int CmdCalendar::execute (std::string& output)
   // Set up a vector of months, for autoComplete.
   std::vector <std::string> monthNames;
   for (int i = 1; i <= 12; ++i)
-    monthNames.push_back (Lexer::lowerCase (ISO8601d::monthName (i)));
+    monthNames.push_back (Lexer::lowerCase (Datetime::monthName (i)));
 
   // For autoComplete results.
   std::vector <std::string> matches;
@@ -141,7 +141,7 @@ int CmdCalendar::execute (std::string& output)
     // "January" etc.
     else if (autoComplete (Lexer::lowerCase (arg), monthNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
     {
-      argMonth = ISO8601d::monthOfYear (matches[0]);
+      argMonth = Datetime::monthOfYear (matches[0]);
       if (argMonth == -1)
         throw format (STRING_CMD_CAL_BAD_MONTH, arg);
     }
@@ -178,7 +178,7 @@ int CmdCalendar::execute (std::string& output)
   if (getpendingdate == true)
   {
     // Find the oldest pending due date.
-    ISO8601d oldest (12, 31, 2037);
+    Datetime oldest (2037, 12, 31);
     for (auto& task : tasks)
     {
       if (task.getStatus () == Task::pending)
@@ -187,7 +187,7 @@ int CmdCalendar::execute (std::string& output)
             !task.hasTag ("nocal"))
         {
           ++countDueDates;
-          ISO8601d d (task.get ("due"));
+          Datetime d (task.get ("due"));
           if (d < oldest) oldest = d;
         }
       }
@@ -236,7 +236,7 @@ int CmdCalendar::execute (std::string& output)
     // Print month headers (cheating on the width settings, yes)
     for (int i = 0 ; i < monthsPerLine ; i++)
     {
-      std::string month = ISO8601d::monthName (nextM);
+      std::string month = Datetime::monthName (nextM);
 
       //    12345678901234567890123456 = 26 chars wide
       //                ^^             = center
@@ -319,7 +319,7 @@ int CmdCalendar::execute (std::string& output)
       details_mFrom = 12;
       --details_yFrom;
     }
-    int details_dFrom = ISO8601d::daysInMonth (details_mFrom, details_yFrom);
+    int details_dFrom = Datetime::daysInMonth (details_yFrom, details_mFrom);
 
     ++mTo;
     if (mTo == 13)
@@ -328,10 +328,10 @@ int CmdCalendar::execute (std::string& output)
       ++yTo;
     }
 
-    ISO8601d date_after (details_mFrom, details_dFrom, details_yFrom);
+    Datetime date_after (details_yFrom, details_mFrom, details_dFrom);
     std::string after = date_after.toString (context.config.get ("dateformat"));
 
-    ISO8601d date_before (mTo, 1, yTo);
+    Datetime date_before (yTo, mTo, 1);
     std::string before = date_before.toString (context.config.get ("dateformat"));
 
     // Table with due date information
@@ -381,7 +381,7 @@ int CmdCalendar::execute (std::string& output)
           {
             std::string holName = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".name");
             std::string holDate = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".date");
-            ISO8601d hDate (holDate.c_str (), context.config.get ("dateformat.holiday"));
+            Datetime hDate (holDate.c_str (), context.config.get ("dateformat.holiday"));
 
             if (date_after < hDate && hDate < date_before)
               hm[hDate.toEpoch()].push_back(holName);
@@ -398,7 +398,7 @@ int CmdCalendar::execute (std::string& output)
       for (auto& hm_it : hm)
       {
         std::vector <std::string> v = hm_it.second;
-        ISO8601d hDate (hm_it.first);
+        Datetime hDate (hm_it.first);
         std::string d = hDate.toString (format);
         for (size_t i = 0; i < v.size(); i++)
         {
@@ -422,12 +422,12 @@ int CmdCalendar::execute (std::string& output)
 std::string CmdCalendar::renderMonths (
   int firstMonth,
   int firstYear,
-  const ISO8601d& today,
+  const Datetime& today,
   std::vector <Task>& all,
   int monthsPerLine)
 {
   // What day of the week does the user consider the first?
-  int weekStart = ISO8601d::dayOfWeek (context.config.get ("weekstart"));
+  int weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
   if (weekStart != 0 && weekStart != 1)
     throw std::string (STRING_CMD_CAL_SUN_MON);
 
@@ -442,24 +442,24 @@ std::string CmdCalendar::renderMonths (
     if (weekStart == 1)
     {
       view.add ("", false);
-      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (1), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (2), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (3), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (4), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (5), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (6), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (0), 0, 2), false);
     }
     else
     {
       view.add ("", false);
-      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
-      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (0), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (1), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (2), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (3), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (4), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (5), 0, 2), false);
+      view.add (utf8_substr (Datetime::dayName (6), 0, 2), false);
     }
   }
 
@@ -489,7 +489,7 @@ std::string CmdCalendar::renderMonths (
       years.push_back (++thisYear);
     }
     months.push_back (thisMonth);
-    daysInMonth.push_back (ISO8601d::daysInMonth (thisMonth++, thisYear));
+    daysInMonth.push_back (Datetime::daysInMonth (thisYear, thisMonth++));
   }
 
   int row = 0;
@@ -512,9 +512,9 @@ std::string CmdCalendar::renderMonths (
     // Loop through days in month and add to table.
     for (int d = 1; d <= daysInMonth[mpl]; ++d)
     {
-      ISO8601d temp (months[mpl], d, years[mpl]);
+      Datetime temp (years[mpl], months[mpl], d);
       int dow = temp.dayOfWeek ();
-      int woy = temp.weekOfYear (weekStart);
+      int woy = temp.week ();
 
       if (context.config.getBoolean ("displayweeknumber"))
         view.set (row,
@@ -549,7 +549,7 @@ std::string CmdCalendar::renderMonths (
               if (hol.first.substr (hol.first.size () - 4) == "date")
               {
                 std::string value = hol.second;
-                ISO8601d holDate (value.c_str (), context.config.get ("dateformat.holiday"));
+                Datetime holDate (value.c_str (), context.config.get ("dateformat.holiday"));
                 if (holDate.day   () == d           &&
                     holDate.month () == months[mpl] &&
                     holDate.year  () == years[mpl])
@@ -574,7 +574,7 @@ std::string CmdCalendar::renderMonths (
                 task.has ("due"))
             {
               std::string due = task.get ("due");
-              ISO8601d duedmy (strtol (due.c_str(), NULL, 10));
+              Datetime duedmy (strtol (due.c_str(), NULL, 10));
 
               if (duedmy.day   () == d           &&
                   duedmy.month () == months[mpl] &&
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index 3ffd55eb4..5c38ddb58 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <vector>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <Task.h>
 #include <Command.h>
 
@@ -40,7 +40,7 @@ public:
   int execute (std::string&);
 
 private:
-  std::string renderMonths (int, int, const ISO8601d&, std::vector <Task>&, int);
+  std::string renderMonths (int, int, const Datetime&, std::vector <Task>&, int);
 };
 
 #endif

From d8d5b14e6693129d8eb464848c7a6633500c8af1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:13:31 -0500
Subject: [PATCH 214/879] CmdHistory: Migrated from ISO8601d to Datetime

---
 src/commands/CmdHistory.cpp | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 562b69abd..b4cbd3641 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -34,7 +34,7 @@
 #include <format.h>
 #include <util.h>
 #include <i18n.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 
 extern Context context;
 
@@ -72,11 +72,11 @@ int CmdHistoryMonthly::execute (std::string& output)
 
   for (auto& task : filtered)
   {
-    ISO8601d entry (task.get_date ("entry"));
+    Datetime entry (task.get_date ("entry"));
 
-    ISO8601d end;
+    Datetime end;
     if (task.has ("end"))
-      end = ISO8601d (task.get_date ("end"));
+      end = Datetime (task.get_date ("end"));
 
     time_t epoch = entry.startOfMonth ().toEpoch ();
     groups[epoch] = 0;
@@ -134,16 +134,16 @@ int CmdHistoryMonthly::execute (std::string& output)
     totalCompleted += completedGroup [i.first];
     totalDeleted   += deletedGroup   [i.first];
 
-    ISO8601d dt (i.first);
+    Datetime dt (i.first);
     int m, d, y;
-    dt.toMDY (m, d, y);
+    dt.toYMD (y, m, d);
 
     if (y != priorYear)
     {
       view.set (row, 0, y);
       priorYear = y;
     }
-    view.set (row, 1, ISO8601d::monthName(m));
+    view.set (row, 1, Datetime::monthName(m));
 
     int net = 0;
 
@@ -239,11 +239,11 @@ int CmdHistoryAnnual::execute (std::string& output)
 
   for (auto& task : filtered)
   {
-    ISO8601d entry (task.get_date ("entry"));
+    Datetime entry (task.get_date ("entry"));
 
-    ISO8601d end;
+    Datetime end;
     if (task.has ("end"))
-      end = ISO8601d (task.get_date ("end"));
+      end = Datetime (task.get_date ("end"));
 
     time_t epoch = entry.startOfYear ().toEpoch ();
     groups[epoch] = 0;
@@ -300,9 +300,9 @@ int CmdHistoryAnnual::execute (std::string& output)
     totalCompleted += completedGroup [i.first];
     totalDeleted   += deletedGroup   [i.first];
 
-    ISO8601d dt (i.first);
+    Datetime dt (i.first);
     int m, d, y;
-    dt.toMDY (m, d, y);
+    dt.toYMD (y, m, d);
 
     if (y != priorYear)
     {
@@ -403,11 +403,11 @@ int CmdGHistoryMonthly::execute (std::string& output)
 
   for (auto& task : filtered)
   {
-    ISO8601d entry (task.get_date ("entry"));
+    Datetime entry (task.get_date ("entry"));
 
-    ISO8601d end;
+    Datetime end;
     if (task.has ("end"))
-      end = ISO8601d (task.get_date ("end"));
+      end = Datetime (task.get_date ("end"));
 
     time_t epoch = entry.startOfMonth ().toEpoch ();
     groups[epoch] = 0;
@@ -482,16 +482,16 @@ int CmdGHistoryMonthly::execute (std::string& output)
       totalCompleted += completedGroup[i.first];
       totalDeleted   += deletedGroup[i.first];
 
-      ISO8601d dt (i.first);
+      Datetime dt (i.first);
       int m, d, y;
-      dt.toMDY (m, d, y);
+      dt.toYMD (y, m, d);
 
       if (y != priorYear)
       {
         view.set (row, 0, y);
         priorYear = y;
       }
-      view.set (row, 1, ISO8601d::monthName(m));
+      view.set (row, 1, Datetime::monthName(m));
 
       unsigned int addedBar     = (widthOfBar *     addedGroup[i.first]) / maxLine;
       unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;
@@ -605,11 +605,11 @@ int CmdGHistoryAnnual::execute (std::string& output)
 
   for (auto& task : filtered)
   {
-    ISO8601d entry (task.get_date ("entry"));
+    Datetime entry (task.get_date ("entry"));
 
-    ISO8601d end;
+    Datetime end;
     if (task.has ("end"))
-      end = ISO8601d (task.get_date ("end"));
+      end = Datetime (task.get_date ("end"));
 
     time_t epoch = entry.startOfYear ().toEpoch ();
     groups[epoch] = 0;
@@ -683,9 +683,9 @@ int CmdGHistoryAnnual::execute (std::string& output)
       totalCompleted += completedGroup[i.first];
       totalDeleted   += deletedGroup[i.first];
 
-      ISO8601d dt (i.first);
+      Datetime dt (i.first);
       int m, d, y;
-      dt.toMDY (m, d, y);
+      dt.toYMD (y, m, d);
 
       if (y != priorYear)
       {

From 73e373527f9c2cb32d9e147e4aaa7d213940673a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:18:46 -0500
Subject: [PATCH 215/879] Task: Migrated from ISO8601d to Datetime

---
 src/Task.cpp | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 552bc2729..c0aaf4338 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -42,7 +42,7 @@
 #include <Pig.h>
 #endif
 #include <Duration.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #ifdef PRODUCT_TASKWARRIOR
 #include <RX.h>
 #endif
@@ -321,9 +321,9 @@ Task::dateState Task::getDateState (const std::string& name) const
   std::string value = get (name);
   if (value.length ())
   {
-    ISO8601d reference (value);
-    ISO8601d now;
-    ISO8601d today ("today");
+    Datetime reference (value);
+    Datetime now;
+    Datetime today ("today");
 
     if (reference < today)
       return dateBeforeToday;
@@ -340,7 +340,7 @@ Task::dateState Task::getDateState (const std::string& name) const
     if (imminentperiod == 0)
       return dateAfterToday;
 
-    ISO8601d imminentDay = today + imminentperiod * 86400;
+    Datetime imminentDay = today + imminentperiod * 86400;
     if (reference < imminentDay)
       return dateAfterToday;
   }
@@ -356,7 +356,7 @@ bool Task::is_ready () const
   return getStatus () == Task::pending &&
          ! is_blocked                  &&
          (! has ("scheduled")          ||
-          ISO8601d ("now").operator> (get_date ("scheduled")));
+          Datetime ("now").operator> (get_date ("scheduled")));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -390,7 +390,7 @@ bool Task::is_dueyesterday () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      if (ISO8601d ("yesterday").sameDay (get_date ("due")))
+      if (Datetime ("yesterday").sameDay (get_date ("due")))
         return true;
     }
   }
@@ -428,7 +428,7 @@ bool Task::is_duetomorrow () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      if (ISO8601d ("tomorrow").sameDay (get_date ("due")))
+      if (Datetime ("tomorrow").sameDay (get_date ("due")))
         return true;
     }
   }
@@ -446,8 +446,8 @@ bool Task::is_dueweek () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d due (get_date ("due"));
-      if (due.sameWeek (ISO8601d ()))
+      Datetime due (get_date ("due"));
+      if (due.sameWeek (Datetime ()))
         return true;
     }
   }
@@ -465,8 +465,8 @@ bool Task::is_duemonth () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d due (get_date ("due"));
-      if (due.sameMonth (ISO8601d ()))
+      Datetime due (get_date ("due"));
+      if (due.sameMonth (Datetime ()))
         return true;
     }
   }
@@ -484,8 +484,8 @@ bool Task::is_duequarter () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d due (get_date ("due"));
-      if (due.sameQuarter (ISO8601d ()))
+      Datetime due (get_date ("due"));
+      if (due.sameQuarter (Datetime ()))
         return true;
     }
   }
@@ -503,8 +503,8 @@ bool Task::is_dueyear () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d due (get_date ("due"));
-      if (due.sameYear (ISO8601d ()))
+      Datetime due (get_date ("due"));
+      if (due.sameYear (Datetime ()))
         return true;
     }
   }
@@ -665,7 +665,7 @@ void Task::parseJSON (const json::object* root_obj)
       {
         auto text = i.second->dump ();
         Lexer::dequote (text);
-        ISO8601d d (text);
+        Datetime d (text);
         set ("modified", d.toEpochString ());
       }
 
@@ -674,7 +674,7 @@ void Task::parseJSON (const json::object* root_obj)
       {
         auto text = i.second->dump ();
         Lexer::dequote (text);
-        ISO8601d d (text);
+        Datetime d (text);
         set (i.first, text == "" ? "" : d.toEpochString ());
       }
 
@@ -762,7 +762,7 @@ void Task::parseJSON (const json::object* root_obj)
           if (! what)
             throw format (STRING_TASK_NO_DESC, root_obj->dump ());
 
-          std::string name = "annotation_" + ISO8601d (when->_data).toEpochString ();
+          std::string name = "annotation_" + Datetime (when->_data).toEpochString ();
           annos.insert (std::make_pair (name, json::decode (what->_data)));
         }
 
@@ -893,7 +893,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
     // Date fields are written as ISO 8601.
     if (type == "date")
     {
-      ISO8601d d (i.second);
+      Datetime d (i.second);
       out << '"'
           << (i.first == "modification" ? "modified" : i.first)
           << "\":\""
@@ -907,7 +907,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
 /*
     else if (type == "duration")
     {
-      // TODO Emit ISO8601d
+      // TODO Emit Datetime
     }
 */
     else if (type == "numeric")
@@ -1006,7 +1006,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
         if (annotations_written)
           out << ',';
 
-        ISO8601d d (i.first.substr (11));
+        Datetime d (i.first.substr (11));
         out << "{\"entry\":\""
             << d.toISO ()
             << "\",\"description\":\""
@@ -1547,9 +1547,9 @@ void Task::validate (bool applyDefault /* = true */)
       {
         Duration dur (Task::defaultDue);
         if (dur.toTime_t () != 0)
-          set ("due", (ISO8601d () + dur.toTime_t ()).toEpoch ());
+          set ("due", (Datetime () + dur.toTime_t ()).toEpoch ());
         else
-          set ("due", ISO8601d (Task::defaultDue).toEpoch ());
+          set ("due", Datetime (Task::defaultDue).toEpoch ());
       }
     }
 
@@ -1628,8 +1628,8 @@ void Task::validate_before (const std::string& left, const std::string& right)
   if (has (left) &&
       has (right))
   {
-    ISO8601d date_left (get_date (left));
-    ISO8601d date_right (get_date (right));
+    Datetime date_left (get_date (left));
+    Datetime date_right (get_date (right));
 
     // if date is zero, then it is being removed (e.g. "due: wait:1day")
     if (date_left > date_right && date_right.toEpoch () != 0)
@@ -1965,8 +1965,8 @@ float Task::urgency_due () const
 {
   if (has ("due"))
   {
-    ISO8601d now;
-    ISO8601d due (get_date ("due"));
+    Datetime now;
+    Datetime due (get_date ("due"));
 
     // Map a range of 21 days to the value 0.2 - 1.0
     float days_overdue = (now - due) / 86400.0;
@@ -1983,8 +1983,8 @@ float Task::urgency_age () const
 {
   assert (has ("entry"));
 
-  ISO8601d now;
-  ISO8601d entry (get_date ("entry"));
+  Datetime now;
+  Datetime entry (get_date ("entry"));
   int age = (now - entry) / 86400;  // in days
 
   if (Task::urgencyAgeMax == 0 || age > Task::urgencyAgeMax)

From afe6bdbfb373d3bcd1834ba90c8ee1d802c06c1f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:21:02 -0500
Subject: [PATCH 216/879] Context: Migrated from ISO8601d to Datetime

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index d330cfda3..d7ab0c59b 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -323,7 +323,7 @@ int Context::run ()
       << '-'
 #endif
       << ' '
-      << ISO8601d ().toISO ()
+      << Datetime ().toISO ()
 
       << " init:"   << time_init_us
       << " load:"   << time_load_us

From c64e019f2925652be1cc065d4e59e184fb799300 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 22:36:29 -0500
Subject: [PATCH 217/879] recur: Migrated from ISO8601d to Datetime

---
 src/main.h    |  6 +++---
 src/recur.cpp | 60 +++++++++++++++++++++++++--------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main.h b/src/main.h
index 1fd8dd628..8856e05ce 100644
--- a/src/main.h
+++ b/src/main.h
@@ -33,13 +33,13 @@
 #include <map>
 #include <sys/types.h>
 #include <Context.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <Color.h>
 
 // recur.cpp
 void handleRecurrence ();
-ISO8601d getNextRecurrence (ISO8601d&, std::string&);
-bool generateDueDates (Task&, std::vector <ISO8601d>&);
+Datetime getNextRecurrence (Datetime&, std::string&);
+bool generateDueDates (Task&, std::vector <Datetime>&);
 void updateRecurrenceMask (Task&);
 bool nag (Task&);
 
diff --git a/src/recur.cpp b/src/recur.cpp
index d2800f244..b5539f6a7 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -39,7 +39,7 @@
 #include <time.h>
 #include <Context.h>
 #include <Lexer.h>
-#include <ISO8601.h>
+#include <Datetime.h>
 #include <Duration.h>
 #include <format.h>
 #include <util.h>
@@ -60,7 +60,7 @@ void handleRecurrence ()
     return;
 
   auto tasks = context.tdb2.pending.get_tasks ();
-  ISO8601d now;
+  Datetime now;
 
   // Look at all tasks and find any recurring ones.
   for (auto& t : tasks)
@@ -69,7 +69,7 @@ void handleRecurrence ()
     {
       // Generate a list of due dates for this recurring task, regardless of
       // the mask.
-      std::vector <ISO8601d> due;
+      std::vector <Datetime> due;
       if (!generateDueDates (t, due))
       {
         // Determine the end date.
@@ -101,9 +101,9 @@ void handleRecurrence ()
 
           if (t.has ("wait"))
           {
-            ISO8601d old_wait (t.get_date ("wait"));
-            ISO8601d old_due (t.get_date ("due"));
-            ISO8601d due (d);
+            Datetime old_wait (t.get_date ("wait"));
+            Datetime old_due (t.get_date ("due"));
+            Datetime due (d);
             rec.set ("wait", format ((due + (old_wait - old_due)).toEpoch ()));
             rec.setStatus (Task::waiting);
             mask += 'W';
@@ -139,7 +139,7 @@ void handleRecurrence ()
     else
     {
       if (t.has ("until") &&
-          ISO8601d (t.get_date ("until")) < now)
+          Datetime (t.get_date ("until")) < now)
       {
         t.setStatus (Task::deleted);
         context.tdb2.modify(t);
@@ -154,27 +154,27 @@ void handleRecurrence ()
 // period (recur).  Then generate a set of corresponding dates.
 //
 // Returns false if the parent recurring task is depleted.
-bool generateDueDates (Task& parent, std::vector <ISO8601d>& allDue)
+bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
 {
   // Determine due date, recur period and until date.
-  ISO8601d due (parent.get_date ("due"));
+  Datetime due (parent.get_date ("due"));
   if (due._date == 0)
     return false;
 
   std::string recur = parent.get ("recur");
 
   bool specificEnd = false;
-  ISO8601d until;
+  Datetime until;
   if (parent.get ("until") != "")
   {
-    until = ISO8601d (parent.get ("until"));
+    until = Datetime (parent.get ("until"));
     specificEnd = true;
   }
 
   int recurrence_limit = context.config.getInteger ("recurrence.limit");
   int recurrence_counter = 0;
-  ISO8601d now;
-  for (ISO8601d i = due; ; i = getNextRecurrence (i, recur))
+  Datetime now;
+  for (Datetime i = due; ; i = getNextRecurrence (i, recur))
   {
     allDue.push_back (i);
 
@@ -202,7 +202,7 @@ bool generateDueDates (Task& parent, std::vector <ISO8601d>& allDue)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
+Datetime getNextRecurrence (Datetime& current, std::string& period)
 {
   int m = current.month ();
   int d = current.day ();
@@ -221,10 +221,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period == "weekdays")
@@ -251,10 +251,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period[0] == 'P'                                            &&
@@ -270,10 +270,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y);
+    return Datetime (y, m, d);
   }
 
   else if (period == "quarterly" ||
@@ -286,10 +286,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q')
@@ -303,10 +303,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period == "semiannual" ||
@@ -319,10 +319,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period == "bimonthly" ||
@@ -335,10 +335,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
        ++y;
     }
 
-    while (! ISO8601d::valid (m, d, y))
+    while (! Datetime::valid (y, m, d))
       --d;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period == "biannual" ||
@@ -347,7 +347,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
   {
     y += 2;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   else if (period == "annual" ||
@@ -361,7 +361,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
     if (m == 2 && d == 29)
       d = 28;
 
-    return ISO8601d (m, d, y, ho, mi, se);
+    return Datetime (y, m, d, ho, mi, se);
   }
 
   // Add the period to current, and we're done.

From 3c879e868aae7d3b1575f4d965ccccbe223d8738 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 18 Dec 2016 13:06:16 -0500
Subject: [PATCH 218/879] Docs: Updated dev docs

---
 DEVELOPER  | 19 ++++---------------
 EXPOSITION | 29 ++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index 545557b14..ce2f9b01b 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -125,9 +125,9 @@ Unit Tests Needed
      For example, dependencies.t runs through a long list of commands that test
      dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
   2. Regression tests that ensure certain bugs are fixed and stay fixed. These
-     tests are named bug.NNN.t where NNN refers to the bug number. While it is
-     not worth creating tests for small fixes like typos, it is for changes to
-     the logic.
+     tests are named tw-NNNN.t where NNNN refers to the bug number. While it is
+     not worth creating tests for small fixes like typos, it is for logic
+     changes.
   3. Small feature tests. When small features are added, we would like small,
      low-level feature tests named feature.t, with a descriptive name and
      focused tests.
@@ -143,20 +143,9 @@ Unit Tests Needed
   - Take a look at the bug database (https://bug.tasktools.org) and notice that
     many issues, open and closed, have the "needsTest" label. These are things
     that we would like to see in the test suite, as regression tests.
-  - Test regex support.
-  - Need unit tests for each bug in the issue list that is marked with the
-    'needsTest' label.
 
   Note that all new unit tests should follow the test/template.t standard.
 
-Work in Progress
-
-  Things that are currently in flux, which is another way of saying leave it
-  alone while it is being worked on.
-
-  - All columns/Col*::validate methods.
-  - New columns/Col*::modify methods.
-
 Current Codebase Condition
 
   'master' branch:
@@ -167,4 +156,4 @@ Current Codebase Condition
 
 ---
 
-2016-02-24 Updated for 2.6.0
+2016-12-18 Updated for 2.6.0
diff --git a/EXPOSITION b/EXPOSITION
index 0912f44af..d51f56502 100644
--- a/EXPOSITION
+++ b/EXPOSITION
@@ -25,9 +25,24 @@ Command Line Parsing
   set of modifications.
 
   The CLI2 object is fed command line arguments, then through a succession of
-  calls builds and annotates a parse tree.  To help with this, the Lexer is
+  calls builds and annotates a parse tree. To help with this, the Lexer is
   used to break up strings into tokens.
 
+  The object of the command line parsing is to expand all syntactic sugar to
+  use the low-level syntax, and expand the boolean logic in filters and create
+  a well-formed algebraic expression. For example, this command line:
+
+    task 1-10 +foo lis
+
+  is expanded internally to something like this:
+
+    task ( ( id >= 1 and id <= 10 ) and tags._hastag_ foo ) list
+
+  Note that there are concerns with id ranges, operator precedence, tag
+  checking, and the expansion of the command name. The arguments are then
+  tagged to indicate what part of the command line іt represents, such as a
+  filter, operator, or command.
+
 
 Dispatch
   Dispatch is simple: once the command line is parsed, the command is used to
@@ -129,8 +144,8 @@ Sorting
 
 
 Render
-  There are two rendering objects, ViewTask and ViewText. These both have the
-  same tabular grid rendering capabilities. ViewText maintains a 2D vector of
+  There are two rendering objects, ViewTask and Table. These both have the
+  same tabular grid rendering capabilities. Table maintains a 2D vector of
   strings to contain the data to be rendered, so it is used for things like the
   help command output. ViewTask does not copy data, but assumes all data is
   stored externally in a vector of Tasks, which minimizes data copying.
@@ -149,9 +164,9 @@ Render
 
 Test Suite
   A strong and diverse test suite is critical to the successful release of any
-  software. With the complex command set and its myriad permutations, a test
-  suite is the only way to ensure quality levels, and guarantee that big changes
-  are robust.
+  software. With the complex command set and its many permutations, a test suite
+  is the only way to ensure quality levels, and guarantee that big changes are
+  robust.
 
   It is intended that the test suite continues growing, mostly feature tests.
   The test are mostly written in Python. Some tests are written in C++ and all
@@ -196,7 +211,7 @@ Patches
     - Precisely addresses one issue only.
     - Doesn't break unit tests.
     - Doesn't introduce dependencies.
-    - Is accompanied by unit tests, where appropriate, written in Python.
+    - Is accompanied by unit tests, where appropriate.
     - Is accompanied by documentation changes, where appropriate.
     - Conforms to the prevailing coding standards - in other words, it should
       fit right in with the existing code.

From 44522b11bc999f117a5c8e7f05bffecee3646fa1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 09:03:27 -0500
Subject: [PATCH 219/879] TW-1873: Specify different path to extensions/hooks
 directory

- Thanks to Eli.
---
 AUTHORS                         |  1 +
 ChangeLog                       |  2 ++
 doc/man/taskrc.5.in             |  4 ++++
 src/Config.cpp                  |  6 +++++-
 src/Hooks.cpp                   | 16 +++++++++++++---
 src/commands/CmdDiagnostics.cpp | 12 ++++++++++--
 6 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index eee16bb32..5fa5205cf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -303,3 +303,4 @@ suggestions:
   bjonnh
   OKOMper
   eldios
+  Eli
diff --git a/ChangeLog b/ChangeLog
index d771f7ccb..015e45434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
           (thanks to E. Manuel Cerr'on Angeles)
 - TW-1857 Change Task::get call to the more efficient Task::has
           (thanks to Zachary Manning).
+- TW-1873 Specify different path to extensions/hooks directory
+          (thanks to Eli).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 28c149701..3a708e496 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -180,6 +180,10 @@ shell meta character, which will be properly expanded.
 
 Note that the TASKDATA environment variable overrides this setting.
 
+.TP
+.B hooks.location=$HOME/.task/hooks
+This is a path to the hook scripts directory. By default it is ~/.task/hooks.
+
 .TP
 .B locking=1
 Determines whether to use file locking when accessing the pending.data and
diff --git a/src/Config.cpp b/src/Config.cpp
index 6d904e5d8..7969b90fe 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -532,7 +532,11 @@ void Config::createDefaultData (const std::string& data)
 
     d.create ();
 
-    d += "hooks";
+    if (has ("hooks.location"))
+      d = Directory (get ("hooks.location"));
+    else
+      d += "hooks";
+
     d.create ();
   }
 }
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index f779b6b59..1ef6abbde 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -54,9 +54,19 @@ void Hooks::initialize ()
 {
   _debug = context.config.getInteger ("debug.hooks");
 
-  // Scan <rc.data.location>/hooks
-  Directory d (context.config.get ("data.location"));
-  d += "hooks";
+  // Scan <rc.hooks.location>
+  //      <rc.data.location>/hooks
+  Directory d;
+  if (context.config.has ("hooks.location"))
+  {
+    d = Directory (context.config.get ("hooks.location"));
+  }
+  else
+  {
+    d = Directory (context.config.get ("data.location"));
+    d += "hooks";
+  }
+
   if (d.is_directory () &&
       d.readable ())
   {
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 15362bf99..0e9789f64 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -307,8 +307,16 @@ int CmdDiagnostics::execute (std::string& output)
       << "\n\n";
 
   // Display hook status.
-  Path hookLocation (context.config.get ("data.location"));
-  hookLocation += "hooks";
+  Path hookLocation;
+  if (context.config.has ("hooks.location"))
+  {
+    hookLocation = Path (context.config.get ("hooks.location"));
+  }
+  else
+  {
+    hookLocation = Path (context.config.get ("data.location"));
+    hookLocation += "hooks";
+  }
 
   out << bold.colorize (STRING_CMD_DIAG_HOOKS)
       << '\n'

From 40b8aab7d4aed1fec52f1eb9c1737d49c3649b56 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 11:56:47 -0500
Subject: [PATCH 220/879] TLSClient: Labelled GnuTLS calls with version numbers

---
 src/TLSClient.cpp | 103 +++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 1a9927daf..5516f4188 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -62,17 +62,17 @@ static void gnutls_log_function (int level, const char* message)
 ////////////////////////////////////////////////////////////////////////////////
 static int verify_certificate_callback (gnutls_session_t session)
 {
-  const TLSClient* client = (TLSClient*) gnutls_session_get_ptr (session);
+  const TLSClient* client = (TLSClient*) gnutls_session_get_ptr (session); // All
   return client->verify_certificate ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 TLSClient::~TLSClient ()
 {
-  gnutls_deinit (_session);
-  gnutls_certificate_free_credentials (_credentials);
+  gnutls_deinit (_session); // All
+  gnutls_certificate_free_credentials (_credentials); // All
 #if GNUTLS_VERSION_NUMBER < 0x030300
-  gnutls_global_deinit ();
+  gnutls_global_deinit (); // All
 #endif
 
   if (_socket)
@@ -96,8 +96,8 @@ void TLSClient::debug (int level)
   if (level)
     _debug = true;
 
-  gnutls_global_set_log_function (gnutls_log_function);
-  gnutls_global_set_log_level (level);
+  gnutls_global_set_log_function (gnutls_log_function); // All
+  gnutls_global_set_log_level (level); // All
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -133,23 +133,23 @@ void TLSClient::init (
 
   int ret;
 #if GNUTLS_VERSION_NUMBER < 0x030300
-  ret = gnutls_global_init ();
+  ret = gnutls_global_init (); // All
   if (ret < 0)
-    throw format ("TLS init error. {1}", gnutls_strerror (ret));
+    throw format ("TLS init error. {1}", gnutls_strerror (ret)); // All
 #endif
 
-  ret = gnutls_certificate_allocate_credentials (&_credentials);
+  ret = gnutls_certificate_allocate_credentials (&_credentials); // All
   if (ret < 0)
-    throw format ("TLS allocation error. {1}", gnutls_strerror (ret));
+    throw format ("TLS allocation error. {1}", gnutls_strerror (ret)); // All
 
   if (_ca != "" &&
-      (ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM)) < 0)
-    throw format ("Bad CA file. {1}", gnutls_strerror (ret));
+      (ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // All
+    throw format ("Bad CA file. {1}", gnutls_strerror (ret)); // All
 
   if (_cert != "" &&
       _key != "" &&
-      (ret = gnutls_certificate_set_x509_key_file (_credentials, _cert.c_str (), _key.c_str (), GNUTLS_X509_FMT_PEM)) < 0)
-    throw format ("Bad CERT file. {1}", gnutls_strerror (ret));
+      (ret = gnutls_certificate_set_x509_key_file (_credentials, _cert.c_str (), _key.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // 3.1.11
+    throw format ("Bad CERT file. {1}", gnutls_strerror (ret)); // All
 
 #if GNUTLS_VERSION_NUMBER >= 0x02090a
   // The automatic verification for the server certificate with
@@ -158,28 +158,28 @@ void TLSClient::init (
   // manually after the gnutls handshake.
   gnutls_certificate_set_verify_function (_credentials, verify_certificate_callback);
 #endif
-  ret = gnutls_init (&_session, GNUTLS_CLIENT);
+  ret = gnutls_init (&_session, GNUTLS_CLIENT); // All
   if (ret < 0)
-    throw format ("TLS client init error. {1}", gnutls_strerror (ret));
+    throw format ("TLS client init error. {1}", gnutls_strerror (ret)); // All
 
   // Use default priorities unless overridden.
   if (_ciphers == "")
     _ciphers = "NORMAL";
 
   const char *err;
-  ret = gnutls_priority_set_direct (_session, _ciphers.c_str (), &err);
+  ret = gnutls_priority_set_direct (_session, _ciphers.c_str (), &err); // All
   if (ret < 0)
   {
     if (_debug && ret == GNUTLS_E_INVALID_REQUEST)
       std::cout << "c: ERROR Priority error at: " << err << '\n';
 
-    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret));
+    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret)); // All
   }
 
   // Apply the x509 credentials to the current session.
-  ret = gnutls_credentials_set (_session, GNUTLS_CRD_CERTIFICATE, _credentials);
+  ret = gnutls_credentials_set (_session, GNUTLS_CRD_CERTIFICATE, _credentials); // All
   if (ret < 0)
-    throw format ("TLS credentials error. {1}", gnutls_strerror (ret));
+    throw format ("TLS credentials error. {1}", gnutls_strerror (ret)); // All
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -190,7 +190,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 
   // Store the TLSClient instance, so that the verification callback can access
   // it during the handshake below and call the verifcation method.
-  gnutls_session_set_ptr (_session, (void*) this);
+  gnutls_session_set_ptr (_session, (void*) this); // All
 
   // use IPv4 or IPv6, does not matter.
   struct addrinfo hints {};
@@ -233,17 +233,18 @@ void TLSClient::connect (const std::string& host, const std::string& port)
     throw format (STRING_CMD_SYNC_CONNECT, host, port);
 
 #if GNUTLS_VERSION_NUMBER >= 0x030109
-  gnutls_transport_set_int (_session, _socket);
+  gnutls_transport_set_int (_session, _socket); // 3.1.9
 #else
-  gnutls_transport_set_ptr (_session, (gnutls_transport_ptr_t) (intptr_t) _socket);
+  gnutls_transport_set_ptr (_session, (gnutls_transport_ptr_t) (intptr_t) _socket); // All
 #endif
 
   // Perform the TLS handshake
   do
   {
-    ret = gnutls_handshake (_session);
+    ret = gnutls_handshake (_session); // All
   }
-  while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
+  while (ret < 0 && gnutls_error_is_fatal (ret) == 0); // All
+
   if (ret < 0)
     throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret));
 
@@ -257,14 +258,14 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   {
     if (_debug)
       std::cout << "c: ERROR Certificate verification failed.\n";
-    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret));
+    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret)); // All
   }
 #endif
 
   if (_debug)
   {
 #if GNUTLS_VERSION_NUMBER >= 0x03010a
-    char* desc = gnutls_session_get_desc (_session);
+    char* desc = gnutls_session_get_desc (_session); // 3.1.10
     std::cout << "c: INFO Handshake was completed: " << desc << '\n';
     gnutls_free (desc);
 #else
@@ -276,7 +277,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 ////////////////////////////////////////////////////////////////////////////////
 void TLSClient::bye ()
 {
-  gnutls_bye (_session, GNUTLS_SHUT_RDWR);
+  gnutls_bye (_session, GNUTLS_SHUT_RDWR); // All
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -296,11 +297,11 @@ int TLSClient::verify_certificate () const
   if (_trust == TLSClient::ignore_hostname)
     hostname = NULL;
 
-  int ret = gnutls_certificate_verify_peers3 (_session, hostname, &status);
+  int ret = gnutls_certificate_verify_peers3 (_session, hostname, &status); // 3.1.4
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR Certificate verification peers3 failed. " << gnutls_strerror (ret) << '\n';
+      std::cout << "c: ERROR Certificate verification peers3 failed. " << gnutls_strerror (ret) << '\n'; // All
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
@@ -312,11 +313,11 @@ int TLSClient::verify_certificate () const
   if (_debug && status)
     std::cout << "c: ERROR Certificate status=" << status << '\n';
 #else
-  int ret = gnutls_certificate_verify_peers2 (_session, &status);
+  int ret = gnutls_certificate_verify_peers2 (_session, &status); // All
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR Certificate verification peers2 failed. " << gnutls_strerror (ret) << '\n';
+      std::cout << "c: ERROR Certificate verification peers2 failed. " << gnutls_strerror (ret) << '\n'; // All
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
@@ -325,41 +326,41 @@ int TLSClient::verify_certificate () const
 
   if ((status == 0) && (_trust != TLSClient::ignore_hostname))
   {
-    if (gnutls_certificate_type_get (_session) == GNUTLS_CRT_X509)
+    if (gnutls_certificate_type_get (_session) == GNUTLS_CRT_X509) // All
     {
       const gnutls_datum* cert_list;
       unsigned int cert_list_size;
       gnutls_x509_crt cert;
 
-      cert_list = gnutls_certificate_get_peers (_session, &cert_list_size);
+      cert_list = gnutls_certificate_get_peers (_session, &cert_list_size); // All
       if (cert_list_size == 0)
       {
         if (_debug)
-          std::cout << "c: ERROR Certificate get peers failed. " << gnutls_strerror (ret) << '\n';
+          std::cout << "c: ERROR Certificate get peers failed. " << gnutls_strerror (ret) << '\n'; // All
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
 
-      ret = gnutls_x509_crt_init (&cert);
+      ret = gnutls_x509_crt_init (&cert); // All
       if (ret < 0)
       {
         if (_debug)
-          std::cout << "c: ERROR x509 init failed. " << gnutls_strerror (ret) << '\n';
+          std::cout << "c: ERROR x509 init failed. " << gnutls_strerror (ret) << '\n'; // All
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
 
-      ret = gnutls_x509_crt_import (cert, &cert_list[0], GNUTLS_X509_FMT_DER);
+      ret = gnutls_x509_crt_import (cert, &cert_list[0], GNUTLS_X509_FMT_DER); // All
       if (ret < 0)
       {
         if (_debug)
-          std::cout << "c: ERROR x509 cert import. " << gnutls_strerror (ret) << '\n';
-        gnutls_x509_crt_deinit(cert);
+          std::cout << "c: ERROR x509 cert import. " << gnutls_strerror (ret) << '\n'; // All
+        gnutls_x509_crt_deinit(cert); // All
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
 
-      if (gnutls_x509_crt_check_hostname (cert, hostname) == 0)
+      if (gnutls_x509_crt_check_hostname (cert, hostname) == 0) // All
       {
         if (_debug)
-          std::cout << "c: ERROR x509 cert check hostname. " << gnutls_strerror (ret) << '\n';
+          std::cout << "c: ERROR x509 cert check hostname. " << gnutls_strerror (ret) << '\n'; // All
         gnutls_x509_crt_deinit(cert);
         return GNUTLS_E_CERTIFICATE_ERROR;
       }
@@ -370,13 +371,13 @@ int TLSClient::verify_certificate () const
 #endif
 
 #if GNUTLS_VERSION_NUMBER >= 0x030104
-  gnutls_certificate_type_t type = gnutls_certificate_type_get (_session);
+  gnutls_certificate_type_t type = gnutls_certificate_type_get (_session); // All
   gnutls_datum_t out;
-  ret = gnutls_certificate_verification_status_print (status, type, &out, 0);
+  ret = gnutls_certificate_verification_status_print (status, type, &out, 0); // 3.1.4
   if (ret < 0)
   {
     if (_debug)
-      std::cout << "c: ERROR certificate verification status. " << gnutls_strerror (ret) << '\n';
+      std::cout << "c: ERROR certificate verification status. " << gnutls_strerror (ret) << '\n'; // All
     return GNUTLS_E_CERTIFICATE_ERROR;
   }
 
@@ -412,7 +413,7 @@ void TLSClient::send (const std::string& data)
     int status;
     do
     {
-      status = gnutls_record_send (_session, packet.c_str () + total, remaining);
+      status = gnutls_record_send (_session, packet.c_str () + total, remaining); // All
     }
     while (errno == GNUTLS_E_INTERRUPTED ||
            errno == GNUTLS_E_AGAIN);
@@ -441,7 +442,7 @@ void TLSClient::recv (std::string& data)
   unsigned char header[4] {};
   do
   {
-    received = gnutls_record_recv (_session, header, 4);
+    received = gnutls_record_recv (_session, header, 4); // All
   }
   while (received > 0 &&
          (errno == GNUTLS_E_INTERRUPTED ||
@@ -469,7 +470,7 @@ void TLSClient::recv (std::string& data)
   {
     do
     {
-      received = gnutls_record_recv (_session, buffer, MAX_BUF - 1);
+      received = gnutls_record_recv (_session, buffer, MAX_BUF - 1); // All
     }
     while (received > 0 &&
            (errno == GNUTLS_E_INTERRUPTED ||
@@ -484,13 +485,13 @@ void TLSClient::recv (std::string& data)
     }
 
     // Something happened.
-    if (received < 0 && gnutls_error_is_fatal (received) == 0)
+    if (received < 0 && gnutls_error_is_fatal (received) == 0) // All
     {
       if (_debug)
-        std::cout << "c: WARNING " << gnutls_strerror (received) << '\n';
+        std::cout << "c: WARNING " << gnutls_strerror (received) << '\n'; // All
     }
     else if (received < 0)
-      throw std::string (gnutls_strerror (received));
+      throw std::string (gnutls_strerror (received)); // All
 
     buffer [received] = '\0';
     data += buffer;

From 41234c4f97fc52ed0b0a7324f6a4cf60fb2f6777 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 11:57:24 -0500
Subject: [PATCH 221/879] TLSClient: Commented possible need for version
 protection

---
 src/TLSClient.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 5516f4188..984200bc2 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -146,6 +146,7 @@ void TLSClient::init (
       (ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // All
     throw format ("Bad CA file. {1}", gnutls_strerror (ret)); // All
 
+  // TODO This may need 0x030111 protection.
   if (_cert != "" &&
       _key != "" &&
       (ret = gnutls_certificate_set_x509_key_file (_credentials, _cert.c_str (), _key.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // 3.1.11

From 304a6f7a330a0f65b40d4b3189812c5152640f0b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 11:58:33 -0500
Subject: [PATCH 222/879] TLSClient: Added handshake timeout

---
 src/TLSClient.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 984200bc2..d9ac9d3b7 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -233,6 +233,10 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   if (p == NULL)
     throw format (STRING_CMD_SYNC_CONNECT, host, port);
 
+#if GNUTLS_VERSION_NUMBER >= 0x030100
+  gnutls_handshake_set_timeout (_session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); // 3.1.0
+#endif
+
 #if GNUTLS_VERSION_NUMBER >= 0x030109
   gnutls_transport_set_int (_session, _socket); // 3.1.9
 #else

From 55854907a25b59316eac434324a930e02966c3a2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 11:59:24 -0500
Subject: [PATCH 223/879] TLSClient: Corrected version number for API call

---
 src/TLSClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index d9ac9d3b7..ef29f7b9c 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -253,10 +253,10 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   if (ret < 0)
     throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret));
 
-#if GNUTLS_VERSION_NUMBER < 0x02090a
+#if GNUTLS_VERSION_NUMBER < 0x020a00
   // The automatic verification for the server certificate with
   // gnutls_certificate_set_verify_function does only work with gnutls
-  // >=2.9.10. So with older versions we should call the verify function
+  // >=2.10.0. So with older versions we should call the verify function
   // manually after the gnutls handshake.
   ret = verify_certificate ();
   if (ret < 0)

From a67ce9db0e3c7282a5a924ae4a9439edd13b7baa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 12:01:01 -0500
Subject: [PATCH 224/879] TLSClient: Added GnuTLS 3.4.6 API support

- This greatly simplifies cert validation.
---
 src/TLSClient.cpp | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index ef29f7b9c..d181d466c 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -51,7 +51,11 @@
 
 #define MAX_BUF 16384
 
+#if GNUTLS_VERSION_NUMBER < 0x030406
+#if GNUTLS_VERSION_NUMBER >= 0x020a00
 static int verify_certificate_callback (gnutls_session_t);
+#endif
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 static void gnutls_log_function (int level, const char* message)
@@ -60,11 +64,15 @@ static void gnutls_log_function (int level, const char* message)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+#if GNUTLS_VERSION_NUMBER < 0x030406
+#if GNUTLS_VERSION_NUMBER >= 0x020a00
 static int verify_certificate_callback (gnutls_session_t session)
 {
   const TLSClient* client = (TLSClient*) gnutls_session_get_ptr (session); // All
   return client->verify_certificate ();
 }
+#endif
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 TLSClient::~TLSClient ()
@@ -152,12 +160,14 @@ void TLSClient::init (
       (ret = gnutls_certificate_set_x509_key_file (_credentials, _cert.c_str (), _key.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // 3.1.11
     throw format ("Bad CERT file. {1}", gnutls_strerror (ret)); // All
 
-#if GNUTLS_VERSION_NUMBER >= 0x02090a
+#if GNUTLS_VERSION_NUMBER < 0x030406
+#if GNUTLS_VERSION_NUMBER >= 0x020a00
   // The automatic verification for the server certificate with
   // gnutls_certificate_set_verify_function only works with gnutls
   // >=2.9.10. So with older versions we should call the verify function
   // manually after the gnutls handshake.
-  gnutls_certificate_set_verify_function (_credentials, verify_certificate_callback);
+  gnutls_certificate_set_verify_function (_credentials, verify_certificate_callback); // 2.10.0
+#endif
 #endif
   ret = gnutls_init (&_session, GNUTLS_CLIENT); // All
   if (ret < 0)
@@ -189,6 +199,11 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   _host = host;
   _port = port;
 
+  int ret;
+#if GNUTLS_VERSION_NUMBER >= 0x030406
+  gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
+#endif
+
   // Store the TLSClient instance, so that the verification callback can access
   // it during the handshake below and call the verifcation method.
   gnutls_session_set_ptr (_session, (void*) this); // All
@@ -200,7 +215,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   hints.ai_flags    = AI_PASSIVE; // use my IP
 
   struct addrinfo* res;
-  int ret = ::getaddrinfo (host.c_str (), port.c_str (), &hints, &res);
+  ret = ::getaddrinfo (host.c_str (), port.c_str (), &hints, &res);
   if (ret != 0)
     throw std::string (::gai_strerror (ret));
 
@@ -251,7 +266,23 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0); // All
 
   if (ret < 0)
-    throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret));
+  {
+#if GNUTLS_VERSION_NUMBER >= 0x030406
+    if (ret == GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR)
+    {
+      auto type = gnutls_certificate_type_get (_session); // All
+      auto status = gnutls_session_get_verify_cert_status (_session); // 3.4.6
+      gnutls_datum_t out;
+      gnutls_certificate_verification_status_print (status, type, &out, 0);  // 3.1.4
+      gnutls_free (out.data); // All
+
+      std::string error {(const char*) out.data};
+      throw format (STRING_CMD_SYNC_HANDSHAKE, error);
+    }
+#else
+    throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret)); // All
+#endif
+  }
 
 #if GNUTLS_VERSION_NUMBER < 0x020a00
   // The automatic verification for the server certificate with

From 72463f414ceffa97e93cda1a710427c3837286ae Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 12:05:36 -0500
Subject: [PATCH 225/879] Improved certificate validation diagnostics

- Thanks to Jelle van der Waa.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 5fa5205cf..15bd1771a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -134,6 +134,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Vladimir
   Zachary Manning
   jrabbit
+  Jelle van der Waa
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 015e45434..3aa06ec3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@
   "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
           (thanks to jrabbit).
+- Improved certificate validation diagnostics
+          (thanks to Jelle van der Waa).
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 

From 934f6aeada6a296aaa42eaad151855c606421cc8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 12:16:22 -0500
Subject: [PATCH 226/879] TW-1855: "Well-known" CA certificates not properly
 auto-loaded

- Thanks to Flavio Poletti.
---
 AUTHORS           | 1 +
 ChangeLog         | 2 ++
 src/TLSClient.cpp | 7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 15bd1771a..4b5d254d2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -135,6 +135,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Zachary Manning
   jrabbit
   Jelle van der Waa
+  Flavio Poletti
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 3aa06ec3d..b9b163b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
           (thanks to george js).
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
           (thanks to E. Manuel Cerr'on Angeles)
+- TW-1855 "Well-known" CA certificates not properly auto-loaded
+          (thanks to Flavio Poletti).
 - TW-1857 Change Task::get call to the more efficient Task::has
           (thanks to Zachary Manning).
 - TW-1873 Specify different path to extensions/hooks directory
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index d181d466c..778ea1267 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -150,6 +150,13 @@ void TLSClient::init (
   if (ret < 0)
     throw format ("TLS allocation error. {1}", gnutls_strerror (ret)); // All
 
+#if GNUTLS_VERSION_NUMBER >= 0x030014
+  // Automatic loading of system installed CA certificates.
+  ret = gnutls_certificate_set_x509_system_trust (_credentials); // 3.0.20
+  if (ret < 0)
+    throw format ("Bad System Trust. {1}", gnutls_strerror (ret)); // All
+#endif
+
   if (_ca != "" &&
       (ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // All
     throw format ("Bad CA file. {1}", gnutls_strerror (ret)); // All

From 778d2af36e1d0db6c058276b44b08382cb523f89 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 12:20:49 -0500
Subject: [PATCH 227/879] Config: 'debug.tls' was missing from 'show' command

---
 src/Config.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Config.cpp b/src/Config.cpp
index 7969b90fe..de914f11e 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -258,6 +258,7 @@ std::string Config::_defaults =
   "list.all.tags=0                                # Include old tag names in 'tags' command\n"
   "print.empty.columns=0                          # Print columns which have no data for any task\n"
   "debug=0                                        # Display diagnostics\n"
+  "debug.tls=0                                    # Sync diagnostics\n"
   "sugar=1                                        # Syntactic sugar\n"
   "obfuscate=0                                    # Obfuscate data for error reporting\n"
   "fontunderline=1                                # Uses underlines rather than -------\n"

From ea0fa2057991a8a13519ef6c3363e4dbd6d1355d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 22 Dec 2016 08:49:57 -0500
Subject: [PATCH 228/879] TW-1878: uuids subcommand produces a space-delimited
 list, not comma-delimited

- Thanks to Scott Kostyshak.
---
 ChangeLog         | 2 ++
 doc/man/task.1.in | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9b163b4d..5580c7eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
           (thanks to Zachary Manning).
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
+- TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
+          (thanks to Scott Kostyshak).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index c279e2230..f7d4e0c40 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -231,9 +231,8 @@ This command is mainly of use to external scripts.
 .TP
 .B task <filter> uuids
 Applies the filter on all tasks (even deleted and completed tasks)
-then extracts only the task UUIDs and presents them as
-a comma-separated list.  This is useful as input to a task command, to achieve
-this:
+then extracts only the task UUIDs and presents them as a space-separated list.
+This is useful as input to a task command, to achieve this:
 
   task $(task project:Home status:completed uuids) modify status:pending
 

From 88516acdaa5efda246fb72e27eae606a959c3001 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 1 Jan 2017 12:30:04 -0500
Subject: [PATCH 229/879] Copyright update

---
 COPYING                            | 2 +-
 LICENSE                            | 2 +-
 doc/man/task-color.5.in            | 2 +-
 doc/man/task-sync.5.in             | 2 +-
 doc/man/task.1.in                  | 2 +-
 doc/man/taskrc.5.in                | 2 +-
 doc/rc/dark-16.theme               | 2 +-
 doc/rc/dark-256.theme              | 2 +-
 doc/rc/dark-blue-256.theme         | 2 +-
 doc/rc/dark-gray-256.theme         | 2 +-
 doc/rc/dark-gray-blue-256.theme    | 2 +-
 doc/rc/dark-green-256.theme        | 2 +-
 doc/rc/dark-red-256.theme          | 2 +-
 doc/rc/dark-violets-256.theme      | 2 +-
 doc/rc/dark-yellow-green.theme     | 2 +-
 doc/rc/light-16.theme              | 2 +-
 doc/rc/light-256.theme             | 2 +-
 doc/rc/no-color.theme              | 2 +-
 doc/rc/solarized-dark-256.theme    | 2 +-
 doc/rc/solarized-light-256.theme   | 2 +-
 scripts/add-ons/update-holidays.pl | 4 ++--
 scripts/bash/task.sh               | 2 +-
 scripts/fish/task.fish             | 2 +-
 scripts/utils/l10n                 | 2 +-
 scripts/vim/README                 | 2 +-
 scripts/vim/ftdetect/task.vim      | 2 +-
 scripts/vim/syntax/taskdata.vim    | 2 +-
 scripts/vim/syntax/taskedit.vim    | 2 +-
 scripts/vim/syntax/taskrc.vim      | 2 +-
 scripts/zsh/_task                  | 2 +-
 src/CLI2.cpp                       | 2 +-
 src/CLI2.h                         | 2 +-
 src/Color.cpp                      | 2 +-
 src/Color.h                        | 2 +-
 src/Config.cpp                     | 2 +-
 src/Config.h                       | 2 +-
 src/Context.cpp                    | 2 +-
 src/Context.h                      | 2 +-
 src/DOM.cpp                        | 2 +-
 src/DOM.h                          | 2 +-
 src/Dates.cpp                      | 2 +-
 src/Dates.h                        | 2 +-
 src/Eval.cpp                       | 2 +-
 src/Eval.h                         | 2 +-
 src/Filter.cpp                     | 2 +-
 src/Filter.h                       | 2 +-
 src/Hooks.cpp                      | 2 +-
 src/Hooks.h                        | 2 +-
 src/ISO8601.cpp                    | 2 +-
 src/ISO8601.h                      | 2 +-
 src/Lexer.cpp                      | 2 +-
 src/Lexer.h                        | 2 +-
 src/Nibbler.cpp                    | 2 +-
 src/Nibbler.h                      | 2 +-
 src/TDB2.cpp                       | 2 +-
 src/TDB2.h                         | 2 +-
 src/TLSClient.cpp                  | 2 +-
 src/TLSClient.h                    | 2 +-
 src/Task.cpp                       | 2 +-
 src/Task.h                         | 2 +-
 src/Variant.cpp                    | 2 +-
 src/Variant.h                      | 2 +-
 src/ViewTask.cpp                   | 2 +-
 src/ViewTask.h                     | 2 +-
 src/calc.cpp                       | 2 +-
 src/columns/ColDepends.cpp         | 2 +-
 src/columns/ColDepends.h           | 2 +-
 src/columns/ColDescription.cpp     | 2 +-
 src/columns/ColDescription.h       | 2 +-
 src/columns/ColDue.cpp             | 2 +-
 src/columns/ColDue.h               | 2 +-
 src/columns/ColEnd.cpp             | 2 +-
 src/columns/ColEnd.h               | 2 +-
 src/columns/ColEntry.cpp           | 2 +-
 src/columns/ColEntry.h             | 2 +-
 src/columns/ColID.cpp              | 2 +-
 src/columns/ColID.h                | 2 +-
 src/columns/ColIMask.cpp           | 2 +-
 src/columns/ColIMask.h             | 2 +-
 src/columns/ColMask.cpp            | 2 +-
 src/columns/ColMask.h              | 2 +-
 src/columns/ColModified.cpp        | 2 +-
 src/columns/ColModified.h          | 2 +-
 src/columns/ColParent.cpp          | 2 +-
 src/columns/ColParent.h            | 2 +-
 src/columns/ColProject.cpp         | 2 +-
 src/columns/ColProject.h           | 2 +-
 src/columns/ColRecur.cpp           | 2 +-
 src/columns/ColRecur.h             | 2 +-
 src/columns/ColScheduled.cpp       | 2 +-
 src/columns/ColScheduled.h         | 2 +-
 src/columns/ColStart.cpp           | 2 +-
 src/columns/ColStart.h             | 2 +-
 src/columns/ColStatus.cpp          | 2 +-
 src/columns/ColStatus.h            | 2 +-
 src/columns/ColString.cpp          | 2 +-
 src/columns/ColString.h            | 2 +-
 src/columns/ColTags.cpp            | 2 +-
 src/columns/ColTags.h              | 2 +-
 src/columns/ColTypeDate.cpp        | 2 +-
 src/columns/ColTypeDate.h          | 2 +-
 src/columns/ColTypeDuration.cpp    | 2 +-
 src/columns/ColTypeDuration.h      | 2 +-
 src/columns/ColTypeNumeric.cpp     | 2 +-
 src/columns/ColTypeNumeric.h       | 2 +-
 src/columns/ColTypeString.cpp      | 2 +-
 src/columns/ColTypeString.h        | 2 +-
 src/columns/ColUDA.cpp             | 2 +-
 src/columns/ColUDA.h               | 2 +-
 src/columns/ColUUID.cpp            | 2 +-
 src/columns/ColUUID.h              | 2 +-
 src/columns/ColUntil.cpp           | 2 +-
 src/columns/ColUntil.h             | 2 +-
 src/columns/ColUrgency.cpp         | 2 +-
 src/columns/ColUrgency.h           | 2 +-
 src/columns/ColWait.cpp            | 2 +-
 src/columns/ColWait.h              | 2 +-
 src/columns/Column.cpp             | 2 +-
 src/columns/Column.h               | 2 +-
 src/commands/CmdAdd.cpp            | 2 +-
 src/commands/CmdAdd.h              | 2 +-
 src/commands/CmdAliases.cpp        | 2 +-
 src/commands/CmdAliases.h          | 2 +-
 src/commands/CmdAnnotate.cpp       | 2 +-
 src/commands/CmdAnnotate.h         | 2 +-
 src/commands/CmdAppend.cpp         | 2 +-
 src/commands/CmdAppend.h           | 2 +-
 src/commands/CmdAttributes.cpp     | 2 +-
 src/commands/CmdAttributes.h       | 2 +-
 src/commands/CmdBurndown.cpp       | 2 +-
 src/commands/CmdBurndown.h         | 2 +-
 src/commands/CmdCalc.cpp           | 2 +-
 src/commands/CmdCalc.h             | 2 +-
 src/commands/CmdCalendar.cpp       | 2 +-
 src/commands/CmdCalendar.h         | 2 +-
 src/commands/CmdColor.cpp          | 2 +-
 src/commands/CmdColor.h            | 2 +-
 src/commands/CmdColumns.cpp        | 2 +-
 src/commands/CmdColumns.h          | 2 +-
 src/commands/CmdCommands.cpp       | 2 +-
 src/commands/CmdCommands.h         | 2 +-
 src/commands/CmdConfig.cpp         | 2 +-
 src/commands/CmdConfig.h           | 2 +-
 src/commands/CmdContext.cpp        | 2 +-
 src/commands/CmdContext.h          | 2 +-
 src/commands/CmdCount.cpp          | 2 +-
 src/commands/CmdCount.h            | 2 +-
 src/commands/CmdCustom.cpp         | 2 +-
 src/commands/CmdCustom.h           | 2 +-
 src/commands/CmdDelete.cpp         | 2 +-
 src/commands/CmdDelete.h           | 2 +-
 src/commands/CmdDenotate.cpp       | 2 +-
 src/commands/CmdDenotate.h         | 2 +-
 src/commands/CmdDiagnostics.cpp    | 2 +-
 src/commands/CmdDiagnostics.h      | 2 +-
 src/commands/CmdDone.cpp           | 2 +-
 src/commands/CmdDone.h             | 2 +-
 src/commands/CmdDuplicate.cpp      | 2 +-
 src/commands/CmdDuplicate.h        | 2 +-
 src/commands/CmdEdit.cpp           | 2 +-
 src/commands/CmdEdit.h             | 2 +-
 src/commands/CmdExec.cpp           | 2 +-
 src/commands/CmdExec.h             | 2 +-
 src/commands/CmdExport.cpp         | 2 +-
 src/commands/CmdExport.h           | 2 +-
 src/commands/CmdGet.cpp            | 2 +-
 src/commands/CmdGet.h              | 2 +-
 src/commands/CmdHelp.cpp           | 2 +-
 src/commands/CmdHelp.h             | 2 +-
 src/commands/CmdHistory.cpp        | 2 +-
 src/commands/CmdHistory.h          | 2 +-
 src/commands/CmdIDs.cpp            | 2 +-
 src/commands/CmdIDs.h              | 2 +-
 src/commands/CmdImport.cpp         | 2 +-
 src/commands/CmdImport.h           | 2 +-
 src/commands/CmdInfo.cpp           | 2 +-
 src/commands/CmdInfo.h             | 2 +-
 src/commands/CmdLog.cpp            | 2 +-
 src/commands/CmdLog.h              | 2 +-
 src/commands/CmdLogo.cpp           | 2 +-
 src/commands/CmdLogo.h             | 2 +-
 src/commands/CmdModify.cpp         | 2 +-
 src/commands/CmdModify.h           | 2 +-
 src/commands/CmdPrepend.cpp        | 2 +-
 src/commands/CmdPrepend.h          | 2 +-
 src/commands/CmdProjects.cpp       | 2 +-
 src/commands/CmdProjects.h         | 2 +-
 src/commands/CmdPurge.cpp          | 2 +-
 src/commands/CmdPurge.h            | 2 +-
 src/commands/CmdReports.cpp        | 2 +-
 src/commands/CmdReports.h          | 2 +-
 src/commands/CmdShow.cpp           | 2 +-
 src/commands/CmdShow.h             | 2 +-
 src/commands/CmdStart.cpp          | 2 +-
 src/commands/CmdStart.h            | 2 +-
 src/commands/CmdStats.cpp          | 2 +-
 src/commands/CmdStats.h            | 2 +-
 src/commands/CmdStop.cpp           | 2 +-
 src/commands/CmdStop.h             | 2 +-
 src/commands/CmdSummary.cpp        | 2 +-
 src/commands/CmdSummary.h          | 2 +-
 src/commands/CmdSync.cpp           | 2 +-
 src/commands/CmdSync.h             | 2 +-
 src/commands/CmdTags.cpp           | 2 +-
 src/commands/CmdTags.h             | 2 +-
 src/commands/CmdTimesheet.cpp      | 2 +-
 src/commands/CmdTimesheet.h        | 2 +-
 src/commands/CmdUDAs.cpp           | 2 +-
 src/commands/CmdUDAs.h             | 2 +-
 src/commands/CmdUndo.cpp           | 2 +-
 src/commands/CmdUndo.h             | 2 +-
 src/commands/CmdUnique.cpp         | 2 +-
 src/commands/CmdUnique.h           | 2 +-
 src/commands/CmdUrgency.cpp        | 2 +-
 src/commands/CmdUrgency.h          | 2 +-
 src/commands/CmdVersion.cpp        | 2 +-
 src/commands/CmdVersion.h          | 2 +-
 src/commands/Command.cpp           | 2 +-
 src/commands/Command.h             | 2 +-
 src/dependency.cpp                 | 2 +-
 src/feedback.cpp                   | 2 +-
 src/i18n.h                         | 2 +-
 src/l10n/deu-DEU.h                 | 4 ++--
 src/l10n/eng-USA.h                 | 4 ++--
 src/l10n/epo-RUS.h                 | 2 +-
 src/l10n/esp-ESP.h                 | 4 ++--
 src/l10n/fra-FRA.h                 | 4 ++--
 src/l10n/ita-ITA.h                 | 4 ++--
 src/l10n/jpn-JPN.h                 | 4 ++--
 src/l10n/pol-POL.h                 | 4 ++--
 src/l10n/por-PRT.h                 | 4 ++--
 src/legacy.cpp                     | 2 +-
 src/main.cpp                       | 2 +-
 src/main.h                         | 2 +-
 src/recur.cpp                      | 2 +-
 src/rules.cpp                      | 2 +-
 src/sort.cpp                       | 2 +-
 src/util.cpp                       | 2 +-
 src/util.h                         | 2 +-
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/bash_tap.sh                   | 2 +-
 test/bash_tap_tw.sh                | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/col.t.cpp                     | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/color.t.cpp                   | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/config.t.cpp                  | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/dates.t.cpp                   | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom.t                         | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/eval.t.cpp                    | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/iso8601d.t.cpp                | 2 +-
 test/iso8601p.t.cpp                | 2 +-
 test/lexer.t.cpp                   | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/nibbler.t.cpp                 | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/simpletap/__init__.py         | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/t.t.cpp                       | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/tdb2.t.cpp                    | 2 +-
 test/template.t                    | 2 +-
 test/test.cpp                      | 2 +-
 test/test.h                        | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/util.t.cpp                    | 2 +-
 test/uuid.t                        | 2 +-
 test/variant_add.t.cpp             | 2 +-
 test/variant_and.t.cpp             | 2 +-
 test/variant_cast.t.cpp            | 2 +-
 test/variant_divide.t.cpp          | 2 +-
 test/variant_equal.t.cpp           | 2 +-
 test/variant_exp.t.cpp             | 2 +-
 test/variant_gt.t.cpp              | 2 +-
 test/variant_gte.t.cpp             | 2 +-
 test/variant_inequal.t.cpp         | 2 +-
 test/variant_lt.t.cpp              | 2 +-
 test/variant_lte.t.cpp             | 2 +-
 test/variant_match.t.cpp           | 2 +-
 test/variant_math.t.cpp            | 2 +-
 test/variant_modulo.t.cpp          | 2 +-
 test/variant_multiply.t.cpp        | 2 +-
 test/variant_nomatch.t.cpp         | 2 +-
 test/variant_not.t.cpp             | 2 +-
 test/variant_or.t.cpp              | 2 +-
 test/variant_partial.t.cpp         | 2 +-
 test/variant_subtract.t.cpp        | 2 +-
 test/variant_xor.t.cpp             | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/view.t.cpp                    | 2 +-
 test/wait.t                        | 2 +-
 398 files changed, 407 insertions(+), 407 deletions(-)

diff --git a/COPYING b/COPYING
index a518570b0..c2b94e5eb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2017, 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
diff --git a/LICENSE b/LICENSE
index a518570b0..c2b94e5eb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2017, 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
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 4b35d8782..25c96de51 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -316,7 +316,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 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 454628cf4..001185084 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -143,7 +143,7 @@ Weaknesses:
   - You need to manage your own server, or gain access to a hosted server.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index f7d4e0c40..9467fdb56 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1284,7 +1284,7 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" command.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 3a708e496..cb22bf429 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1495,7 +1495,7 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
 
 This man page was originally written by Federico Hernandez.
 
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index c23a818a9..fecc32783 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 8f44614b5..1230e1960 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 7ed86d44e..6905cca62 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index 13732186e..03df132b3 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme
index 1212eb520..3ab9b8af5 100644
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index b015f6fa7..622fd5b91 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index c577986bc..614d702d0 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme
index 265a94a32..6788610cc 100644
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index a09d6efef..7949e5bcf 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index 7e1ebaf52..e0a32ce04 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index 44d1384c5..c75b7cef5 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme
index c72b4f94e..2eee698ea 100644
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme
index 264c66584..fe402484c 100644
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme
index 2702103a1..c6ddcefef 100644
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index 5205b5b1e..0237fa3a9 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2017, 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
@@ -189,7 +189,7 @@ if (open my $fh, '>:utf8', $file)
         "# ${url_current}\n",
         "# ${url_next}\n",
         "#\n",
-        "# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2017, 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",
diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index ecb4fd528..2671bc37b 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index 4daa4c65b..74804200e 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2016, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2017, Roman Inflianskas <infroma@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/utils/l10n b/scripts/utils/l10n
index 2a4fd24b2..4601a2e1a 100755
--- a/scripts/utils/l10n
+++ b/scripts/utils/l10n
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.7
 ################################################################################
 ##
-## Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2017, 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
diff --git a/scripts/vim/README b/scripts/vim/README
index b250adc0a..8de0d826c 100644
--- 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 - 2016 John Florian
+Copyright 2009 - 2017 John Florian
 
 and are available under the MIT license.
 For the full text of this license, see COPYING.
diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim
index 241b63a79..137881e53 100644
--- 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 - 2016 John Florian
+" Copyright 2009 - 2017 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskdata.vim b/scripts/vim/syntax/taskdata.vim
index 6782f732f..f290f68c8 100644
--- 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 - 2016 John Florian
+" Copyright 2009 - 2017 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskedit.vim b/scripts/vim/syntax/taskedit.vim
index 2edbb7899..39b9c51ee 100644
--- 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 - 2016 John Florian
+" Copyright 2009 - 2017 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index 1ff32cb4e..42841d2a8 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 "
-" Copyright (c) 2014 - 2016 Taskwarrior Team
+" Copyright (c) 2014 - 2017 Taskwarrior Team
 " Copyright (c) 2009 - 2014 John Florian
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 46628be94..8b7ac5354 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -1,6 +1,6 @@
 #compdef task
 #
-# Copyright 2010 - 2016 Johannes Schlatow
+# Copyright 2010 - 2017 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 1baf8ecc5..271a39e23 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/CLI2.h b/src/CLI2.h
index db0029b45..0e5595ad0 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Color.cpp b/src/Color.cpp
index a516e2270..7a2ce0449 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Color.h b/src/Color.h
index f998c40f6..5e39bb00e 100644
--- a/src/Color.h
+++ b/src/Color.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Config.cpp b/src/Config.cpp
index de914f11e..d230e1624 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Config.h b/src/Config.h
index a3a49dc54..745493a8e 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Context.cpp b/src/Context.cpp
index d7ab0c59b..1b0bfd131 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Context.h b/src/Context.h
index 0c249c91b..64257d661 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/DOM.cpp b/src/DOM.cpp
index eba6b30aa..cdfd34f6b 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/DOM.h b/src/DOM.h
index ecbc6fe8d..f1cdef7a6 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Dates.cpp b/src/Dates.cpp
index 5fc17e25d..d091cc069 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Dates.h b/src/Dates.h
index 2da362dc8..a214a41db 100644
--- a/src/Dates.h
+++ b/src/Dates.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Eval.cpp b/src/Eval.cpp
index f4f0a2a2f..a1ca83d25 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Eval.h b/src/Eval.h
index abf53a45f..dabf2ccdd 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 9e7d06c07..73d4e3379 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Filter.h b/src/Filter.h
index 604f06ab8..48a2f9c32 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 1ef6abbde..b6a2dd05f 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Hooks.h b/src/Hooks.h
index 2c76e292e..d4e29e9f9 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
index 9528393dc..d9c02031a 100644
--- a/src/ISO8601.cpp
+++ b/src/ISO8601.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/ISO8601.h b/src/ISO8601.h
index b3f82e5aa..a28f8edee 100644
--- a/src/ISO8601.h
+++ b/src/ISO8601.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 0d1d6e7b7..ba9174cbb 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Lexer.h b/src/Lexer.h
index a201203f0..faab3848e 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index 4339f8c74..23331aae6 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Nibbler.h b/src/Nibbler.h
index e3cea065e..3b34bdd3d 100644
--- a/src/Nibbler.h
+++ b/src/Nibbler.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 1961a8e9f..cde16fe00 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/TDB2.h b/src/TDB2.h
index 0b6f7ea34..6ca31bade 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 778ea1267..db9d7e02f 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/TLSClient.h b/src/TLSClient.h
index b51aa38c1..d02a7ae8c 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Task.cpp b/src/Task.cpp
index c0aaf4338..1fa953265 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Task.h b/src/Task.h
index b4cf6d336..5d7961781 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 0bcdbe898..5c9def5a7 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/Variant.h b/src/Variant.h
index 6bd2f425f..dd523710e 100644
--- a/src/Variant.h
+++ b/src/Variant.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2017, 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
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 37e82e40f..6c7017409 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/ViewTask.h b/src/ViewTask.h
index e46a1b477..58396908b 100644
--- a/src/ViewTask.h
+++ b/src/ViewTask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/calc.cpp b/src/calc.cpp
index 55a7e4065..cfd9c7464 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index ce425776b..16ae70ee3 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index c46a82610..a0bc87395 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 512ce02c1..7dc20613e 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index b35234404..0aeb49fe4 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 2cf64a79e..50ffd849d 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 954d23415..3b0e1b7b2 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index 29704a093..fcc4aee47 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index c60314c99..e35ac4e55 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 8a75b8f50..63959fee3 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index 6b1f90da8..a729ae732 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 48e7c016c..0108facef 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 795002071..88ee3ea22 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 5f053fa98..dc14682d2 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index ef3c46396..5d5200cb5 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 08a8e70e5..8bbcb2a9c 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index 29f23e670..7603998f3 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index 1a169ffc9..97f8cc4bf 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index e42f4c8bb..a1768f9b8 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 38518681f..5222a3636 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index b161bfa78..5400776b9 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 069563db8..aab4167a7 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index 87aace25f..e08f74aab 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 129c0e4ac..49f34fa69 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index e83a9457d..14a462427 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index bd3beeb13..72970dec2 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index 2f3cbca50..d1aa6de31 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index df807d045..704a881d3 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index aa91ecc3c..2ef61ca5c 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index ef403bd00..b06903648 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index 226450a2f..ebd02855b 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp
index 5313b0ad0..fca7a57d4 100644
--- a/src/columns/ColString.cpp
+++ b/src/columns/ColString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColString.h b/src/columns/ColString.h
index f228d38fc..53c637548 100644
--- a/src/columns/ColString.h
+++ b/src/columns/ColString.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index c32232030..546753077 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index c248b4b22..b980881e9 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 357c9d6ce..8aab66b62 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index 789339c04..4b9b8bed5 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index b3e433d81..357641bd5 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index d556a486c..9a38b796b 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index b69147f1f..725fbe8b9 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index ff2f9c12b..1da8f0b83 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index af91ae008..18d3f67d1 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index 697c98e51..0f6d22164 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index b59e4c562..88d895fe3 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 8d22ee976..6bf3b4d1e 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 83f1a7dc9..802ecb5fa 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index ee6f3ba26..984d80b76 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index 3776051f1..2eb094e14 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index dcff37c69..7bbcc7c36 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 82a6586ca..8e6e0b0ca 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 68266abf3..265bc0817 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index d8cf4d8e6..58a300e64 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index f986d48bd..890f74fb4 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 75e4e6bd5..2f7dc834c 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/columns/Column.h b/src/columns/Column.h
index d064a261e..a5e2e0c00 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index e9dd03792..6993c91c3 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAdd.h b/src/commands/CmdAdd.h
index e2e750b81..a94f3fe17 100644
--- a/src/commands/CmdAdd.h
+++ b/src/commands/CmdAdd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index a46b01bde..5a93093e2 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAliases.h b/src/commands/CmdAliases.h
index fc7e5af74..8ea22d1b8 100644
--- a/src/commands/CmdAliases.h
+++ b/src/commands/CmdAliases.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index e980b75e6..99ead948e 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAnnotate.h b/src/commands/CmdAnnotate.h
index 7cda106cc..cefababfa 100644
--- a/src/commands/CmdAnnotate.h
+++ b/src/commands/CmdAnnotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index e3fe1a3ec..8769e8796 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAppend.h b/src/commands/CmdAppend.h
index 56f519623..9de8d8002 100644
--- a/src/commands/CmdAppend.h
+++ b/src/commands/CmdAppend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index b84506f05..961308694 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdAttributes.h b/src/commands/CmdAttributes.h
index 3ddbb7bb8..9199caab0 100644
--- a/src/commands/CmdAttributes.h
+++ b/src/commands/CmdAttributes.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index a3860103d..9dae59d50 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdBurndown.h b/src/commands/CmdBurndown.h
index e8bde5259..3eff45fac 100644
--- a/src/commands/CmdBurndown.h
+++ b/src/commands/CmdBurndown.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index bd16c6daf..6bbc5c6b0 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCalc.h b/src/commands/CmdCalc.h
index 54bae9c1e..a064aef2b 100644
--- a/src/commands/CmdCalc.h
+++ b/src/commands/CmdCalc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 1e27cb5af..c944b1143 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index 5c38ddb58..4c4033a79 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index a751b0bce..a7123047d 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdColor.h b/src/commands/CmdColor.h
index a092431c5..94481cbcf 100644
--- a/src/commands/CmdColor.h
+++ b/src/commands/CmdColor.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index ea59ff612..07328ddcd 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdColumns.h b/src/commands/CmdColumns.h
index fba1a1980..c52eef2b0 100644
--- a/src/commands/CmdColumns.h
+++ b/src/commands/CmdColumns.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 3295fff4f..fab451b98 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCommands.h b/src/commands/CmdCommands.h
index 543fb578a..1544641c0 100644
--- a/src/commands/CmdCommands.h
+++ b/src/commands/CmdCommands.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index bf938e8a9..21c89f795 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 6f2fb3a6d..41ab02795 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index c4de69c88..ef4d1127f 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdContext.h b/src/commands/CmdContext.h
index 4b9af76e2..b74f2af2b 100644
--- a/src/commands/CmdContext.h
+++ b/src/commands/CmdContext.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 4f97506d8..a1a20eb77 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCount.h b/src/commands/CmdCount.h
index a7ac139df..395ac2601 100644
--- a/src/commands/CmdCount.h
+++ b/src/commands/CmdCount.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index cadf326c5..4b3cc6d6e 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h
index 31f1e0cff..a21688249 100644
--- a/src/commands/CmdCustom.h
+++ b/src/commands/CmdCustom.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index d2af38623..299fd7c1a 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDelete.h b/src/commands/CmdDelete.h
index 789bff08a..22662bc72 100644
--- a/src/commands/CmdDelete.h
+++ b/src/commands/CmdDelete.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 7bd040aa5..d77b2ecec 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDenotate.h b/src/commands/CmdDenotate.h
index 3db3ba035..aa3cc74cc 100644
--- a/src/commands/CmdDenotate.h
+++ b/src/commands/CmdDenotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 0e9789f64..95bd58314 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDiagnostics.h b/src/commands/CmdDiagnostics.h
index 623c6c9a3..d537c38e2 100644
--- a/src/commands/CmdDiagnostics.h
+++ b/src/commands/CmdDiagnostics.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 5ddcfa2f1..18d1db4ff 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDone.h b/src/commands/CmdDone.h
index 1224aabe5..9c5923e81 100644
--- a/src/commands/CmdDone.h
+++ b/src/commands/CmdDone.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index ab2189313..696c211d0 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdDuplicate.h b/src/commands/CmdDuplicate.h
index b77712bde..0ef5ce9bf 100644
--- a/src/commands/CmdDuplicate.h
+++ b/src/commands/CmdDuplicate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 9e6b52e80..52f3d0ed2 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdEdit.h b/src/commands/CmdEdit.h
index b7f9ab220..0bc492015 100644
--- a/src/commands/CmdEdit.h
+++ b/src/commands/CmdEdit.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index d06f8b03e..66b37a03c 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h
index 3781a2bf7..e4dba1cb7 100644
--- a/src/commands/CmdExec.h
+++ b/src/commands/CmdExec.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index ba490e0d4..4dbb2641d 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdExport.h b/src/commands/CmdExport.h
index e85f9ca5d..ed080c8ba 100644
--- a/src/commands/CmdExport.h
+++ b/src/commands/CmdExport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 06a911d41..377c7a5b3 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdGet.h b/src/commands/CmdGet.h
index 242d42ad9..d1c558ff5 100644
--- a/src/commands/CmdGet.h
+++ b/src/commands/CmdGet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 756f6a76d..a63c8af4c 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h
index 3808691af..b4ce7e4e4 100644
--- a/src/commands/CmdHelp.h
+++ b/src/commands/CmdHelp.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index b4cbd3641..0e3044e04 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index b6e8322de..b40006d8f 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index 1b4330aeb..ef3cb5847 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdIDs.h b/src/commands/CmdIDs.h
index 78d05fc67..c39be6ee9 100644
--- a/src/commands/CmdIDs.h
+++ b/src/commands/CmdIDs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index f5f1e98a5..e0b6e2b62 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdImport.h b/src/commands/CmdImport.h
index 46a07fa57..04b2963d0 100644
--- a/src/commands/CmdImport.h
+++ b/src/commands/CmdImport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index b35404d50..fdb6fd981 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index e3ad8da7b..ad38d4a9e 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index fbbc33b67..c4db8ef48 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdLog.h b/src/commands/CmdLog.h
index 12f8dea4b..d3c4682ba 100644
--- a/src/commands/CmdLog.h
+++ b/src/commands/CmdLog.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index a55b457fa..22ee271bc 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h
index 7cab95f83..5c6a5ee62 100644
--- a/src/commands/CmdLogo.h
+++ b/src/commands/CmdLogo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index e65b200bb..136796c27 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index e3e90e4bf..0a1ac32d0 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 835899da6..03657be5e 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdPrepend.h b/src/commands/CmdPrepend.h
index f4d61affb..d7704b36e 100644
--- a/src/commands/CmdPrepend.h
+++ b/src/commands/CmdPrepend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 819ad59d4..06b251b15 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdProjects.h b/src/commands/CmdProjects.h
index 47dfd3206..7e8f215ff 100644
--- a/src/commands/CmdProjects.h
+++ b/src/commands/CmdProjects.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 4a38c2b69..f498bd6b7 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index 3bb0f2c82..be3bc340a 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 610d018cd..478ba9c52 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdReports.h b/src/commands/CmdReports.h
index 3a851f3ce..c12b87b59 100644
--- a/src/commands/CmdReports.h
+++ b/src/commands/CmdReports.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index c140c1f2e..b756f862a 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h
index e0a4fbc5c..26ea77f05 100644
--- a/src/commands/CmdShow.h
+++ b/src/commands/CmdShow.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 8da0c3897..860c3ad16 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStart.h b/src/commands/CmdStart.h
index 1d959b91a..c2624e8ea 100644
--- a/src/commands/CmdStart.h
+++ b/src/commands/CmdStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index b77915e85..599c83960 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStats.h b/src/commands/CmdStats.h
index aef1aba0d..59fd333f7 100644
--- a/src/commands/CmdStats.h
+++ b/src/commands/CmdStats.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 86d23366e..b95e8e4ff 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdStop.h b/src/commands/CmdStop.h
index f84f06d06..4acfb06eb 100644
--- a/src/commands/CmdStop.h
+++ b/src/commands/CmdStop.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index b84ed1b56..0ecdbe5f2 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdSummary.h b/src/commands/CmdSummary.h
index 4c58bc755..14b1dab22 100644
--- a/src/commands/CmdSummary.h
+++ b/src/commands/CmdSummary.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 28da9c5a8..282532227 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdSync.h b/src/commands/CmdSync.h
index 4aa6ed83c..fa53b9f33 100644
--- a/src/commands/CmdSync.h
+++ b/src/commands/CmdSync.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 839974cc8..c50d201c9 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h
index de4f77b2e..ab3bcb607 100644
--- a/src/commands/CmdTags.h
+++ b/src/commands/CmdTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index f9673d294..d1493ed93 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdTimesheet.h b/src/commands/CmdTimesheet.h
index d0fefd821..70cec4727 100644
--- a/src/commands/CmdTimesheet.h
+++ b/src/commands/CmdTimesheet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index f1ca5023c..bc9c77a20 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUDAs.h b/src/commands/CmdUDAs.h
index 0a13ac896..a8ef9cec1 100644
--- a/src/commands/CmdUDAs.h
+++ b/src/commands/CmdUDAs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 2189d1a2a..c73a09ec1 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUndo.h b/src/commands/CmdUndo.h
index b776ce512..3042e3921 100644
--- a/src/commands/CmdUndo.h
+++ b/src/commands/CmdUndo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index dbb3cadc2..9ebdae574 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUnique.h b/src/commands/CmdUnique.h
index 210d3017c..09a9b233f 100644
--- a/src/commands/CmdUnique.h
+++ b/src/commands/CmdUnique.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index caa3587a6..1e6c8dcb9 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdUrgency.h b/src/commands/CmdUrgency.h
index 5f2c61ff3..74f035dde 100644
--- a/src/commands/CmdUrgency.h
+++ b/src/commands/CmdUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index b9763bcfc..ae8640652 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h
index 4cce289d6..279bef78b 100644
--- a/src/commands/CmdVersion.h
+++ b/src/commands/CmdVersion.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index b726e6eb8..cb164bad7 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/commands/Command.h b/src/commands/Command.h
index 7ab3295c4..449ce8f39 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/dependency.cpp b/src/dependency.cpp
index de4f6ee94..534db4eb1 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/feedback.cpp b/src/feedback.cpp
index bbb9e057b..d521bfe1d 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/i18n.h b/src/i18n.h
index df0056391..4bad52977 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index aae7aea89..b8e75f8d5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2}, gebaut für "
 #define STRING_CMD_VERSION_UNKNOWN   "unbekannt"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Zeigt das taskwarrior-Logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "Der Logo-Befehle benötigt aktivierte Farbunterstützung"
 #define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index c0e477f1a..63d30b473 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Displays the Taskwarrior logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "The logo command requires that color support is enabled."
 #define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fd6fa3785..ce3f41a18 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1e612e9b5..4ba8145ed 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -257,7 +257,7 @@
 #define STRING_CMD_VERSION_DOCS      "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-color', y 'man task-sync' o en http://taskwarrior.org."
 #define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconocido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."  // |esp-ESP|==|eng-USA|
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."  // |esp-ESP|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Muestra el logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "El comando logo requiere que el soporte de color esté habilitado."
 #define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2ca31651e..b83b57b90 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} compilé pour "
 #define STRING_CMD_VERSION_UNKNOWN   "inconnu"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Affiche le logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "La commande logo nécessite le support des couleurs."
 #define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 768d14001..324936f0d 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -255,7 +255,7 @@
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} generato per "
 #define STRING_CMD_VERSION_UNKNOWN   "sconosciuto"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Mostra il logo di Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Il comando logo richiede l'abilitazione del supporto ai colori."
 #define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 42a41b724..49b66d75c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Taskwarrior ロゴの表示"
 #define STRING_CMD_LOGO_COLOR_REQ    "色のサポートをする logo コマンドが有効になりました。"
 #define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index d3ddabdb3..e78364ea4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} zbudowane dla "
 #define STRING_CMD_VERSION_UNKNOWN   "nieznana"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Wyświetla logo Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Polecenie logo wymaga wsparcia kolorowania."
 #define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f710f3f81..108b2b78a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
@@ -256,7 +256,7 @@
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconhecido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2016 P. Beckingham, F. Hernandez."  // |por-PRT|==|eng-USA|
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."  // |por-PRT|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Exibe o logotipo do Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "O comando logo requer que o suporte de cor seja ativado."
 #define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 48beb99dd..26ff4deb0 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/main.cpp b/src/main.cpp
index 777727409..9468730ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/main.h b/src/main.h
index 8856e05ce..d18c881a1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/recur.cpp b/src/recur.cpp
index b5539f6a7..a949eacda 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/rules.cpp b/src/rules.cpp
index 0fc179138..bba2451b6 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/sort.cpp b/src/sort.cpp
index 35c8194cc..454676264 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/util.cpp b/src/util.cpp
index 747eb1f34..5184d0c35 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/src/util.h b/src/util.h
index fd06f6535..55de9fd52 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/abbreviation.t b/test/abbreviation.t
index 72f1a69e7..5165390c4 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/add.t b/test/add.t
index e62ce052d..c2d240b9a 100755
--- a/test/add.t
+++ b/test/add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/alias.t b/test/alias.t
index f85255695..592a3830f 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/annotate.t b/test/annotate.t
index 1424b8260..d72820e4a 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/append.t b/test/append.t
index e6a4be4f1..7efe688aa 100755
--- a/test/append.t
+++ b/test/append.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/args.t b/test/args.t
index 29a3d5778..d0013c5dc 100755
--- a/test/args.t
+++ b/test/args.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/backlog.t b/test/backlog.t
index 90dbc8e3b..f88abca30 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/bash_completion.t b/test/bash_completion.t
index 5e812e8a5..32b3ddc59 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/bash_tap.sh b/test/bash_tap.sh
index 1b621c3de..45a0d946b 100644
--- a/test/bash_tap.sh
+++ b/test/bash_tap.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # For more information, see https://github.com/wbsch/bash_tap
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2016 Wilhelm Schürmann
+# Copyright (c) 2015-2017 Wilhelm Schürmann
 
 function bashtap_on_error {
     # A command in the parent script failed, interpret this as a test failure.
diff --git a/test/bash_tap_tw.sh b/test/bash_tap_tw.sh
index af36f32cb..9ee68be95 100644
--- a/test/bash_tap_tw.sh
+++ b/test/bash_tap_tw.sh
@@ -9,7 +9,7 @@
 # appended to or changed as needed.
 #
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2016 Wilhelm Schürmann
+# Copyright (c) 2015-2017 Wilhelm Schürmann
 
 function setup_taskrc {
     # Configuration
diff --git a/test/blocked.t b/test/blocked.t
index 29cb65ea3..6ad53fa13 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/bulk.t b/test/bulk.t
index 38f276e96..16c97a577 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/burndown.t b/test/burndown.t
index 4b0e15d56..cc26f7e59 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/calc.t b/test/calc.t
index f1a398b1f..82c375338 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/calendar.t b/test/calendar.t
index 885609156..ee650c762 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/caseless.t b/test/caseless.t
index a78be3d90..c2fb8d2ad 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/col.t.cpp b/test/col.t.cpp
index 7ec57f42d..3fdc97c56 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 96dc7b0cf..5d07267c3 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/color.rules.t b/test/color.rules.t
index 37706fe5a..75f51d8f5 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/color.t.cpp b/test/color.t.cpp
index 4d09fd8d6..b77841a84 100644
--- a/test/color.t.cpp
+++ b/test/color.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/columns.t b/test/columns.t
index 469e0ebfe..a70a2e561 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/commands.t b/test/commands.t
index 33f70e2e1..c4f87a490 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/completed.t b/test/completed.t
index 4ea83eeb5..381acac37 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/config.t.cpp b/test/config.t.cpp
index ec7fcfcb9..a3a7d74f9 100644
--- a/test/config.t.cpp
+++ b/test/config.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/configuration.t b/test/configuration.t
index 90a4aabe6..3aacce6e7 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/confirmation.t b/test/confirmation.t
index 7568f2a8c..7f21abaeb 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/context.t b/test/context.t
index 5380a1aa4..1883d2bce 100755
--- a/test/context.t
+++ b/test/context.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/count.t b/test/count.t
index a49994d8e..49656e072 100755
--- a/test/count.t
+++ b/test/count.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/custom.config.t b/test/custom.config.t
index d41c17377..ad8e0bbb1 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index d2fc675a4..0a5752b5a 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/custom.t b/test/custom.t
index 1981911c7..e99cd5af4 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index 276398583..533be0045 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/date.iso.t b/test/date.iso.t
index fe15415fe..3993c68f4 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/dateformat.t b/test/dateformat.t
index 2404db71d..3fdfeb53d 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 044e892a9..3013fb944 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/datesort.t b/test/datesort.t
index 8a66473de..9008a505c 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index bbb2df56d..8bb7567bc 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/debug.t b/test/debug.t
index 6456f28dc..238daf388 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/default.t b/test/default.t
index 7026c74e6..29f84d99b 100755
--- a/test/default.t
+++ b/test/default.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/delete.t b/test/delete.t
index aaf972505..a40242bae 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/denotate.t b/test/denotate.t
index a6847b148..5d93e3943 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/dependencies.t b/test/dependencies.t
index a5af1fc8b..e43e599d7 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/diag.t b/test/diag.t
index 4804ee131..38bb60bff 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/diag_color.t b/test/diag_color.t
index a60ab19d6..1f653c379 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/dom.t b/test/dom.t
index b741603f8..c75eed548 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/due.t b/test/due.t
index a38bc9a16..89b000663 100755
--- a/test/due.t
+++ b/test/due.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/duplicate.t b/test/duplicate.t
index 793baedb3..43ddd820d 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/edit.t b/test/edit.t
index a0d153701..f733addb0 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/encoding.t b/test/encoding.t
index 6fa8e84b1..f166b706c 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/enpassant.t b/test/enpassant.t
index 493ef07df..64fec25c0 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 2af4eb21d..474dff715 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/exec.t b/test/exec.t
index 9eac88756..d0ed9436a 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/export.t b/test/export.t
index 6a39b3938..87160a10a 100755
--- a/test/export.t
+++ b/test/export.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/feature.559.t b/test/feature.559.t
index 3b342a013..043f3929f 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index b0aca793b..76c87118f 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 9d3e4e565..2955292ee 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index b360a25fd..3ce5a2362 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/feedback.t b/test/feedback.t
index 8d429828d..4538962e5 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/filter.t b/test/filter.t
index 8c3627f01..eec18456b 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/fontunderline.t b/test/fontunderline.t
index 79305aace..d84bc6c2a 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/format.t b/test/format.t
index 3de3342f5..69b53f0be 100755
--- a/test/format.t
+++ b/test/format.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/gc.t b/test/gc.t
index 436e174d1..aa2896398 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/helpers.t b/test/helpers.t
index 8e80c2b9d..99c65a90c 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/history.t b/test/history.t
index f9dd6c44d..3397173e5 100755
--- a/test/history.t
+++ b/test/history.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hooks.env.t b/test/hooks.env.t
index 5463e0780..b5881a072 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index e5f2546a7..985a1c444 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index f6c42d003..3a3cadd85 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 9e33863fe..3c577310f 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index 2da42a69e..f8f7ce5f6 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/hyphenate.t b/test/hyphenate.t
index 15dfb4fae..294bf9dca 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/ids.t b/test/ids.t
index 210ee59fd..849a5c30d 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/import.t b/test/import.t
index 311a126ff..50aa0e356 100755
--- a/test/import.t
+++ b/test/import.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/info.t b/test/info.t
index f23c0acf3..00b293b2f 100755
--- a/test/info.t
+++ b/test/info.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/iso8601d.t.cpp b/test/iso8601d.t.cpp
index e6d67c481..efaa312f9 100644
--- a/test/iso8601d.t.cpp
+++ b/test/iso8601d.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/iso8601p.t.cpp b/test/iso8601p.t.cpp
index bae623563..788528db7 100644
--- a/test/iso8601p.t.cpp
+++ b/test/iso8601p.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index 9a03218d1..ef22e8b6c 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/limit.t b/test/limit.t
index 58f08eced..518bcd4b1 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 3c85d3bae..693646bf4 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/log.t b/test/log.t
index 899c6c573..b53a1556a 100755
--- a/test/log.t
+++ b/test/log.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/logo.t b/test/logo.t
index d157933b4..a0d75ad92 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/math.t b/test/math.t
index ed08f6841..8b269233c 100755
--- a/test/math.t
+++ b/test/math.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/modify.t b/test/modify.t
index 33d8a0edf..59937d160 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/nag.t b/test/nag.t
index 3b6a8d1e1..faff5e603 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
index 60bfb2000..f6e755332 100644
--- a/test/nibbler.t.cpp
+++ b/test/nibbler.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/obfuscate.t b/test/obfuscate.t
index b7614c99f..8a569854c 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/oldest.t b/test/oldest.t
index 24dbb5b79..40f23f956 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/operators.t b/test/operators.t
index d66776ee4..a885bb626 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/overdue.t b/test/overdue.t
index eba3604ca..4dc6e334a 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/partial.t b/test/partial.t
index 84cd4738c..b7e49ee7d 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/prepend.t b/test/prepend.t
index 2be984d50..1c52a03e2 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/pri_sort.t b/test/pri_sort.t
index 81918a69c..15390a99a 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/project.t b/test/project.t
index 12d6aca03..f3b6665b3 100755
--- a/test/project.t
+++ b/test/project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/purge.t b/test/purge.t
index afa2ddd3c..186314e62 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/quotes.t b/test/quotes.t
index 1e4ec6fe2..7e980b0e9 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/rc.override.t b/test/rc.override.t
index 89d457451..d4a34abbe 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/recurrence.t b/test/recurrence.t
index 1895df312..c46a09ea5 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/reports.t b/test/reports.t
index a4b43d487..03bd8cc22 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/search.t b/test/search.t
index c68cfb57f..4d5d0e26f 100755
--- a/test/search.t
+++ b/test/search.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/sequence.t b/test/sequence.t
index b33a6f813..ef8d84fde 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/shell.t b/test/shell.t
index 9d606b7c7..0ffd6d611 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/show.t b/test/show.t
index 75d831df4..6139af251 100755
--- a/test/show.t
+++ b/test/show.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index afad639e6..357f63f20 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -1,7 +1,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/sorting.t b/test/sorting.t
index 2965aa843..824b309f0 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/special.t b/test/special.t
index 4dd737fd5..ebcbeba28 100755
--- a/test/special.t
+++ b/test/special.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/start.t b/test/start.t
index cb439d0aa..7e1e9ad3e 100755
--- a/test/start.t
+++ b/test/start.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/stats.t b/test/stats.t
index 61a1f1bd4..1ed3a66c5 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/substitute.t b/test/substitute.t
index bc527508c..b1f5290a0 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/sugar.t b/test/sugar.t
index bb7b950ad..39fb45077 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/summary.t b/test/summary.t
index bc8faf2cf..cd5c3d2c0 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/t.t.cpp b/test/t.t.cpp
index e29ea0aab..0508284bb 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/tag.t b/test/tag.t
index bc9d8d653..98b0db853 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/taskrc.t b/test/taskrc.t
index 34f223835..384fb67f6 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index afcb6d2af..bd6944627 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/template.t b/test/template.t
index 27658ceb3..c1e27371a 100644
--- a/test/template.t
+++ b/test/template.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/test.cpp b/test/test.cpp
index 60ddd3cf5..9dc7552ca 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/test.h b/test/test.h
index 2127077e5..fa65f9bbd 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/timesheet.t b/test/timesheet.t
index 177451ce6..016cb93f1 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tw-1379.t b/test/tw-1379.t
index 13a675c59..a73a9e613 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tw-20.t b/test/tw-20.t
index 7111c8614..06b3d5bff 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tw-262.t b/test/tw-262.t
index b33486390..3a7ffca0e 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tw-295.t b/test/tw-295.t
index 61fcdc348..1b41b222a 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/tw-46.t b/test/tw-46.t
index 82710b78b..dc97402bc 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/uda.t b/test/uda.t
index 04866a41f..a42d07417 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index 977c43a5c..914c6e4c5 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/uda_report.t b/test/uda_report.t
index f9d87b154..03b9e89a4 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 8de807d53..d940a9915 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/undo.t b/test/undo.t
index 8ed65068c..71f0b23d3 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/unicode.t b/test/unicode.t
index e14646d66..6d02ba3a6 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/unique.t b/test/unique.t
index d88cb2284..6bf56514c 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/upgrade.t b/test/upgrade.t
index 030529d7e..75d0c9b40 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/urgency.t b/test/urgency.t
index ae7ab5cf3..9b2e8b518 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index fe8058d4d..bd55503fa 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 5c8104a71..752cc7f6a 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/uuid.t b/test/uuid.t
index 0e0a927d3..674d07bc5 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index aae9a5bbc..7521888ae 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index 48ea9aa36..b80553fef 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 88437f349..0b729c0aa 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index 9a567d2a5..aa821ae6c 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index 6d84d49d7..47c406fae 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index 13b0e3cba..ffe8820a7 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index 3df5b148e..847b7f745 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index eed5ad2a6..620412907 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index 25bf21c8c..250d72b50 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index 502349858..e4836f691 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index b49d8f0fb..f2fd91da1 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index ceb65b0df..ea7c6b453 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index a34affbf9..11471ea4b 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index 2d67521d7..47f552fab 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index 2b0d57aa2..f8e278f70 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index e05e59462..eb06bb23b 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index 06b5aa455..7d8343479 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index ec34d95a1..b6b588246 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index e15ce713f..187c04ec0 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index a01cf1b15..d8e8cc7f2 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index d5f42f304..e7417ff9f 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2016, Göteborg Bit Factory.
+// Copyright 2013 - 2017, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/verbose.t b/test/verbose.t
index 27378528d..36ce1188d 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/version.t b/test/version.t
index 76e8a2f58..ab95d4139 100755
--- a/test/version.t
+++ b/test/version.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 26956d8f1..7dcb11300 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2017, 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
diff --git a/test/wait.t b/test/wait.t
index ae71284e9..81dbe50cb 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2017, 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

From 1016dd4a4056b3a658837898359fb94ec3f7c264 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Thu, 25 Feb 2016 00:07:51 +0100
Subject: [PATCH 230/879] Bumped documentation to 2.6.0

---
 ChangeLog |  8 ++++++++
 NEWS      | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5580c7eea..79c7a9482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
 
+------ current release ---------------------------
+
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
 - TD-104  Unrecognized taskwarrior file format
@@ -166,6 +168,7 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ------ current release ---------------------------
 
@@ -174,6 +177,11 @@
 ------ old releases ------------------------------
 
 >>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
+||||||| merged common ancestors
+------ current release ---------------------------
+
+=======
+>>>>>>> Bumped documentation to 2.6.0
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
diff --git a/NEWS b/NEWS
index 1074aa75e..e51c930f8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 New Features in Taskwarrior 2.5.2
 
   - The 'QUARTER' virutal tag was added.
+  - The 'help' command now takes a 'usage' argument, which displays only the
+    command usage.
 
 New Commands in Taskwarrior 2.5.2
 
@@ -9,7 +11,8 @@ New Commands in Taskwarrior 2.5.2
 
 New Configuration Options in Taskwarrior 2.5.2
 
-  -
+  - New 'relative' column format for 'date' type columns does what 'remaining'
+    and 'countdown' do, but in one format.
 
 Newly Deprecated Features in Taskwarrior 2.5.2
 
@@ -24,6 +27,13 @@ Newly Deprecated Features in Taskwarrior 2.5.2
 Removed Features in 2.5.2
 
   - Removed 'alias._query' default configuration.
+  - There is no longer a 16-color default configuration for some platforms,
+    making all platforms 256-color.
+  - The configuration setting 'burndown.bias' is no longer used.
+  - The algorithm used to estimate completion on the 'burndown' reports has
+    been replaced by something less icky. Estimates are now based on the net
+    completion rate after the peak number of pending tasks.
+  - The unused 'dom' and 'shell.prompt' configuration settings were removed.
 
 Known Issues
 

From 13b8283666445a8cb74ca3ff8825d6a0df042cee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Feb 2016 23:19:15 -0500
Subject: [PATCH 231/879] Cleanup: Removed deprecated 'alias._query' setting

---
 ChangeLog | 14 ++------------
 DEVELOPER |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79c7a9482..6f51c60ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
 
+- Removed deprecated 'alias._query' setting.
+
 ------ current release ---------------------------
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
@@ -168,20 +170,8 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
-<<<<<<< HEAD
-<<<<<<< HEAD
------- current release ---------------------------
-
-||||||| parent of 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
-=======
 ------ old releases ------------------------------
 
->>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
-||||||| merged common ancestors
------- current release ---------------------------
-
-=======
->>>>>>> Bumped documentation to 2.6.0
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
diff --git a/DEVELOPER b/DEVELOPER
index ce2f9b01b..2a53dcd9c 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -10,7 +10,7 @@ How to Build Taskwarrior
   Obtain and build code:
     $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
-    $ git checkout 2.6.0                 # Latest dev branch
+    $ git checkout 2.5.2                 # Latest dev branch
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs
@@ -156,4 +156,4 @@ Current Codebase Condition
 
 ---
 
-2016-12-18 Updated for 2.6.0
+2018-05-13 Updated for 2.5.2

From 35421403cfc3c67b4a4da844f415afa1666a865a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 28 Feb 2016 11:09:00 -0500
Subject: [PATCH 232/879] TD-64: sync conflict deleted all annotations of the
 task

- Thanks to Markus Beppler, Konstantin Vorobyev.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6f51c60ed..b128f1032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
 
+- TD-64 sync conflict deleted all annotations of the task
+        (thanks to Markus Beppler, Konstantin Vorobyev).
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 1264ffa4b4727b2797c798b4539822aa7cb41c87 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 20 Mar 2016 19:24:44 +0100
Subject: [PATCH 233/879] docs: Update ChangeLog and NEWS

---
 ChangeLog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b128f1032..547bea3f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,8 +56,10 @@
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
 
-- TD-64 sync conflict deleted all annotations of the task
-        (thanks to Markus Beppler, Konstantin Vorobyev).
+- TD-64   sync conflict deleted all annotations of the task
+          (thanks to Markus Beppler, Konstantin Vorobyev).
+- TW-1785 Purge command to remove deleted tasks
+          (thanks to Paul Beckingham)
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 5f8de9fd2c2839808a5a1466ef6dc99051841171 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 02:50:48 +0100
Subject: [PATCH 234/879] TW-1772: Implementation of circular dependency
 detection is inefficient

- Thanks to Michael Meier.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 547bea3f1..a4861ed6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,8 @@
           (thanks to Markus Beppler, Konstantin Vorobyev).
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham)
+- TW-1772 Implementation of circular dependency detection is
+          inefficient (thanks to Michael Meier).
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 546357662f0ae1d88d3e37cca0e1d902478b6600 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 22 Mar 2016 23:43:49 +0100
Subject: [PATCH 235/879] TW-1788: Closing a reopened task does not update the
 end time

- Thanks to Ralph Bean.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a4861ed6e..1b9add3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,8 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
+- TW-1788 Closing a reopened task does not update the end time (thanks
+          to Ralph Bean).
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 8470763c31d2ba9212dad44d2ef17d77ec876dcc Mon Sep 17 00:00:00 2001
From: Lynoure Braakman <lynoure@lynoure.net>
Date: Sun, 27 Mar 2016 22:34:57 +0200
Subject: [PATCH 236/879] juhannus as an alternative name for midsommarafton

---
 ChangeLog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b9add3a3..237b25195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,8 +62,10 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
-- TW-1788 Closing a reopened task does not update the end time (thanks
-          to Ralph Bean).
+- TW-1788 Closing a reopened task does not update the end time
+          (thanks to Ralph Bean).
+- Added 'juhannus' as a synonym for 'midsommarafton'
+          (thanks to Lynoure Braakman).
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 5fc5fbc8e7774e23ff1ea5a6e3dd10fb22fdec8b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 29 Mar 2016 07:52:38 -0400
Subject: [PATCH 237/879] Task: Deprecated the 'DUETODAY' virtual tag, which is
 a synonym for the 'TODAY'       virtual tag.

- Thanks to Tomas Babej
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 237b25195..e958a5639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,8 @@
           (thanks to Ralph Bean).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
+- Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
+  virtual tag.
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------

From 7747cf07e79a7018e0c8161cfcf01464c1f75ccb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 28 Apr 2016 21:02:09 -0400
Subject: [PATCH 238/879] L10N: Fixed ambiguity in the esp-ESP localization

- Thanks to Fidel Mato.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e958a5639..e4cc478d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,8 @@
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
   virtual tag.
 - Removed deprecated 'alias._query' setting.
+- Fixed ambiguity in the esp-ESP localization
+          (thanks to Fidel Mato).
 
 ------ current release ---------------------------
 

From e1deef327f19f82427906d5907720013beb20933 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sun, 1 May 2016 22:21:36 +0200
Subject: [PATCH 239/879] NEWS: Deprecate new-uuid verbosity option

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e4cc478d0..925d5c0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,8 @@
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
           (thanks to Fidel Mato).
+- Deprecated the 'new-uuid' verbosity option, since its functionality can be
+  removed by merging with 'new-id'.
 
 ------ current release ---------------------------
 

From 5dfc3674208c6a58cc515fab3aa7ea3e9f8420ab Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 May 2016 16:41:24 -0400
Subject: [PATCH 240/879] Task: Corrected false-positive warning about relative
 dates

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 925d5c0b9..f9f02aa64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@
           (thanks to Fidel Mato).
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
   removed by merging with 'new-id'.
+- Correct a false-positive warning when a due date is removed and a wait is
+  added.
 
 ------ current release ---------------------------
 

From 25e326c55cf9b772e300e03400c108fab50c4a1f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:13:03 -0400
Subject: [PATCH 241/879] Docs: Added QUARTER virtual tag

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f9f02aa64..0e15849ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
   removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
+- Added 'QUARTER' virtual tag.
 
 ------ current release ---------------------------
 

From 79ffa53ace8059fec03a5e8ec827b188b0cd73b5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 2 Aug 2016 08:25:02 -0400
Subject: [PATCH 242/879] Docs: Added Ran Benita

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0e15849ab..8c1053e8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,8 @@
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
+- Fixed unquoted glob in bash completion script
+          (thanks to Ran Benita).
 
 ------ current release ---------------------------
 

From 97400df68db390b5fd0e598863064dccf87d8c40 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Sep 2016 16:11:04 -0400
Subject: [PATCH 243/879] Config: Changed to 0/1 boolean values for the
 defaults.

- Deprecated use of alternate Boolean configuration settings. Use values "0" for
  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
  "yes", "y", "no", "n".
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8c1053e8e..79c46ab08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,9 @@
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
           (thanks to Ran Benita).
+- Deprecated use of alternate Boolean configuration settings. Use values "0" for
+  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
+  "yes", "y", "no", "n".
 
 ------ current release ---------------------------
 

From daabfcaf91cc8cd74e01117a1743b982bc8980b3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 21 Nov 2016 20:34:18 -0500
Subject: [PATCH 244/879] Tests: Fixed test harness for Python 3.x.

- Thanks to jrabbit.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 79c46ab08..2c7a68e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,8 @@
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
+- Fixed test harness for Python 3.x.
+          (thanks to jrabbit).
 
 ------ current release ---------------------------
 

From 56530a1f24e02a889325a62d71d2199892da4f1b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 19 Dec 2016 12:05:36 -0500
Subject: [PATCH 245/879] Improved certificate validation diagnostics

- Thanks to Jelle van der Waa.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2c7a68e5c..f70744802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,8 @@
   "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
           (thanks to jrabbit).
+- Improved certificate validation diagnostics
+          (thanks to Jelle van der Waa).
 
 ------ current release ---------------------------
 

From a91cd72829a589e920f405ad6c7ee5b54850e8c6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 09:53:42 -0500
Subject: [PATCH 246/879] ColType*: Push the ::validate and ::modify methods
 down from Column

---
 src/columns/ColTypeDate.cpp     | 6 ++++++
 src/columns/ColTypeDate.h       | 1 +
 src/columns/ColTypeDuration.cpp | 6 ++++++
 src/columns/ColTypeDuration.h   | 1 +
 src/columns/ColTypeNumeric.cpp  | 6 ++++++
 src/columns/ColTypeNumeric.h    | 1 +
 src/columns/ColTypeString.cpp   | 6 ++++++
 src/columns/ColTypeString.h     | 1 +
 src/columns/Column.cpp          | 6 ------
 src/columns/Column.h            | 2 +-
 10 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 8aab66b62..e2f19d56f 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -204,6 +204,12 @@ void ColumnTypeDate::render (
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool ColumnTypeDate::validate (const std::string& input) const
+{
+  return input.length () ? true : false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void ColumnTypeDate::modify (Task& task, const std::string& value)
 {
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index 4b9b8bed5..7480fcac5 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -39,6 +39,7 @@ public:
   ColumnTypeDate ();
   virtual void measure (Task&, unsigned int&, unsigned int&);
   virtual void render (std::vector <std::string>&, Task&, int, Color&);
+  virtual bool validate (const std::string&) const;
   virtual void modify (Task&, const std::string&);
 };
 
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 357641bd5..973d69361 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -43,6 +43,12 @@ ColumnTypeDuration::ColumnTypeDuration ()
   _type = "duration";
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool ColumnTypeDuration::validate (const std::string& input) const
+{
+  return input.length () ? true : false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void ColumnTypeDuration::modify (Task& task, const std::string& value)
 {
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index 9a38b796b..f1f81a131 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -35,6 +35,7 @@ class ColumnTypeDuration : public Column
 {
 public:
   ColumnTypeDuration ();
+  virtual bool validate (const std::string&) const;
   virtual void modify (Task&, const std::string&);
 };
 
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 725fbe8b9..a79083780 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -43,6 +43,12 @@ ColumnTypeNumeric::ColumnTypeNumeric ()
   _type = "numeric";
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool ColumnTypeNumeric::validate (const std::string& input) const
+{
+  return input.length () ? true : false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void ColumnTypeNumeric::modify (Task& task, const std::string& value)
 {
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index 1da8f0b83..52e1b5de2 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -35,6 +35,7 @@ class ColumnTypeNumeric : public Column
 {
 public:
   ColumnTypeNumeric ();
+  virtual bool validate (const std::string&) const;
   virtual void modify (Task&, const std::string&);
 };
 
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 18d3f67d1..cee564589 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -43,6 +43,12 @@ ColumnTypeString::ColumnTypeString ()
   _type = "string";
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool ColumnTypeString::validate (const std::string& input) const
+{
+  return input.length () ? true : false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void ColumnTypeString::modify (Task& task, const std::string& value)
 {
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index 0f6d22164..8bc0c490d 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -35,6 +35,7 @@ class ColumnTypeString : public Column
 {
 public:
   ColumnTypeString ();
+  virtual bool validate (const std::string&) const;
   virtual void modify (Task&, const std::string&);
 };
 
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 2f7dc834c..89744677c 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -283,12 +283,6 @@ void Column::setStyle (const std::string& style)
   _style = style;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-bool Column::validate (const std::string& input) const
-{
-  return input.length () ? true : false;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // All integer values are right-justified.
 void Column::renderInteger (
diff --git a/src/columns/Column.h b/src/columns/Column.h
index a5e2e0c00..9290d7a21 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -57,12 +57,12 @@ public:
   virtual void setLabel  (const std::string& value) { _label = value;  }
   virtual void setReport (const std::string& value) { _report = value; }
 
-  virtual bool validate (const std::string&) const;
   virtual void measure (const std::string&, unsigned int&, unsigned int&)           {};
   virtual void measure (Task&, unsigned int&, unsigned int&)                        {};
   virtual void renderHeader (std::vector <std::string>&, int, Color&);
   virtual void render (std::vector <std::string>&, const std::string&, int, Color&) {};
   virtual void render (std::vector <std::string>&, Task&, int, Color&)              {};
+  virtual bool validate (const std::string&) const                                  {return false;};
   virtual void modify (Task&, const std::string&)                                   {};
 
 protected:

From 19e5ed63138b4a083e2ed76ae761ff8c2c868d43 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:31:27 -0500
Subject: [PATCH 247/879] ColScheduled: Formatting cleanup

---
 src/columns/ColScheduled.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 72970dec2..89663abc6 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -31,8 +31,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnScheduled::ColumnScheduled ()
 {
-  _name     = "scheduled";
-  _label    = STRING_COLUMN_LABEL_SCHED;
+  _name  = "scheduled";
+  _label = STRING_COLUMN_LABEL_SCHED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 29e4b21a8bdad944498b57a8591af70aa2c18908 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:32:18 -0500
Subject: [PATCH 248/879] ColScheduled: Fixed bug where the wrong column label
 was used

---
 src/columns/ColScheduled.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 89663abc6..f81ad339a 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -42,7 +42,7 @@ void ColumnScheduled::setStyle (const std::string& value)
 {
   _style = value;
 
-  if (_style == "countdown" && _label == STRING_COLUMN_LABEL_DUE)
+  if (_style == "countdown" && _label == STRING_COLUMN_LABEL_SCHED)
     _label = STRING_COLUMN_LABEL_COUNT;
 }
 

From e1e21f30fea596d6d46d742f5a79c98ae5d00823 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:32:41 -0500
Subject: [PATCH 249/879] ColUntil: Formatting cleanup

---
 src/columns/ColUntil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index 2eb094e14..f66ba288c 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -31,8 +31,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUntil::ColumnUntil ()
 {
-  _name      = "until";
-  _label     = STRING_COLUMN_LABEL_UNTIL;
+  _name  = "until";
+  _label = STRING_COLUMN_LABEL_UNTIL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From b45e226db99bc183787eaee684614e3765475ae1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:32:58 -0500
Subject: [PATCH 250/879] ColDepends: Corrected use of _name

---
 src/columns/ColDepends.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 16ae70ee3..afb0ba0e4 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -73,7 +73,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
 
   if (_style == "indicator")
   {
-    if (task.has ("depends"))
+    if (task.has (_name))
       minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
     else
       minimum = maximum = 0;
@@ -86,7 +86,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
            _style == "list")
   {
     minimum = maximum = 0;
-    if (task.has ("depends"))
+    if (task.has (_name))
     {
       std::vector <int> blocking_ids;
       for (auto& i : blocking)

From 7470af24a99fabb2294ee3f0aebbbfd88ab668f5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:34:24 -0500
Subject: [PATCH 251/879] ColWait: Formatting cleanup

---
 src/columns/ColWait.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index 58a300e64..2275c1fc7 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -31,8 +31,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnWait::ColumnWait ()
 {
-  _name      = "wait";
-  _label     = STRING_COLUMN_LABEL_WAIT;
+  _name  = "wait";
+  _label = STRING_COLUMN_LABEL_WAIT;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 14b632f1a580b294226a047c9816cddb4a00469e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:36:13 -0500
Subject: [PATCH 252/879] ColUrgency: Marked column as unmodifiable

---
 src/columns/ColUrgency.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 8e6e0b0ca..61193e43d 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -32,11 +32,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUrgency::ColumnUrgency ()
 {
-  _name     = "urgency";
-  _style    = "real";
-  _label    = STRING_COLUMN_LABEL_URGENCY;
-  _styles   = {"real", "integer"};
-  _examples = {"4.6", "4"};
+  _name       = "urgency";
+  _style      = "real";
+  _label      = STRING_COLUMN_LABEL_URGENCY;
+  _modifiable = false;
+  _styles     = {"real", "integer"};
+  _examples   = {"4.6", "4"};
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From b8641d7d5e42e487664686358d1a81fd82e50187 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:38:11 -0500
Subject: [PATCH 253/879] ColUUID: Removed unnecessary header

---
 src/columns/ColUUID.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 802ecb5fa..501991654 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -26,7 +26,6 @@
 
 #include <cmake.h>
 #include <ColUUID.h>
-#include <math.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -45,6 +44,8 @@ ColumnUUID::ColumnUUID ()
 // Set the minimum and maximum widths for the value.
 void ColumnUUID::measure (Task&, unsigned int& minimum, unsigned int& maximum)
 {
+  // Mandatory attribute, no need to check the value.
+
        if (_style == "default" || _style == "long") minimum = maximum = 36;
   else if (_style == "short")                       minimum = maximum = 8;
   else

From a2684a6a1234e1436d53392ee206d2d2e1534262 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:40:11 -0500
Subject: [PATCH 254/879] ColUDA: Added _modifiable

---
 src/columns/ColUDA.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 88d895fe3..d794340e1 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -40,12 +40,13 @@ extern Context context;
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUDAString::ColumnUDAString ()
 {
-  _name      = "<uda>";
-  _style     = "default";
-  _label     = "";
-  _uda       = true;
-  _hyphenate = true;
-  _styles    = {_style, "indicator"};
+  _name       = "<uda>";     // Gets overwritten at runtime.
+  _style      = "default";
+  _label      = "";
+  _modifiable = true;
+  _uda        = true;
+  _hyphenate  = true;
+  _styles     = {_style, "indicator"};
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From e2d9ae379bb27b885eaecc78113e1c6ea0af8a6c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 10:40:29 -0500
Subject: [PATCH 255/879] ColUDA: Removed redundant code

---
 src/columns/ColUDA.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index d794340e1..afb7ff7a3 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -122,14 +122,11 @@ void ColumnUDAString::render (
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        renderStringRight (lines, width, color, indicator);
-      }
+      renderStringRight (lines, width, color, indicator);
     }
   }
 }

From df8e9513247824a17b3932b3db80db3b2446706a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:08:59 -0500
Subject: [PATCH 256/879] ColDescription: Added _modifiable

---
 src/columns/ColDescription.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 7dc20613e..2cd3d3745 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -40,16 +40,17 @@ extern Context context;
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDescription::ColumnDescription ()
 {
-  _name  = "description";
-  _style = "combined";
-  _label = STRING_COLUMN_LABEL_DESC;
+  _name       = "description";
+  _style      = "combined";
+  _label      = STRING_COLUMN_LABEL_DESC;
+  _modifiable = true;
 
-  _styles = {"combined",
-             "desc",
-             "oneline",
-             "truncated",
-             "count",
-             "truncated_count"};
+  _styles     = {"combined",
+                 "desc",
+                 "oneline",
+                 "truncated",
+                 "count",
+                 "truncated_count"};
 
   _dateformat = context.config.get ("dateformat.annotation");
   if (_dateformat == "")

From 0150df0b05615d57a68d0c4ebc9a481fe5d13ec6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:09:13 -0500
Subject: [PATCH 257/879] ColDue: Added _modifiable

---
 src/columns/ColDue.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 50ffd849d..d64b7788b 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -31,8 +31,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDue::ColumnDue ()
 {
-  _name  = "due";
-  _label = STRING_COLUMN_LABEL_DUE;
+  _name       = "due";
+  _modifiable = true;
+  _label      = STRING_COLUMN_LABEL_DUE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 6057ecc83a560b4d327997da19ca32728206c43e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:09:27 -0500
Subject: [PATCH 258/879] ColEntry: Added _modifiable

---
 src/columns/ColEntry.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 63959fee3..17422e11d 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -31,8 +31,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 ColumnEntry::ColumnEntry ()
 {
-  _name  = "entry";
-  _label = STRING_COLUMN_LABEL_ADDED;
+  _name       = "entry";
+  _modifiable = true;
+  _label      = STRING_COLUMN_LABEL_ADDED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From b55ef724f6e69f7b49f72d7e76b62a956208ac69 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:09:54 -0500
Subject: [PATCH 259/879] ColIMask: Corrected use of _name

---
 src/columns/ColIMask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index dc14682d2..7de699666 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -48,7 +48,7 @@ void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maxi
 
   if (task.has (_name))
   {
-    minimum = maximum = task.get ("imask").length ();
+    minimum = maximum = task.get (_name).length ();
 
     if (_style != "default" &&
         _style != "number")
@@ -64,7 +64,7 @@ void ColumnIMask::render (
   Color& color)
 {
   if (task.has (_name))
-    renderStringRight (lines, width, color, task.get ("imask"));
+    renderStringRight (lines, width, color, task.get (_name));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 33d7ea65690beb3277f0a3d92f8dbc000c107ad4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:10:13 -0500
Subject: [PATCH 260/879] ColMask: Corrected use of _name

---
 src/columns/ColMask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 8bbcb2a9c..0ac3fe705 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -47,7 +47,7 @@ void ColumnMask::measure (Task& task, unsigned int& minimum, unsigned int& maxim
   minimum = maximum = 0;
   if (task.has (_name))
   {
-    minimum = maximum = task.get ("mask").length ();
+    minimum = maximum = task.get (_name).length ();
 
     if (_style != "default")
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -62,7 +62,7 @@ void ColumnMask::render (
   Color& color)
 {
   if (task.has (_name))
-    renderStringLeft (lines, width, color, task.get ("mask"));
+    renderStringLeft (lines, width, color, task.get (_name));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 49d5a16db3c16adcd538868dd99d2aeec84843b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:10:44 -0500
Subject: [PATCH 261/879] ColRecur: Added _modifiable

---
 src/columns/ColRecur.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 49f34fa69..4d05ec235 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -44,11 +44,12 @@ extern Task& contextTask;
 ////////////////////////////////////////////////////////////////////////////////
 ColumnRecur::ColumnRecur ()
 {
-  _name     = "recur";
-  _style    = "duration";
-  _label    = STRING_COLUMN_LABEL_RECUR;
-  _styles   = {"duration", "indicator"};
-  _examples = {"weekly", context.config.get ("recurrence.indicator")};
+  _name       = "recur";
+  _style      = "duration";
+  _label      = STRING_COLUMN_LABEL_RECUR;
+  _modifiable = true;
+  _styles     = {"duration", "indicator"};
+  _examples   = {"weekly", context.config.get ("recurrence.indicator")};
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 0e4f11afc5e344fb01fc9598596b3d710c3d2605 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:11:04 -0500
Subject: [PATCH 262/879] ColRecur: Corrected use of _name

---
 src/columns/ColRecur.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 4d05ec235..160a6e287 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -74,11 +74,11 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     if (_style == "default" ||
         _style == "duration")
     {
-      minimum = maximum = Duration (task.get ("recur")).formatISO ().length ();
+      minimum = maximum = Duration (task.get (_name)).formatISO ().length ();
     }
     else if (_style == "indicator")
     {
-      if (task.has ("recur"))
+      if (task.has (_name))
         minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
       else
         minimum = maximum = 0;
@@ -99,7 +99,7 @@ void ColumnRecur::render (
   {
     if (_style == "default" ||
         _style == "duration")
-      renderStringRight (lines, width, color, Duration (task.get ("recur")).formatISO ());
+      renderStringRight (lines, width, color, Duration (task.get (_name)).formatISO ());
 
     else if (_style == "indicator")
       renderStringRight (lines, width, color, context.config.get ("recurrence.indicator"));

From 92e289cb3d1a08dbc2e552d318c4f7b6e6ed139e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:11:42 -0500
Subject: [PATCH 263/879] ColStart: Removed redundant code

---
 src/columns/ColStart.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 704a881d3..88a9332c2 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -62,12 +62,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
   if (task.has (_name))
   {
     if (_style == "active")
-    {
-      if (task.has ("start"))
-        minimum = maximum = utf8_width (context.config.get ("active.indicator"));
-      else
-        minimum = maximum = 0;
-    }
+      minimum = maximum = utf8_width (context.config.get ("active.indicator"));
     else
       ColumnTypeDate::measure (task, minimum, maximum);
   }

From 3fa0e7c1ad7155038badefb54d88e47576c6a56d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:11:56 -0500
Subject: [PATCH 264/879] ColTags: Corrected use of _name

---
 src/columns/ColTags.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 546753077..48427aa52 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -80,7 +80,7 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
   {
     if (_style == "indicator")
     {
-      if (task.has ("tags"))
+      if (task.has (_name))
         minimum = maximum = utf8_width (context.config.get ("tag.indicator"));
       else
         minimum = maximum = 0;
@@ -163,7 +163,7 @@ void ColumnTags::modify (Task& task, const std::string& value)
   std::string label = "  MODIFICATION ";
 
   // TW-1701
-  task.set ("tags", "");
+  task.set (_name, "");
 
   for (auto& tag : split (value, ','))
   {

From d99eb3c970c72da0f6aa5c6d5801cc69eaf04d41 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:45:31 -0500
Subject: [PATCH 265/879] ColDepends: Removed redundant code

---
 src/columns/ColDepends.cpp | 77 +++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index afb0ba0e4..9a481c385 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -68,26 +68,28 @@ void ColumnDepends::setStyle (const std::string& value)
 // Set the minimum and maximum widths for the value.
 void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
-  std::vector <Task> blocking;
-  dependencyGetBlocking (task, blocking);
-
-  if (_style == "indicator")
+  minimum = maximum = 0;
+  if (task.has (_name))
   {
-    if (task.has (_name))
-      minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
-    else
-      minimum = maximum = 0;
-  }
-  else if (_style == "count")
-  {
-    minimum = maximum = 2 + format ((int) blocking.size ()).length ();
-  }
-  else if (_style == "default" ||
-           _style == "list")
-  {
-    minimum = maximum = 0;
-    if (task.has (_name))
+    if (_style == "indicator")
     {
+      minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
+    }
+
+    else if (_style == "count")
+    {
+      std::vector <Task> blocking;
+      dependencyGetBlocking (task, blocking);
+      minimum = maximum = 2 + format ((int) blocking.size ()).length ();
+    }
+
+    else if (_style == "default" ||
+             _style == "list")
+    {
+      minimum = maximum = 0;
+      std::vector <Task> blocking;
+      dependencyGetBlocking (task, blocking);
+
       std::vector <int> blocking_ids;
       for (auto& i : blocking)
         blocking_ids.push_back (i.id);
@@ -103,9 +105,9 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
           minimum = length;
       }
     }
+    else
+      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -118,30 +120,35 @@ void ColumnDepends::render (
   if (task.has (_name))
   {
     if (_style == "indicator")
+    {
       renderStringRight (lines, width, color, context.config.get ("dependency.indicator"));
-    else
+    }
+
+    else if (_style == "count")
     {
       std::vector <Task> blocking;
       dependencyGetBlocking (task, blocking);
 
-      if (_style == "count")
-        renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']');
+      renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']');
+    }
 
-      else if (_style == "default" ||
-               _style == "list")
-      {
-        std::vector <int> blocking_ids;
-        for (const auto& t : blocking)
-          blocking_ids.push_back (t.id);
+    else if (_style == "default" ||
+             _style == "list")
+    {
+      std::vector <Task> blocking;
+      dependencyGetBlocking (task, blocking);
 
-        auto combined = join (" ", blocking_ids);
+      std::vector <int> blocking_ids;
+      for (const auto& t : blocking)
+        blocking_ids.push_back (t.id);
 
-        std::vector <std::string> all;
-        wrapText (all, combined, width, _hyphenate);
+      auto combined = join (" ", blocking_ids);
 
-        for (const auto& i : all)
-          renderStringLeft (lines, width, color, i);
-      }
+      std::vector <std::string> all;
+      wrapText (all, combined, width, _hyphenate);
+
+      for (const auto& i : all)
+        renderStringLeft (lines, width, color, i);
     }
   }
 }

From f4b2589149b4979794f14da13a52fad961445dab Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:46:02 -0500
Subject: [PATCH 266/879] ColID: Documented ID 0 case

---
 src/columns/ColID.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 0108facef..9f2763cb1 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -68,6 +68,7 @@ void ColumnID::render (
   int width,
   Color& color)
 {
+   // Completed and deleted tasks have no ID.
   if (task.id)
     renderInteger (lines, width, color, task.id);
   else

From e18b4b2063c124a682c08d38184bd7935655ef61 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:47:10 -0500
Subject: [PATCH 267/879] ColRecur: Removed redundant code

---
 src/columns/ColRecur.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 160a6e287..dccfaa2c0 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -78,10 +78,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-        minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
-      else
-        minimum = maximum = 0;
+      minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);

From 0fc6b46c4c5f7665ad3f7abac057597d05bf22f3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:47:34 -0500
Subject: [PATCH 268/879] ColTags: Removed redundant code

---
 src/columns/ColTags.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 48427aa52..3d45dbe64 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -80,10 +80,7 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
   {
     if (_style == "indicator")
     {
-      if (task.has (_name))
-        minimum = maximum = utf8_width (context.config.get ("tag.indicator"));
-      else
-        minimum = maximum = 0;
+      minimum = maximum = utf8_width (context.config.get ("tag.indicator"));
     }
     else if (_style == "count")
     {

From 1fa467aa9fcd71b75da39111f0bf95568e8be474 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:49:15 -0500
Subject: [PATCH 269/879] ColUDA: Removed redundant code

---
 src/columns/ColUDA.cpp | 90 ++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 57 deletions(-)

diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index afb7ff7a3..8115e16a3 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -79,23 +79,18 @@ void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int&
       std::string value = task.get (_name);
       if (value != "")
       {
-        std::string stripped = Color::strip (value);
+        auto stripped = Color::strip (value);
         maximum = longestLine (stripped);
         minimum = longestWord (stripped);
       }
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        minimum = maximum = utf8_width (indicator);
-      }
-      else
-        minimum = maximum = 0;
+      minimum = maximum = utf8_width (indicator);
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -169,22 +164,17 @@ void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int&
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
       if (value != "")
         minimum = maximum = value.length ();
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        minimum = maximum = utf8_width (indicator);
-      }
-      else
-        minimum = maximum = 0;
+      minimum = maximum = utf8_width (indicator);
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -202,19 +192,16 @@ void ColumnUDANumeric::render (
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
       renderStringRight (lines, width, color, value);
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        renderStringRight (lines, width, color, indicator);
-      }
+      renderStringRight (lines, width, color, indicator);
     }
   }
 }
@@ -257,7 +244,7 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
       if (value != "")
       {
         // Determine the output date format, which uses a hierarchy of definitions.
@@ -265,7 +252,7 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
         //   rc.dateformat.report
         //   rc.dateformat
         Datetime date ((time_t) strtol (value.c_str (), NULL, 10));
-        std::string format = context.config.get ("report." + _report + ".dateformat");
+        auto format = context.config.get ("report." + _report + ".dateformat");
         if (format == "")
           format = context.config.get ("dateformat.report");
         if (format == "")
@@ -276,16 +263,11 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        minimum = maximum = utf8_width (indicator);
-      }
-      else
-        minimum = maximum = 0;
+      minimum = maximum = utf8_width (indicator);
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -303,13 +285,13 @@ void ColumnUDADate::render (
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
 
       // Determine the output date format, which uses a hierarchy of definitions.
       //   rc.report.<report>.dateformat
       //   rc.dateformat.report
       //   rc.dateformat.
-      std::string format = context.config.get ("report." + _report + ".dateformat");
+      auto format = context.config.get ("report." + _report + ".dateformat");
       if (format == "")
       {
         format = context.config.get ("dateformat.report");
@@ -321,14 +303,11 @@ void ColumnUDADate::render (
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        renderStringRight (lines, width, color, indicator);
-      }
+      renderStringRight (lines, width, color, indicator);
     }
   }
 }
@@ -371,7 +350,7 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
       if (value != "")
         minimum = maximum = Duration (value).formatISO ().length ();
     }
@@ -404,19 +383,16 @@ void ColumnUDADuration::render (
   {
     if (_style == "default")
     {
-      std::string value = task.get (_name);
+      auto value = task.get (_name);
       renderStringRight (lines, width, color, Duration (value).formatISO ());
     }
     else if (_style == "indicator")
     {
-      if (task.has (_name))
-      {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
-        if (indicator == "")
-          indicator = "U";
+      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      if (indicator == "")
+        indicator = "U";
 
-        renderStringRight (lines, width, color, indicator);
-      }
+      renderStringRight (lines, width, color, indicator);
     }
   }
 }

From 5fb7b24011557f3fb5b0a6479e57aee0b2d9ff28 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:51:54 -0500
Subject: [PATCH 270/879] CmdCommands: Removed obsolete include

---
 src/commands/CmdCommands.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index fab451b98..36f79ac19 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -32,7 +32,6 @@
 #include <Context.h>
 #include <Table.h>
 #include <Command.h>
-#include <ColString.h>
 #include <util.h>
 #include <i18n.h>
 

From fdcb084df6b4d58de3f13c2bf964721176765acc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 11:53:00 -0500
Subject: [PATCH 271/879] ColString: Removed obsolete column for ViewText

---
 src/columns/CMakeLists.txt |   1 -
 src/columns/ColString.cpp  | 116 -------------------------------------
 src/columns/ColString.h    |  49 ----------------
 src/columns/Column.cpp     |   4 --
 4 files changed, 170 deletions(-)
 delete mode 100644 src/columns/ColString.cpp
 delete mode 100644 src/columns/ColString.h

diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt
index 0bfffc941..2054039ff 100644
--- a/src/columns/CMakeLists.txt
+++ b/src/columns/CMakeLists.txt
@@ -22,7 +22,6 @@ set (columns_SRCS Column.cpp Column.h
                   ColScheduled.cpp ColScheduled.h
                   ColStart.cpp ColStart.h
                   ColStatus.cpp ColStatus.h
-                  ColString.cpp ColString.h
                   ColTags.cpp ColTags.h
                   ColTypeDate.cpp ColTypeDate.h
                   ColTypeDuration.cpp ColTypeDuration.h
diff --git a/src/columns/ColString.cpp b/src/columns/ColString.cpp
deleted file mode 100644
index fca7a57d4..000000000
--- a/src/columns/ColString.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <ColString.h>
-#include <Context.h>
-#include <format.h>
-#include <shared.h>
-#include <util.h>
-#include <i18n.h>
-
-extern Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-ColumnString::ColumnString ()
-{
-  _name     = "string";
-  _type     = "string";
-  _style    = "left";
-  _label    = "";
-  _styles   = {"left",
-               "right",
-               "left_fixed",
-               "right_fixed"};
-  _examples = {"Hello (wrapped)           ",
-               "           Hello (wrapped)",
-               "Hello (no-wrap)           ",
-               "           Hello (no-wrap)"};
-  _hyphenate = context.config.getBoolean ("hyphenate");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ColumnString is unique - it copies the report name into the label.  This is
-// a kludgy reuse of an otherwise unused member.
-void ColumnString::setReport (const std::string& value)
-{
-  _report = _label = value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Set the minimum and maximum widths for the value.
-//
-void ColumnString::measure (const std::string& value, unsigned int& minimum, unsigned int& maximum)
-{
-  minimum = maximum = 0;
-
-  if (_style == "left"  ||
-      _style == "right" ||
-      _style == "default")
-  {
-    std::string stripped = Color::strip (value);
-    maximum = longestLine (stripped);
-    minimum = longestWord (stripped);
-  }
-  else if (_style == "left_fixed" ||
-           _style == "right_fixed")
-    minimum = maximum = strippedLength (value);
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ColumnString::render (
-  std::vector <std::string>& lines,
-  const std::string& value,
-  int width,
-  Color& color)
-{
-  if (_style == "default" || _style == "left")
-  {
-    std::vector <std::string> raw;
-    wrapText (raw, value, width, _hyphenate);
-
-    for (auto& i : raw)
-      renderStringLeft (lines, width, color, i);
-  }
-  else if (_style == "right")
-  {
-    std::vector <std::string> raw;
-    wrapText (raw, value, width, _hyphenate);
-
-    for (auto& i : raw)
-      renderStringRight (lines, width, color, i);
-  }
-
-  else if (_style == "left_fixed")
-    renderStringLeft (lines, width, color, value);
-
-  else if (_style == "right_fixed")
-    renderStringRight (lines, width, color, value);
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColString.h b/src/columns/ColString.h
deleted file mode 100644
index 53c637548..000000000
--- a/src/columns/ColString.h
+++ /dev/null
@@ -1,49 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_COLSTRING
-#define INCLUDED_COLSTRING
-
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
-
-class ColumnString : public Column
-{
-public:
-  ColumnString ();
-  void setReport (const std::string&);
-  void measure (const std::string&, unsigned int&, unsigned int&);
-  void render (std::vector <std::string>&, const std::string&, int, Color&);
-
-private:
-  bool _hyphenate;
-};
-
-#endif
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 89744677c..dbf14e1dd 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -44,7 +44,6 @@
 #include <ColScheduled.h>
 #include <ColStart.h>
 #include <ColStatus.h>
-#include <ColString.h>
 #include <ColTags.h>
 #include <ColUntil.h>
 #include <ColUrgency.h>
@@ -101,9 +100,6 @@ Column* Column::factory (const std::string& name, const std::string& report)
   else if (column_name == "uuid")        c = new ColumnUUID ();
   else if (column_name == "wait")        c = new ColumnWait ();
 
-  // Special non-task column.
-  else if (column_name == "string")      c = new ColumnString ();
-
   // UDA.
   else if (context.config.has ("uda." + column_name + ".type"))
     c = Column::uda (column_name);

From 6c9660aee8459aa59ebc069b49242531109eb6ce Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 12:27:20 -0500
Subject: [PATCH 272/879] Task: Renamed ::getUDAOrphans to ::getUDAOrphanUUIDs

---
 src/Task.cpp             | 7 +++++--
 src/Task.h               | 2 +-
 src/commands/CmdEdit.cpp | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 1fa953265..ed65af137 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1336,12 +1336,15 @@ void Task::removeTag (const std::string& tag)
 #ifdef PRODUCT_TASKWARRIOR
 ////////////////////////////////////////////////////////////////////////////////
 // A UDA Orphan is an attribute that is not represented in context.columns.
-void Task::getUDAOrphans (std::vector <std::string>& names) const
+std::vector <std::string> Task::getUDAOrphanUUIDs () const
 {
+  std::vector <std::string> orphans;
   for (auto& it : data)
     if (it.first.compare (0, 11, "annotation_", 11) != 0)
       if (context.columns.find (it.first) == context.columns.end ())
-        names.push_back (it.first);
+        orphans.push_back (it.first);
+
+  return orphans;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Task.h b/src/Task.h
index 5d7961781..21d2fea7e 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -145,7 +145,7 @@ public:
   void getDependencies (std::vector <std::string>&) const;
   void getDependencies (std::vector <Task>&) const;
 
-  void getUDAOrphans (std::vector <std::string>&) const;
+  std::vector <std::string> getUDAOrphanUUIDs () const;
 
   void substitute (const std::string&, const std::string&, const std::string&);
 #endif
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 52f3d0ed2..9a8980148 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -312,9 +312,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   }
 
   // UDA orphans
-  std::vector <std::string> orphans;
-  task.getUDAOrphans (orphans);
-
+  auto orphans = task.getUDAOrphanUUIDs ();
   if (orphans.size ())
   {
     before << "# " << STRING_EDIT_UDA_ORPHAN_SEP << '\n';

From fab2979b87956dd337378809d7d5bdd494144572 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 15:44:13 -0500
Subject: [PATCH 273/879] Task: Improved method signature

---
 src/Task.cpp              |  4 ++--
 src/Task.h                |  2 +-
 src/commands/CmdEdit.cpp  |  9 ++-------
 src/commands/CmdInfo.cpp  |  3 +--
 src/commands/CmdStats.cpp |  3 +--
 src/commands/CmdTags.cpp  | 12 ++----------
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index ed65af137..82b904b17 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1313,9 +1313,9 @@ void Task::addTags (const std::vector <std::string>& tags)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Task::getTags (std::vector<std::string>& tags) const
+std::vector <std::string> Task::getTags () const
 {
-  tags = split (get ("tags"), ',');
+  return split (get ("tags"), ',');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Task.h b/src/Task.h
index 21d2fea7e..a323bbbd6 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -125,7 +125,7 @@ public:
   bool hasTag (const std::string&) const;
   void addTag (const std::string&);
   void addTags (const std::vector <std::string>&);
-  void getTags (std::vector<std::string>&) const;
+  std::vector <std::string> getTags () const;
   void removeTag (const std::string&);
 
   bool hasAnnotations () const;
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 9a8980148..55e2900a7 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -224,14 +224,10 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
          << "# iMask:             " << task.get ("imask")                                      << '\n'
          << "  Project:           " << task.get ("project")                                    << '\n';
 
-  std::vector <std::string> tags;
-  task.getTags (tags);
-  auto allTags = join (" ", tags);
-
   if (verbose)
     before << "# " << STRING_EDIT_TAG_SEP << '\n';
 
-  before << "  Tags:              " << allTags                                          << '\n'
+  before << "  Tags:              " << join (" ", task.getTags ())                      << '\n'
          << "  Description:       " << task.get ("description")                         << '\n'
          << "  Created:           " << formatDate (task, "entry", dateformat)           << '\n'
          << "  Started:           " << formatDate (task, "start", dateformat)           << '\n'
@@ -353,9 +349,8 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
 
   // tags
   value = findValue (after, "\n  Tags:");
-  auto tags = split (value, ' ');
   task.remove ("tags");
-  task.addTags (tags);
+  task.addTags (split (value, ' '));
 
   // description.
   value = findMultilineValue (after, "\n  Description:", "\n  Created:");
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index fdb6fd981..c028490fe 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -300,8 +300,7 @@ int CmdInfo::execute (std::string& output)
     }
 
     // tags ...
-    std::vector <std::string> tags;
-    task.getTags (tags);
+    auto tags = task.getTags ();
     if (tags.size ())
     {
       auto allTags = join (" ", tags);
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 599c83960..9eefc4bad 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -145,8 +145,7 @@ int CmdStats::execute (std::string& output)
     task.getAnnotations (annotations);
     annotationsT += annotations.size ();
 
-    std::vector <std::string> tags;
-    task.getTags (tags);
+    auto tags = task.getTags ();
     if (tags.size ())
       ++taggedT;
 
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index c50d201c9..6241ddd96 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -79,10 +79,7 @@ int CmdTags::execute (std::string& output)
   std::map <std::string, int> unique;
   for (auto& task : filtered)
   {
-    std::vector <std::string> tags;
-    task.getTags (tags);
-
-    for (auto& tag : tags)
+    for (auto& tag : task.getTags ())
       if (unique.find (tag) != unique.end ())
         unique[tag]++;
       else
@@ -182,13 +179,8 @@ int CmdCompletionTags::execute (std::string& output)
   // names as keys.
   std::map <std::string, int> unique;
   for (auto& task : filtered)
-  {
-    std::vector <std::string> tags;
-    task.getTags (tags);
-
-    for (auto& tag : tags)
+    for (auto& tag : task.getTags ())
       unique[tag] = 0;
-  }
 
   // Add built-in tags to map.
   unique["nocolor"]   = 0;

From 7e629ef30a198eb9a66b4540510eeac3a14b0927 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 15:55:06 -0500
Subject: [PATCH 274/879] Task: Improved method signature

---
 src/DOM.cpp                    |  6 ++----
 src/Task.cpp                   | 12 ++++++------
 src/Task.h                     |  2 +-
 src/Variant.cpp                | 10 ++--------
 src/columns/ColDescription.cpp | 16 ++++------------
 src/commands/CmdDenotate.cpp   |  3 +--
 src/commands/CmdEdit.cpp       |  4 +---
 src/commands/CmdInfo.cpp       |  4 +---
 src/commands/CmdStats.cpp      |  5 +----
 src/commands/CmdTimesheet.cpp  |  8 ++------
 10 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index cdfd34f6b..539e2fe37 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -300,8 +300,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 
   if (ref.data.size () && size == 3 && elements[0] == "annotations")
   {
-    std::map <std::string, std::string> annos;
-    ref.getAnnotations (annos);
+    auto annos = ref.getAnnotations ();
 
     int a = strtol (elements[1].c_str (), NULL, 10);
     int count = 0;
@@ -329,8 +328,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 
   if (ref.data.size () && size == 4 && elements[0] == "annotations" && elements[2] == "entry")
   {
-    std::map <std::string, std::string> annos;
-    ref.getAnnotations (annos);
+    auto annos = ref.getAnnotations ();
 
     int a = strtol (elements[1].c_str (), NULL, 10);
     int count = 0;
diff --git a/src/Task.cpp b/src/Task.cpp
index 82b904b17..e8fce3e81 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1081,13 +1081,14 @@ void Task::removeAnnotations ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Task::getAnnotations (std::map <std::string, std::string>& annotations) const
+std::map <std::string, std::string> Task::getAnnotations () const
 {
-  annotations.clear ();
-
+  std::map <std::string, std::string> a;
   for (auto& ann : data)
     if (! ann.first.compare (0, 11, "annotation_", 11))
-      annotations.insert (ann);
+      a.insert (ann);
+
+  return a;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1357,8 +1358,7 @@ void Task::substitute (
 
   // Get the data to modify.
   std::string description = get ("description");
-  std::map <std::string, std::string> annotations;
-  getAnnotations (annotations);
+  auto annotations = getAnnotations ();
 
   // Count the changes, so we know whether to proceed to annotations, after
   // modifying description.
diff --git a/src/Task.h b/src/Task.h
index a323bbbd6..f059bb01c 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -129,7 +129,7 @@ public:
   void removeTag (const std::string&);
 
   bool hasAnnotations () const;
-  void getAnnotations (std::map <std::string, std::string>&) const;
+  std::map <std::string, std::string> getAnnotations () const;
   void setAnnotations (const std::map <std::string, std::string>&);
   void addAnnotation (const std::string&);
   void removeAnnotations ();
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 5c9def5a7..a4ae7182a 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -874,10 +874,7 @@ bool Variant::operator_match (const Variant& other, const Task& task) const
     // in the annotations.
     if (left.source () == "description")
     {
-      std::map <std::string, std::string> annotations;
-      task.getAnnotations (annotations);
-
-      for (auto& a : annotations)
+      for (auto& a : task.getAnnotations ())
         if (r.match (a.second))
           return true;
     }
@@ -909,10 +906,7 @@ bool Variant::operator_match (const Variant& other, const Task& task) const
     // in the annotations.
     if (left.source () == "description")
     {
-      std::map <std::string, std::string> annotations;
-      task.getAnnotations (annotations);
-
-      for (auto& a : annotations)
+      for (auto& a : task.getAnnotations ())
         if (find (a.second, pattern, searchCaseSensitive) != std::string::npos)
           return true;
     }
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 2cd3d3745..7ff27d10a 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -102,9 +102,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
       if (min_anno > minimum)
         minimum = min_anno;
 
-      std::map <std::string, std::string> annos;
-      task.getAnnotations (annos);
-      for (auto& i : annos)
+      for (auto& i : task.getAnnotations ())
       {
         unsigned int len = min_anno + 1 + utf8_width (i.second);
         if (len > maximum)
@@ -129,9 +127,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
     if (task.annotation_count)
     {
       auto min_anno = Datetime::length (_dateformat);
-      std::map <std::string, std::string> annos;
-      task.getAnnotations (annos);
-      for (auto& i : annos)
+      for (auto& i : task.getAnnotations ())
         maximum += min_anno + 1 + utf8_width (i.second);
     }
   }
@@ -179,9 +175,7 @@ void ColumnDescription::render (
   {
     if (task.annotation_count)
     {
-      std::map <std::string, std::string> annos;
-      task.getAnnotations (annos);
-      for (const auto& i : annos)
+      for (const auto& i : task.getAnnotations ())
       {
         Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
         description += '\n' + std::string (_indent, ' ') + dt.toString (_dateformat) + ' ' + i.second;
@@ -210,9 +204,7 @@ void ColumnDescription::render (
   {
     if (task.annotation_count)
     {
-      std::map <std::string, std::string> annos;
-      task.getAnnotations (annos);
-      for (const auto& i : annos)
+      for (const auto& i : task.getAnnotations ())
       {
         Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
         description += ' ' + dt.toString (_dateformat) + ' ' + i.second;
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index d77b2ecec..6e679d38c 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -90,8 +90,7 @@ int CmdDenotate::execute (std::string&)
   {
     Task before (task);
 
-    std::map <std::string, std::string> annotations;
-    task.getAnnotations (annotations);
+    auto annotations = task.getAnnotations ();
 
     if (annotations.size () == 0)
       throw std::string (STRING_CMD_DENO_NONE);
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 55e2900a7..77fc03c5b 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -245,9 +245,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
            << "# " << STRING_EDIT_HEADER_14 << '\n'
            << "# " << STRING_EDIT_HEADER_15 << '\n';
 
-  std::map <std::string, std::string> annotations;
-  task.getAnnotations (annotations);
-  for (auto& anno : annotations)
+  for (auto& anno : task.getAnnotations ())
   {
     Datetime dt (strtol (anno.first.substr (11).c_str (), NULL, 10));
     before << "  Annotation:        " << dt.toString (dateformat)
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index c028490fe..21b0716ea 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -134,9 +134,7 @@ int CmdInfo::execute (std::string& output)
     std::string description = task.get ("description");
     int indent = context.config.getInteger ("indent.annotation");
 
-    std::map <std::string, std::string> annotations;
-    task.getAnnotations (annotations);
-    for (auto& anno : annotations)
+    for (auto& anno : task.getAnnotations ())
       description += '\n'
                    + std::string (indent, ' ')
                    + Datetime (anno.first.substr (11)).toString (dateformatanno)
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 9eefc4bad..e4aea4ca0 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -140,10 +140,7 @@ int CmdStats::execute (std::string& output)
       daysPending += (now.toEpoch () - entry) / 86400.0;
 
     descLength += task.get ("description").length ();
-
-    std::map <std::string, std::string> annotations;
-    task.getAnnotations (annotations);
-    annotationsT += annotations.size ();
+    annotationsT += task.getAnnotations ().size ();
 
     auto tags = task.getTags ();
     if (tags.size ())
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index d1493ed93..4f26ed506 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -142,9 +142,7 @@ int CmdTimesheet::execute (std::string& output)
           std::string description = task.get ("description");
           int indent = context.config.getInteger ("indent.annotation");
 
-          std::map <std::string, std::string> annotations;
-          task.getAnnotations (annotations);
-          for (auto& ann : annotations)
+          for (auto& ann : task.getAnnotations ())
             description += '\n'
                          + std::string (indent, ' ')
                          + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))
@@ -198,9 +196,7 @@ int CmdTimesheet::execute (std::string& output)
           std::string description = task.get ("description");
           int indent = context.config.getInteger ("indent.annotation");
 
-          std::map <std::string, std::string> annotations;
-          task.getAnnotations (annotations);
-          for (auto& ann : annotations)
+          for (auto& ann : task.getAnnotations ())
             description += '\n'
                          + std::string (indent, ' ')
                          + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))

From 04043d267f565c9e15e02d090deb8ac62e13ef74 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 16:15:24 -0500
Subject: [PATCH 275/879] Task: Improved method signature

---
 src/TDB2.cpp                    |  5 +----
 src/Task.cpp                    | 26 ++++++++++++--------------
 src/Task.h                      |  6 +++---
 src/commands/CmdDiagnostics.cpp |  5 +----
 src/commands/CmdEdit.cpp        |  3 +--
 src/dependency.cpp              |  3 +--
 src/feedback.cpp                | 30 +++++++-----------------------
 7 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index cde16fe00..5988ec0ac 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -528,10 +528,7 @@ void TF2::dependency_scan ()
   {
     if (left.has ("depends"))
     {
-      std::vector <std::string> deps;
-      left.getDependencies (deps);
-
-      for (auto& dep : deps)
+      for (auto& dep : left.getDependencyUUIDs ())
       {
         for (auto& right : _tasks)
         {
diff --git a/src/Task.cpp b/src/Task.cpp
index e8fce3e81..cbcd93583 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1186,35 +1186,33 @@ void Task::removeDependency (int id)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Task::getDependencies (std::vector <int>& all) const
+std::vector <int> Task::getDependencyIDs () const
 {
-  auto deps = split (get ("depends"), ',');
-
-  all.clear ();
-
-  for (auto& dep : deps)
+  std::vector <int> all;
+  for (auto& dep : split (get ("depends"), ','))
     all.push_back (context.tdb2.pending.id (dep));
+
+  return all;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Task::getDependencies (std::vector <std::string>& all) const
+std::vector <std::string> Task::getDependencyUUIDs () const
 {
-  all = split (get ("depends"), ',');
+  return split (get ("depends"), ',');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Task::getDependencies (std::vector <Task>& all) const
+std::vector <Task> Task::getDependencyTasks () const
 {
-  std::vector <std::string> deps = split (get ("depends"), ',');
-
-  all.clear ();
-
-  for (auto& dep : deps)
+  std::vector <Task> all;
+  for (auto& dep : split (get ("depends"), ','))
   {
     Task task;
     context.tdb2.get (dep, task);
     all.push_back (task);
   }
+
+  return all;
 }
 #endif
 
diff --git a/src/Task.h b/src/Task.h
index f059bb01c..a69a545aa 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -141,9 +141,9 @@ public:
 #ifdef PRODUCT_TASKWARRIOR
   void removeDependency (int);
   void removeDependency (const std::string&);
-  void getDependencies (std::vector <int>&) const;
-  void getDependencies (std::vector <std::string>&) const;
-  void getDependencies (std::vector <Task>&) const;
+  std::vector <int>         getDependencyIDs () const;
+  std::vector <std::string> getDependencyUUIDs () const;
+  std::vector <Task>        getDependencyTasks () const;
 
   std::vector <std::string> getUDAOrphanUUIDs () const;
 
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 95bd58314..1fa5e6ca7 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -456,10 +456,7 @@ int CmdDiagnostics::execute (std::string& output)
   for (auto& task : all)
   {
     // Check dependencies
-    std::vector <std::string> dependencies;
-    task.getDependencies(dependencies);
-
-    for (auto& uuid : dependencies)
+    for (auto& uuid : task.getDependencyUUIDs ())
     {
       if (! context.tdb2.has (uuid))
       {
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 77fc03c5b..633f02962 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -256,8 +256,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   before << "  Annotation:        " << now.toString (dateformat) << " -- \n";
 
   // Add dependencies here.
-  std::vector <std::string> dependencies;
-  task.getDependencies (dependencies);
+  auto dependencies = task.getDependencyUUIDs ();
   std::stringstream allDeps;
   for (unsigned int i = 0; i < dependencies.size (); ++i)
   {
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 534db4eb1..6d6c27ae7 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -82,8 +82,7 @@ bool dependencyIsCircular (const Task& task)
     while (! s.empty ())
     {
       Task& current = s.top ();
-      std::vector <std::string> deps_current;
-      current.getDependencies (deps_current);
+      auto deps_current = current.getDependencyUUIDs ();
 
       // This is a basic depth first search that always terminates given the
       // fact that we do not visit any task twice
diff --git a/src/feedback.cpp b/src/feedback.cpp
index d521bfe1d..4bd956ea9 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -84,8 +84,7 @@ std::string taskDifferences (const Task& before, const Task& after)
   {
     if (name == "depends")
     {
-      std::vector <Task> deps_after;
-      after.getDependencies (deps_after);
+      auto deps_after = after.getDependencyTasks ();
 
       out << "  - "
           << format (STRING_FEEDBACK_DEP_SET, taskIdentifiers (deps_after))
@@ -110,12 +109,10 @@ std::string taskDifferences (const Task& before, const Task& after)
     {
       if (name == "depends")
       {
-        std::vector <Task> deps_before;
-        before.getDependencies (deps_before);
+        auto deps_before = before.getDependencyTasks ();
         std::string from = taskIdentifiers (deps_before);
 
-        std::vector <Task> deps_after;
-        after.getDependencies (deps_after);
+        auto deps_after = after.getDependencyTasks ();
         std::string to = taskIdentifiers (deps_after);
 
         out << "  - "
@@ -169,11 +166,7 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-        std::vector <Task> deps_before;
-        before.getDependencies (deps_before);
-        std::string from = taskIdentifiers (deps_before);
-
-        out << format (STRING_FEEDBACK_DEP_DEL, from)
+        out << format (STRING_FEEDBACK_DEP_DEL, taskIdentifiers (before.getDependencyTasks ()))
             << "\n";
     }
     else if (name.substr (0, 11) == "annotation_")
@@ -198,11 +191,7 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-      std::vector <Task> deps_after;
-      after.getDependencies (deps_after);
-      std::string to = taskIdentifiers (deps_after);
-
-      out << format (STRING_FEEDBACK_DEP_WAS_SET, to)
+      out << format (STRING_FEEDBACK_DEP_WAS_SET, taskIdentifiers (after.getDependencyTasks ()))
           << "\n";
     }
     else if (name.substr (0, 11) == "annotation_")
@@ -231,13 +220,8 @@ std::string taskInfoDifferences (
     {
       if (name == "depends")
       {
-        std::vector <Task> deps_before;
-        before.getDependencies (deps_before);
-        std::string from = taskIdentifiers (deps_before);
-
-        std::vector <Task> deps_after;
-        after.getDependencies (deps_after);
-        std::string to = taskIdentifiers (deps_after);
+        auto from = taskIdentifiers (before.getDependencyTasks ());
+        auto to   = taskIdentifiers (after.getDependencyTasks ());
 
         out << format (STRING_FEEDBACK_DEP_WAS_MOD, from, to)
             << "\n";

From 8c0bfb030a9451dc08a089d470b2fc3833f3060f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Dec 2016 16:33:39 -0500
Subject: [PATCH 276/879] Task: Improved method signature

---
 ChangeLog                  |  3 +++
 src/Task.cpp               | 11 ++++-------
 src/Task.h                 | 20 ++++++++++----------
 src/columns/ColDepends.cpp | 15 ++++-----------
 src/commands/CmdInfo.cpp   |  6 ++----
 src/dependency.cpp         | 23 +++++++++++++----------
 src/feedback.cpp           |  6 ++----
 src/main.h                 |  4 ++--
 8 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f70744802..ba1d00b8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
           (thanks to Flavio Poletti).
 - TW-1857 Change Task::get call to the more efficient Task::has
           (thanks to Zachary Manning).
+- TW‐1858 Change signature for dependencyGetBlocked
+- TW-1859 Change signature of Task::getTags
+- TW-1860 Change signature of Task::getAnnotations
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
diff --git a/src/Task.cpp b/src/Task.cpp
index cbcd93583..b07cc918f 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1865,19 +1865,16 @@ float Task::urgency ()
 ////////////////////////////////////////////////////////////////////////////////
 float Task::urgency_inherit () const
 {
+  float v = FLT_MIN;
+#ifdef PRODUCT_TASKWARRIOR
   // Calling dependencyGetBlocked is rather expensive.
   // It is called recursively for each dependency in the chain here.
-  std::vector <Task> blocked;
-#ifdef PRODUCT_TASKWARRIOR
-  dependencyGetBlocked (*this, blocked);
-#endif
-
-  float v = FLT_MIN;
-  for (auto& task : blocked)
+  for (auto& task : dependencyGetBlocked (*this))
   {
     // Find highest urgency in all blocked tasks.
     v = std::max (v, task.urgency ());
   }
+#endif
 
   return v;
 }
diff --git a/src/Task.h b/src/Task.h
index a69a545aa..2cf4da61a 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -170,17 +170,17 @@ private:
   const std::string decode (const std::string&) const;
 
 public:
-  float urgency_project () const;
-  float urgency_active () const;
-  float urgency_scheduled () const;
-  float urgency_waiting () const;
-  float urgency_blocked () const;
-  float urgency_inherit () const;
+  float urgency_project     () const;
+  float urgency_active      () const;
+  float urgency_scheduled   () const;
+  float urgency_waiting     () const;
+  float urgency_blocked     () const;
+  float urgency_inherit     () const;
   float urgency_annotations () const;
-  float urgency_tags () const;
-  float urgency_due () const;
-  float urgency_blocking () const;
-  float urgency_age () const;
+  float urgency_tags        () const;
+  float urgency_due         () const;
+  float urgency_blocking    () const;
+  float urgency_age         () const;
 };
 
 #endif
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 9a481c385..b15a85d1e 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -78,17 +78,14 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
 
     else if (_style == "count")
     {
-      std::vector <Task> blocking;
-      dependencyGetBlocking (task, blocking);
-      minimum = maximum = 2 + format ((int) blocking.size ()).length ();
+      minimum = maximum = 2 + format ((int) dependencyGetBlocking (task).size ()).length ();
     }
 
     else if (_style == "default" ||
              _style == "list")
     {
       minimum = maximum = 0;
-      std::vector <Task> blocking;
-      dependencyGetBlocking (task, blocking);
+      auto blocking = dependencyGetBlocking (task);
 
       std::vector <int> blocking_ids;
       for (auto& i : blocking)
@@ -126,17 +123,13 @@ void ColumnDepends::render (
 
     else if (_style == "count")
     {
-      std::vector <Task> blocking;
-      dependencyGetBlocking (task, blocking);
-
-      renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']');
+      renderStringRight (lines, width, color, '[' + format (static_cast <int>(dependencyGetBlocking (task).size ())) + ']');
     }
 
     else if (_style == "default" ||
              _style == "list")
     {
-      std::vector <Task> blocking;
-      dependencyGetBlocking (task, blocking);
+      auto blocking = dependencyGetBlocking (task);
 
       std::vector <int> blocking_ids;
       for (const auto& t : blocking)
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 21b0716ea..319c3f1d6 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -160,8 +160,7 @@ int CmdInfo::execute (std::string& output)
 
     // dependencies: blocked
     {
-      std::vector <Task> blocked;
-      dependencyGetBlocking (task, blocked);
+      auto blocked = dependencyGetBlocking (task);
       if (blocked.size ())
       {
         std::stringstream message;
@@ -176,8 +175,7 @@ int CmdInfo::execute (std::string& output)
 
     // dependencies: blocking
     {
-      std::vector <Task> blocking;
-      dependencyGetBlocked (task, blocking);
+      auto blocking = dependencyGetBlocked (task);
       if (blocking.size ())
       {
         std::stringstream message;
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 6d6c27ae7..0323d1d75 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -38,29 +38,35 @@
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
-void dependencyGetBlocked (const Task& task, std::vector <Task>& blocked)
+std::vector <Task> dependencyGetBlocked (const Task& task)
 {
   std::string uuid = task.get ("uuid");
 
-  auto all = context.tdb2.pending.get_tasks ();
-  for (auto& it : all)
+  std::vector <Task> blocked;
+  for (auto& it : context.tdb2.pending.get_tasks ())
     if (it.getStatus () != Task::completed &&
         it.getStatus () != Task::deleted   &&
         it.has ("depends")                 &&
         it.get ("depends").find (uuid) != std::string::npos)
       blocked.push_back (it);
+
+  return blocked;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void dependencyGetBlocking (const Task& task, std::vector <Task>& blocking)
+std::vector <Task> dependencyGetBlocking (const Task& task)
 {
   std::string depends = task.get ("depends");
+  std::vector <Task> blocking;
+
   if (depends != "")
     for (auto& it : context.tdb2.pending.get_tasks ())
       if (it.getStatus () != Task::completed &&
           it.getStatus () != Task::deleted   &&
           depends.find (it.get ("uuid")) != std::string::npos)
         blocking.push_back (it);
+
+  return blocking;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -145,14 +151,12 @@ bool dependencyIsCircular (const Task& task)
 //
 void dependencyChainOnComplete (Task& task)
 {
-  std::vector <Task> blocking;
-  dependencyGetBlocking (task, blocking);
+  auto blocking = dependencyGetBlocking (task);
 
   // If the task is anything but the tail end of a dependency chain.
   if (blocking.size ())
   {
-    std::vector <Task> blocked;
-    dependencyGetBlocked (task, blocked);
+    auto blocked = dependencyGetBlocked (task);
 
     // Nag about broken chain.
     if (context.config.getBoolean ("dependency.reminder"))
@@ -205,8 +209,7 @@ void dependencyChainOnStart (Task& task)
 {
   if (context.config.getBoolean ("dependency.reminder"))
   {
-    std::vector <Task> blocking;
-    dependencyGetBlocking (task, blocking);
+    auto blocking = dependencyGetBlocking (task);
 
     // If the task is anything but the tail end of a dependency chain, nag about
     // broken chain.
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 4bd956ea9..913ab7c26 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -381,14 +381,12 @@ void feedback_unblocked (const Task& task)
   if (context.verbose ("affected"))
   {
     // Get a list of tasks that depended on this task.
-    std::vector <Task> blocked;
-    dependencyGetBlocked (task, blocked);
+    auto blocked = dependencyGetBlocked (task);
 
     // Scan all the tasks that were blocked by this task
     for (auto& i : blocked)
     {
-      std::vector <Task> blocking;
-      dependencyGetBlocking (i, blocking);
+      auto blocking = dependencyGetBlocking (i);
       if (blocking.size () == 0)
       {
         if (i.id)
diff --git a/src/main.h b/src/main.h
index d18c881a1..a48380814 100644
--- a/src/main.h
+++ b/src/main.h
@@ -52,8 +52,8 @@ std::string colorizeError (const std::string&);
 std::string colorizeDebug (const std::string&);
 
 // dependency.cpp
-void dependencyGetBlocked (const Task&, std::vector <Task>&);
-void dependencyGetBlocking (const Task&, std::vector <Task>&);
+std::vector <Task> dependencyGetBlocked (const Task&);
+std::vector <Task> dependencyGetBlocking (const Task&);
 bool dependencyIsCircular (const Task&);
 void dependencyChainOnComplete (Task&);
 void dependencyChainOnStart (Task&);

From f8578ecc28eeb98bf5d0355b3389622d5f672710 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 7 Jan 2017 10:46:40 -0500
Subject: [PATCH 277/879] Columns: Consistency

---
 src/columns/ColIMask.cpp    | 1 -
 src/columns/ColParent.cpp   | 1 -
 src/columns/ColProject.cpp  | 1 -
 src/columns/ColRecur.cpp    | 1 -
 src/columns/ColStart.cpp    | 3 ++-
 src/columns/ColTags.cpp     | 1 -
 src/columns/ColTypeDate.cpp | 1 -
 src/columns/ColUDA.cpp      | 4 ----
 src/columns/Column.cpp      | 2 +-
 9 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 7de699666..fbc090a20 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -45,7 +45,6 @@ ColumnIMask::ColumnIMask ()
 void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     minimum = maximum = task.get (_name).length ();
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 5222a3636..f24a67999 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -45,7 +45,6 @@ ColumnParent::ColumnParent ()
 void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
          if (_style == "default" || _style == "long") minimum = maximum = 36;
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index aab4167a7..a24dfaa6a 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -59,7 +59,6 @@ ColumnProject::ColumnProject ()
 void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     std::string project = task.get (_name);
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index dccfaa2c0..59e1907f7 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -68,7 +68,6 @@ void ColumnRecur::setStyle (const std::string& value)
 void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "default" ||
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 88a9332c2..ae6f9f4cd 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -58,13 +58,14 @@ void ColumnStart::setStyle (const std::string& value)
 void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "active")
       minimum = maximum = utf8_width (context.config.get ("active.indicator"));
     else
       ColumnTypeDate::measure (task, minimum, maximum);
+
+    // TODO Throw on bad format.
   }
 }
 
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 3d45dbe64..8d33348d0 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -75,7 +75,6 @@ void ColumnTags::setStyle (const std::string& value)
 void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "indicator")
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index e2f19d56f..8bff07304 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -72,7 +72,6 @@ ColumnTypeDate::ColumnTypeDate ()
 void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     Datetime date (task.get_date (_name));
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 8115e16a3..cbb657590 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -71,7 +71,6 @@ bool ColumnUDAString::validate (const std::string& value) const
 void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "default")
@@ -159,7 +158,6 @@ bool ColumnUDANumeric::validate (const std::string& value) const
 void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "default")
@@ -239,7 +237,6 @@ bool ColumnUDADate::validate (const std::string& value) const
 void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "default")
@@ -345,7 +342,6 @@ bool ColumnUDADuration::validate (const std::string& value) const
 void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
-
   if (task.has (_name))
   {
     if (_style == "default")
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index dbf14e1dd..685a2cf1f 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -145,7 +145,7 @@ void Column::factory (std::map <std::string, Column*>& all)
 ////////////////////////////////////////////////////////////////////////////////
 void Column::uda (std::map <std::string, Column*>& all)
 {
-  // For each UDA, instantiate and initialize ColumnUDA().
+  // For each UDA, instantiate and initialize ColumnUDA.
   std::set <std::string> udas;
 
   for (const auto& i : context.config)

From a9513323677284da05c1cf6418b4ae270cefaf0d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 7 Jan 2017 11:04:08 -0500
Subject: [PATCH 278/879] Columns: Attribute objects properly delegate to
 Column::setStyle to validate formats

---
 src/columns/ColDepends.cpp   | 2 +-
 src/columns/ColEntry.cpp     | 2 +-
 src/columns/ColRecur.cpp     | 2 +-
 src/columns/ColScheduled.cpp | 2 +-
 src/columns/ColStart.cpp     | 2 +-
 src/columns/ColStatus.cpp    | 2 +-
 src/columns/ColTags.cpp      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index b15a85d1e..41e24eafb 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -58,7 +58,7 @@ ColumnDepends::ColumnDepends ()
 // Note that you can not determine which gets called first.
 void ColumnDepends::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
        if (_style == "indicator" && _label == STRING_COLUMN_LABEL_DEP) _label = _label.substr (0, context.config.get ("dependency.indicator").length ());
   else if (_style == "count"     && _label == STRING_COLUMN_LABEL_DEP) _label = STRING_COLUMN_LABEL_DEP_S;
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 17422e11d..a28ee3603 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -41,7 +41,7 @@ ColumnEntry::ColumnEntry ()
 // Note that you can not determine which gets called first.
 void ColumnEntry::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "age" &&
       _label == STRING_COLUMN_LABEL_ADDED)
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 59e1907f7..33af885d6 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -57,7 +57,7 @@ ColumnRecur::ColumnRecur ()
 // Note that you can not determine which gets called first.
 void ColumnRecur::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "indicator" && _label == STRING_COLUMN_LABEL_RECUR)
     _label = _label.substr (0, context.config.get ("recurrence.indicator").length ());
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index f81ad339a..f7e726cc1 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -40,7 +40,7 @@ ColumnScheduled::ColumnScheduled ()
 // Note that you can not determine which gets called first.
 void ColumnScheduled::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "countdown" && _label == STRING_COLUMN_LABEL_SCHED)
     _label = STRING_COLUMN_LABEL_COUNT;
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index ae6f9f4cd..86929da46 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -47,7 +47,7 @@ ColumnStart::ColumnStart ()
 // Note that you can not determine which gets called first.
 void ColumnStart::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "active" && _label == STRING_COLUMN_LABEL_STARTED)
     _label = STRING_COLUMN_LABEL_ACTIVE;
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index b06903648..044b536b9 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -46,7 +46,7 @@ ColumnStatus::ColumnStatus ()
 // Note that you can not determine which gets called first.
 void ColumnStatus::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "short" && _label == STRING_COLUMN_LABEL_STATUS)
     _label = STRING_COLUMN_LABEL_STAT;
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 8d33348d0..e69d4d5b6 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -59,7 +59,7 @@ ColumnTags::ColumnTags ()
 // Note that you can not determine which gets called first.
 void ColumnTags::setStyle (const std::string& value)
 {
-  _style = value;
+  Column::setStyle (value);
 
   if (_style == "indicator" &&
       _label == STRING_COLUMN_LABEL_TAGS)

From bb45ed3fceb630e1e340b8fd4b0d6b73836ce500 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 7 Jan 2017 11:10:03 -0500
Subject: [PATCH 279/879] Columns: Removed redundant format checking

---
 src/columns/ColDepends.cpp     | 2 --
 src/columns/ColDescription.cpp | 3 ---
 src/columns/ColID.cpp          | 4 ----
 src/columns/ColIMask.cpp       | 6 ------
 src/columns/ColMask.cpp        | 5 -----
 src/columns/ColParent.cpp      | 2 --
 src/columns/ColProject.cpp     | 4 ----
 src/columns/ColRecur.cpp       | 2 --
 src/columns/ColStatus.cpp      | 2 --
 src/columns/ColTags.cpp        | 2 --
 src/columns/ColTypeDate.cpp    | 2 --
 src/columns/ColUDA.cpp         | 8 --------
 src/columns/ColUUID.cpp        | 2 --
 src/columns/ColUrgency.cpp     | 3 ---
 14 files changed, 47 deletions(-)

diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 41e24eafb..1f256c086 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -102,8 +102,6 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
           minimum = length;
       }
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 7ff27d10a..1464592aa 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -153,9 +153,6 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
     minimum = 4;
     maximum = utf8_width (description) + 1 + 1 + format (task.annotation_count).length () + 1;
   }
-
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 9f2763cb1..28d934fa0 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -55,10 +55,6 @@ void ColumnID::measure (Task& task, unsigned int& minimum, unsigned int& maximum
   else                       length = 1 + (int) log10 ((double) task.id); // Slow
 
   minimum = maximum = length;
-
-  if (_style != "default" &&
-      _style != "number")
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index fbc090a20..1b9c75066 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -46,13 +46,7 @@ void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maxi
 {
   minimum = maximum = 0;
   if (task.has (_name))
-  {
     minimum = maximum = task.get (_name).length ();
-
-    if (_style != "default" &&
-        _style != "number")
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 0ac3fe705..25858ceae 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -46,12 +46,7 @@ void ColumnMask::measure (Task& task, unsigned int& minimum, unsigned int& maxim
 {
   minimum = maximum = 0;
   if (task.has (_name))
-  {
     minimum = maximum = task.get (_name).length ();
-
-    if (_style != "default")
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index f24a67999..1a18e61aa 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -49,8 +49,6 @@ void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& max
   {
          if (_style == "default" || _style == "long") minimum = maximum = 36;
     else if (_style == "short")                       minimum = maximum = 8;
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index a24dfaa6a..85e48cc7b 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -73,10 +73,6 @@ void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& ma
     {
       project = indentProject (project, "  ", '.');
     }
-    else if (_style != "default"  &&
-             _style != "full"     &&
-             _style != "indented")
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 
     minimum = longestWord (project);
     maximum = utf8_width (project);
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 33af885d6..c6ba5cecf 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -79,8 +79,6 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     {
       minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 044b536b9..9b41ac303 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -74,8 +74,6 @@ void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& max
   }
   else if (_style == "short")
     minimum = maximum = 1;
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index e69d4d5b6..24fa4b718 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -108,8 +108,6 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
       else
         minimum = maximum = utf8_width (tags);
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 8bff07304..7524ff68c 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -130,8 +130,6 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
       if (date > now)
         minimum = maximum = Duration (date - now).formatVague ().length ();
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index cbb657590..95175ba68 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -91,8 +91,6 @@ void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int&
 
       minimum = maximum = utf8_width (indicator);
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
@@ -174,8 +172,6 @@ void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int&
 
       minimum = maximum = utf8_width (indicator);
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
@@ -266,8 +262,6 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
 
       minimum = maximum = utf8_width (indicator);
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
@@ -363,8 +357,6 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int
       else
         minimum = maximum = 0;
     }
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
   }
 }
 
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 501991654..93fcec9d0 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -48,8 +48,6 @@ void ColumnUUID::measure (Task&, unsigned int& minimum, unsigned int& maximum)
 
        if (_style == "default" || _style == "long") minimum = maximum = 36;
   else if (_style == "short")                       minimum = maximum = 8;
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 61193e43d..16d7725a0 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -49,9 +49,6 @@ void ColumnUrgency::measure (Task& task, unsigned int& minimum, unsigned int& ma
 
   else if (_style == "integer")
     minimum = maximum = format ((int)task.urgency ()).length ();
-
-  else
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 9dd2365485382d933d6fdf5326657b071d6f9627 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 21:46:25 -0400
Subject: [PATCH 280/879] docs: Add missing submodule init step to the
 DEVELOPER file

---
 DEVELOPER | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DEVELOPER b/DEVELOPER
index 2a53dcd9c..0c43c8225 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -11,6 +11,7 @@ How to Build Taskwarrior
     $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
     $ git checkout 2.5.2                 # Latest dev branch
+    $ git submodule init
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs

From f5bcec66e52728d39bd1b35d36d28ee6417b85ad Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 11:50:30 -0500
Subject: [PATCH 281/879] libshared: Updated to
 aff911bd080a05e5e12a240e13adb27f435b5bb2

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 6d35bef52..aff911bd0 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 6d35bef52da4b881fcfb9946dddb01f603e225c8
+Subproject commit aff911bd080a05e5e12a240e13adb27f435b5bb2

From 14e047e7c43a17edacf450489f5ccb7332fda6a4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 11:52:04 -0500
Subject: [PATCH 282/879] util: Migrated osName to libshared

---
 src/calc.cpp                    |  2 +-
 src/commands/CmdDiagnostics.cpp |  2 +-
 src/util.cpp                    | 28 ----------------------------
 src/util.h                      |  1 -
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index cfd9c7464..2bc291c3a 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -33,8 +33,8 @@
 #include <Dates.h>
 #include <Context.h>
 #include <Task.h>
+#include <shared.h>
 #include <format.h>
-#include <util.h>
 #include <i18n.h>
 
 Context context;
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 1fa5e6ca7..30dc1fcce 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -34,8 +34,8 @@
 #include <RX.h>
 #include <Context.h>
 #include <i18n.h>
+#include <shared.h>
 #include <format.h>
-#include <util.h>
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
diff --git a/src/util.cpp b/src/util.cpp
index 5184d0c35..fa51defcb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -258,34 +258,6 @@ time_t timegm (struct tm *tm)
 }
 #endif
 
-////////////////////////////////////////////////////////////////////////////////
-std::string osName ()
-{
-#if defined (DARWIN)
-  return "Darwin";
-#elif defined (SOLARIS)
-  return "Solaris";
-#elif defined (CYGWIN)
-  return "Cygwin";
-#elif defined (HAIKU)
-  return "Haiku";
-#elif defined (OPENBSD)
-  return "OpenBSD";
-#elif defined (FREEBSD)
-  return "FreeBSD";
-#elif defined (NETBSD)
-  return "NetBSD";
-#elif defined (LINUX)
-  return "Linux";
-#elif defined (KFREEBSD)
-  return "GNU/kFreeBSD";
-#elif defined (GNUHURD)
-  return "GNU/Hurd";
-#else
-  return STRING_DOM_UNKNOWN;
-#endif
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool nontrivial (const std::string& input)
 {
diff --git a/src/util.h b/src/util.h
index 55de9fd52..d12d80af8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -60,7 +60,6 @@ const std::vector <std::string> extractParents (
   time_t timegm (struct tm *tm);
 #endif
 
-std::string osName ();
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
 const char* optionalBlankLine ();

From 264cc7e2feab397e4c09412814462ae1d421c88e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 11:53:05 -0500
Subject: [PATCH 283/879] Tests: Combined two almost identical tests into one

---
 test/version.t | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/version.t b/test/version.t
index ab95d4139..5f9e93388 100755
--- a/test/version.t
+++ b/test/version.t
@@ -83,7 +83,7 @@ class TestVersion(TestCase):
         return hash.rstrip("\n")
 
     def test_under_version(self):
-        """_version outputs expected version and syntax"""
+        """_version and diagnostics output expected version and syntax"""
         code, out, err = self.t("_version")
 
         # version = "x.x.x (git-hash)" or simply "x.x.x"
@@ -102,12 +102,8 @@ class TestVersion(TestCase):
         ver_expected = self.slurp()
         self.assertEqual(ver_expected, ver)
 
-    def test_task_git_version(self):
-        """Task binary matches the current git commit"""
-        expected = "Commit: {0}".format(self.slurp_git())
-
         code, out, err = self.t.diag()
-        self.assertIn(expected, out)
+        self.assertIn(ver_expected, out)
 
     def test_version_option(self):
         """Verify that  'task --version' returns something valid"""

From 12e30bf969efdd7e948af06829e73744dd1a5510 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 14:06:54 -0500
Subject: [PATCH 284/879] libshared: Updated to
 bfb0e90e0c94918b86dd16d8b0e05a74bab8fb75

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index aff911bd0..bfb0e90e0 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit aff911bd080a05e5e12a240e13adb27f435b5bb2
+Subproject commit bfb0e90e0c94918b86dd16d8b0e05a74bab8fb75

From 53310d1ea0acfc9f514e71362f70729d5bf27f8c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Jan 2017 14:07:18 -0500
Subject: [PATCH 285/879] CmdDiagnostics: Uses libshared cppCompliance call

---
 src/commands/CmdDiagnostics.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 30dc1fcce..03c9faa66 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -119,19 +119,9 @@ int CmdDiagnostics::execute (std::string& output)
       << '\n';
 
   // Compiler compliance level.
-  std::string compliance = "non-compliant";
-#ifdef __cplusplus
-  int level = __cplusplus;
-  if (level == 199711)
-    compliance = "C++98/03";
-  else if (level == 201103)
-    compliance = "C++11";
-  else
-    compliance = format (level);
-#endif
   out << ' ' << STRING_CMD_DIAG_COMPLIANCE
       << ": "
-      << compliance
+      << cppCompliance ()
       << "\n\n";
 
   out << bold.colorize (STRING_CMD_DIAG_FEATURES)

From 61685714c6cab790e8b321e3479338317fdf82cf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 10 Jan 2017 22:10:32 -0500
Subject: [PATCH 286/879] TLS: Aligned source with Taskserver

---
 src/TLSClient.cpp  | 11 +++++------
 src/l10n/deu-DEU.h |  4 ----
 src/l10n/eng-USA.h |  4 ----
 src/l10n/epo-RUS.h |  4 ----
 src/l10n/esp-ESP.h |  4 ----
 src/l10n/fra-FRA.h |  4 ----
 src/l10n/ita-ITA.h |  4 ----
 src/l10n/jpn-JPN.h |  4 ----
 src/l10n/pol-POL.h |  4 ----
 src/l10n/por-PRT.h |  4 ----
 10 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index db9d7e02f..61132d041 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -47,7 +47,6 @@
 #include <netdb.h>
 #include <gnutls/x509.h>
 #include <format.h>
-#include <i18n.h>
 
 #define MAX_BUF 16384
 
@@ -191,7 +190,7 @@ void TLSClient::init (
     if (_debug && ret == GNUTLS_E_INVALID_REQUEST)
       std::cout << "c: ERROR Priority error at: " << err << '\n';
 
-    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret)); // All
+    throw format ("Error initializing TLS. {1}", gnutls_strerror (ret)); // All
   }
 
   // Apply the x509 credentials to the current session.
@@ -253,7 +252,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   free (res);
 
   if (p == NULL)
-    throw format (STRING_CMD_SYNC_CONNECT, host, port);
+    throw format ("Could not connect to {1} {2}", host, port);
 
 #if GNUTLS_VERSION_NUMBER >= 0x030100
   gnutls_handshake_set_timeout (_session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); // 3.1.0
@@ -284,10 +283,10 @@ void TLSClient::connect (const std::string& host, const std::string& port)
       gnutls_free (out.data); // All
 
       std::string error {(const char*) out.data};
-      throw format (STRING_CMD_SYNC_HANDSHAKE, error);
+      throw format ("Handshake failed.  {1}", error);
     }
 #else
-    throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret)); // All
+    throw format ("Handshake failed.  {1}", gnutls_strerror (ret)); // All
 #endif
   }
 
@@ -301,7 +300,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   {
     if (_debug)
       std::cout << "c: ERROR Certificate verification failed.\n";
-    throw format (STRING_TLS_INIT_FAIL, gnutls_strerror (ret)); // All
+    throw format ("Error initializing TLS. {1}", gnutls_strerror (ret)); // All
   }
 #endif
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b8e75f8d5..033bf85e8 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "Das Server-Konto wurde verschoben.  Bitte Konfiguration folgendermaßen ändern:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA-Zertifikat nicht gefunden."
-#define STRING_CMD_SYNC_CONNECT      "Konnte nicht mit {1} {2} verbinden."
-#define STRING_CMD_SYNC_HANDSHAKE    "Verbindungsaufbau gescheitert.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "Entweder ein CA-Zertifikat bereitstellen oder Prüfung deaktivieren, nicht jedoch beides."
 #define STRING_CMD_SYNC_TRUST_OBS    "Erlaubte Werte der 'taskd.trust'-Option sind nur noch 'strict', 'ignore hostname' und 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Möchten Sie, dass diese Abhängigkeitskette korrigiert wird?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<unbekannt>"
 #define STRING_DOM_UNREC             "DOM: Unbekannten Namen nicht erkannt '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_INVALID_SORT_COL      "Nach Spalte '{1}' kann nicht sortiert weden."
-#define STRING_TLS_INIT_FAIL         "Fehler bei der TLS-Initialisierung. {1}"
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 63d30b473..15e30e0f0 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -485,8 +485,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_CONNECT      "Could not connect to {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Handshake failed.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -664,7 +662,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<unknown>"
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
 // Eval
@@ -755,7 +752,6 @@
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
-#define STRING_TLS_INIT_FAIL         "Error initializing TLS. {1}"
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index ce3f41a18..7d4b1b4c4 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "La servila konto transloĝiĝis.  Bonvolu aktualigi via agordo kun:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_CONNECT      "Ne povis konekti al {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Handshake failed.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Ĉu vi volas, ke la dependeca ĉeno repariĝus?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<nekonata>"
 #define STRING_DOM_UNREC             "DOM: Ne povis inspekti nekonatan nomon '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_INVALID_SORT_COL      "Kolumno '{1}' ne estas valida kampo por ordigi."
-#define STRING_TLS_INIT_FAIL         "Erara eko de TLS. {1}"
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4ba8145ed..c973c33c7 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -495,8 +495,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "La cuenta del servidor ha sido reubicada. Por favor, actualice su configuración utilizando:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"   // |esp-ESP|==|eng-USA|
 #define STRING_CMD_SYNC_BAD_CA       "Certificado CA no encontrado."
-#define STRING_CMD_SYNC_CONNECT      "No se pudo conectar a {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Handshake fallido.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "Debe proveer un certificado CA o la verificación de sobrescritura, pero no ambos."
 #define STRING_CMD_SYNC_TRUST_OBS    "Los ajustes de 'taskd.trust' ahora solo pueden contener uno de los valores 'strict', 'ignore hostname' o 'allow all'."
 #define STRING_CMD_DIAG_USAGE        "Detalles de plataforma, construcción y entorno"
@@ -675,7 +673,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "¿Desea que la cadena de dependencias sea arreglada?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<desconocido>"
 #define STRING_DOM_UNREC             "DOM: No se pudo obtener el nombre no reconocido '{1}'."
 
 // Eval
@@ -766,7 +763,6 @@
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_INVALID_SORT_COL      "La columna '{1}' no es un campo de ordenación válido."
-#define STRING_TLS_INIT_FAIL         "Error inicializando TLS. {1}"
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b83b57b90..8b5e358ac 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_CONNECT      "Could not connect to {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Handshake failed.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<unknown>"
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
-#define STRING_TLS_INIT_FAIL         "Erreur en initialisant TLS. {1}"
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 324936f0d..cfe41b3c1 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -486,8 +486,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_CONNECT      "Could not connect to {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Handshake failed.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -665,7 +663,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Si desidera riparare la catena delle dipendenze?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<sconosciuto>"
 #define STRING_DOM_UNREC             "DOM: Impossibile ottenere il nome non riconosciuto '{1}'."
 
 // Eval
@@ -756,7 +753,6 @@
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_INVALID_SORT_COL      "La colonna '{1}' non è un campo di ordinamento valido."
-#define STRING_TLS_INIT_FAIL         "Error initializing TLS. {1}"
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 49b66d75c..8d97727e8 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "CA certificate が見つからない。"
-#define STRING_CMD_SYNC_CONNECT      "{1} {2} に接続できない。"
-#define STRING_CMD_SYNC_HANDSHAKE    "ハンドシェーク失敗。  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<unknown>"
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
-#define STRING_TLS_INIT_FAIL         "TLS初期化でエラー。 {1}"
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e78364ea4..b43e5d053 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "Konto na serwerze zostało przeniesione.  Proszę uaktualnij swoją konfigurację używając:"
 #define STRING_CMD_SYNC_RELOCATE1    "konfiguracji taskd.server {1}"
 #define STRING_CMD_SYNC_BAD_CA       "Certyfikat CA nie znaleziony."
-#define STRING_CMD_SYNC_CONNECT      "Nie mogę połączyć się z {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "Nieudany handshake.  {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "Powinieneś udostępnić certyfikat CA lub nadpisać weryfikację. Wybierz jedną z opcji."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Czy chcesz naprawić łańcuch zależności?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<nieznane>"
 #define STRING_DOM_UNREC             "DOM: Nie mogę pobrać nierozpoznanej nazwy '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_INVALID_SORT_COL      "Kolumna '{1}' nie jest poprawnym parametrem sortowania."
-#define STRING_TLS_INIT_FAIL         "Błąd inicjalizacji TLS."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 108b2b78a..7f7709fa5 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -487,8 +487,6 @@
 #define STRING_CMD_SYNC_RELOCATE0    "A sua conta no servidor foi relocalizada. Por favor ajuste a configuração usando:"
 #define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"  // |por-PRT|==|eng-USA|
 #define STRING_CMD_SYNC_BAD_CA       "Certificado CA não encontrado."
-#define STRING_CMD_SYNC_CONNECT      "Não foi possível connectar a {1} {2}"
-#define STRING_CMD_SYNC_HANDSHAKE    "'Handshake' falhou. {1}"
 #define STRING_CMD_SYNC_TRUST_CA     "Deve fornecer um certificado CA ou desactivar a verificação, mas não ambos."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
@@ -666,7 +664,6 @@
 #define STRING_DEPEND_FIX_CHAIN      "Deseja que a cadeia de dependências seja corrigida?"
 
 // DOM
-#define STRING_DOM_UNKNOWN           "<desconhecido>"
 #define STRING_DOM_UNREC             "DOM: Não foi possível obter nome não reconhecido '{1}'."
 
 // Eval
@@ -757,7 +754,6 @@
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_INVALID_SORT_COL      "A coluna '{1}' não pode ser ordenada."
-#define STRING_TLS_INIT_FAIL         "Erro a iniciar componente TLS. {1}"
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."

From 24ae19b8e50b570e62477635e96663c719b6044b Mon Sep 17 00:00:00 2001
From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Sat, 14 Jan 2017 00:16:43 +0000
Subject: [PATCH 287/879] Add missing cast to double

---
 src/commands/CmdBurndown.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 9dae59d50..c54abad41 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -902,7 +902,7 @@ unsigned Chart::burndown_size (unsigned ntasks)
 
   // Choose the number from here rounded up to the nearest 10% of the next
   // highest power of 10 or half of power of 10.
-  const unsigned count = (unsigned) log10 (std::numeric_limits<unsigned>::max ());
+  const unsigned count = (unsigned) log10 (static_cast<double>(std::numeric_limits<unsigned>::max ()));
   unsigned half = 500;
   unsigned full = 1000;
 

From e096462005e887492b8f35fedbb4461f09b6181c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 14 Jan 2017 11:51:53 -0500
Subject: [PATCH 288/879] Docs: Added Antonion to AUTHORS

---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 4b5d254d2..352b737f6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,6 +136,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   jrabbit
   Jelle van der Waa
   Flavio Poletti
+  Antonio Huete Jimenez
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index ba1d00b8a..c19815163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,8 @@
           (thanks to jrabbit).
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
+- - Improved portability for SunOS-like OSes.
+          (thanks to Antonio Huete Jimenez).
 
 ------ current release ---------------------------
 

From bdd5bc90c4a3aed3978bdcf6d58637091c62f34e Mon Sep 17 00:00:00 2001
From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Sat, 14 Jan 2017 00:17:33 +0000
Subject: [PATCH 289/879] task: Fix build in SunOS-like environments.

Tested in:
 - OpenIndiana 2816291
 - OmniOS bed3013
 - SmartOS 20161129T003638Z
---
 CMakeLists.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 011c6a59b..bb14ebb47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,26 @@ else (HAVE_UUID_UNPARSE_LOWER)
   message ("-- Found libuuid, using internal uuid_unparse_lower")
 endif (HAVE_UUID_UNPARSE_LOWER)
 
+if (SOLARIS)
+  # accept() is in libsocket according to its manpage
+  message("-- Looking for libsocket")
+  find_library (SOCKET_LIBRARY NAMES socket)
+  if (SOCKET_LIBRARY)
+    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${SOCKET_LIBRARY})
+  else (SOCKET_LIBRARY)
+    message(FATAL_ERROR "-- libsocket not found.")
+  endif (SOCKET_LIBRARY)
+
+  # inet_ntop() is in libnsl according to its manpage
+  message("-- Looking for libnsl")
+  find_library (NSL_LIBRARY NAMES nsl)
+  if (NSL_LIBRARY)
+    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${NSL_LIBRARY})
+  else (NSL_LIBRARY)
+    message(FATAL_ERROR "-- libnsl not found.")
+  endif (NSL_LIBRARY)
+endif (SOLARIS)
+
 # Set the package language.
 if (LANGUAGE)
   set (PACKAGE_LANGUAGE ${LANGUAGE})

From 3ec14a884428965dafabcfb1b38feab4d91e50b9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 15 Jan 2017 20:11:56 -0500
Subject: [PATCH 290/879] Docs: Updated NEWS

---
 ChangeLog | 32 +-------------------------------
 NEWS      |  1 +
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c19815163..0446c0944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,37 +58,7 @@
           (thanks to jrabbit).
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
-
-- TD-64   sync conflict deleted all annotations of the task
-          (thanks to Markus Beppler, Konstantin Vorobyev).
-- TW-1785 Purge command to remove deleted tasks
-          (thanks to Paul Beckingham)
-- TW-1772 Implementation of circular dependency detection is
-          inefficient (thanks to Michael Meier).
-- TW-1788 Closing a reopened task does not update the end time
-          (thanks to Ralph Bean).
-- Added 'juhannus' as a synonym for 'midsommarafton'
-          (thanks to Lynoure Braakman).
-- Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
-  virtual tag.
-- Removed deprecated 'alias._query' setting.
-- Fixed ambiguity in the esp-ESP localization
-          (thanks to Fidel Mato).
-- Deprecated the 'new-uuid' verbosity option, since its functionality can be
-  removed by merging with 'new-id'.
-- Correct a false-positive warning when a due date is removed and a wait is
-  added.
-- Added 'QUARTER' virtual tag.
-- Fixed unquoted glob in bash completion script
-          (thanks to Ran Benita).
-- Deprecated use of alternate Boolean configuration settings. Use values "0" for
-  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
-  "yes", "y", "no", "n".
-- Fixed test harness for Python 3.x.
-          (thanks to jrabbit).
-- Improved certificate validation diagnostics
-          (thanks to Jelle van der Waa).
-- - Improved portability for SunOS-like OSes.
+- Improved portability for SunOS-like OSes.
           (thanks to Antonio Huete Jimenez).
 
 ------ current release ---------------------------
diff --git a/NEWS b/NEWS
index e51c930f8..569c6d1b3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ New Features in Taskwarrior 2.5.2
   - The 'QUARTER' virutal tag was added.
   - The 'help' command now takes a 'usage' argument, which displays only the
     command usage.
+  - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
 
 New Commands in Taskwarrior 2.5.2
 

From 116d192584b31ddc4b926b473b397a2f9cb9f581 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 12:03:31 -0500
Subject: [PATCH 291/879] libshared: Updated to
 2daeeb7e6e0716ce42f7a3d0e4400aee71531d6e

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index bfb0e90e0..2daeeb7e6 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit bfb0e90e0c94918b86dd16d8b0e05a74bab8fb75
+Subproject commit 2daeeb7e6e0716ce42f7a3d0e4400aee71531d6e

From 5e98ac943b932a1b936208bbf3ea0525c1c1a22d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 12:05:59 -0500
Subject: [PATCH 292/879] TW-213: Align countdown column on boundary between
 number and text.

- Thanks to Eric Fluger.
---
 ChangeLog                   |  2 ++
 src/columns/ColTypeDate.cpp | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0446c0944..c772db749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
           (thanks to Markus Beppler, Konstantin Vorobyev).
 - TW-61   Extract only tasks with annotations
           (thanks to Aikido Guy).
+- TW-213  Align countdown column on boundary between number and text.
+          (thanks to Eric Fluger).
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham).
 - TW-1772 Implementation of circular dependency detection is
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 7524ff68c..add52cdcf 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -61,8 +61,8 @@ ColumnTypeDate::ColumnTypeDate ()
                format (now.toJulian (), 13, 12),
                now.toEpochString (),
                now.toISO (),
-               Duration (Datetime () - now).formatVague (),
-               '-' + Duration (Datetime () - now).formatVague (),
+               Duration (Datetime () - now).formatVague (true),
+               '-' + Duration (Datetime () - now).formatVague (true),
                "",
                Duration (Datetime () - now).format ()};
 }
@@ -94,7 +94,7 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
     else if (_style == "countdown")
     {
       Datetime now;
-      minimum = maximum = Duration (now - date).formatVague ().length ();
+      minimum = maximum = Duration (now - date).formatVague (true).length ();
     }
     else if (_style == "julian")
     {
@@ -112,23 +112,23 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
     {
       Datetime now;
       if (now > date)
-        minimum = maximum = Duration (now - date).formatVague ().length ();
+        minimum = maximum = Duration (now - date).formatVague (true).length ();
       else
-        minimum = maximum = Duration (date - now).formatVague ().length () + 1;
+        minimum = maximum = Duration (date - now).formatVague (true).length () + 1;
     }
     else if (_style == "relative")
     {
       Datetime now;
       if (now < date)
-        minimum = maximum = Duration (date - now).formatVague ().length ();
+        minimum = maximum = Duration (date - now).formatVague (true).length ();
       else
-        minimum = maximum = Duration (now - date).formatVague ().length () + 1;
+        minimum = maximum = Duration (now - date).formatVague (true).length () + 1;
     }
     else if (_style == "remaining")
     {
       Datetime now;
       if (date > now)
-        minimum = maximum = Duration (date - now).formatVague ().length ();
+        minimum = maximum = Duration (date - now).formatVague (true).length ();
     }
   }
 }
@@ -164,7 +164,7 @@ void ColumnTypeDate::render (
     else if (_style == "countdown")
     {
       Datetime now;
-      renderStringRight (lines, width, color, Duration (now - date).formatVague ());
+      renderStringRight (lines, width, color, Duration (now - date).formatVague (true));
     }
     else if (_style == "julian")
       renderStringRight (lines, width, color, format (date.toJulian (), 13, 12));
@@ -179,24 +179,24 @@ void ColumnTypeDate::render (
     {
       Datetime now;
       if (now > date)
-        renderStringLeft (lines, width, color, Duration (now - date).formatVague ());
+        renderStringRight (lines, width, color, Duration (now - date).formatVague (true));
       else
-        renderStringLeft (lines, width, color, '-' + Duration (date - now).formatVague ());
+        renderStringRight (lines, width, color, '-' + Duration (date - now).formatVague (true));
     }
     else if (_style == "relative")
     {
       Datetime now;
       if (now < date)
-        renderStringLeft (lines, width, color, Duration (date - now).formatVague ());
+        renderStringRight (lines, width, color, Duration (date - now).formatVague (true));
       else
-        renderStringLeft (lines, width, color, '-' + Duration (now - date).formatVague ());
+        renderStringRight (lines, width, color, '-' + Duration (now - date).formatVague (true));
     }
 
     else if (_style == "remaining")
     {
       Datetime now;
       if (date > now)
-        renderStringRight (lines, width, color, Duration (date - now).formatVague ());
+        renderStringRight (lines, width, color, Duration (date - now).formatVague (true));
     }
   }
 }

From 444e16fdd22d32732fcf993e6476be6a49bd6035 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 12:33:18 -0500
Subject: [PATCH 293/879] TW-1572: Alternative approach to urgency inheritance

- Thanks to Jens Erat, Wim Schuermann.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c772db749..5649b90f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
           (thanks to Aikido Guy).
 - TW-213  Align countdown column on boundary between number and text.
           (thanks to Eric Fluger).
+- TW-1572 Alternative approach to urgency inheritance
+          (thanks to Jens Erat, Wim Schuermann).
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham).
 - TW-1772 Implementation of circular dependency detection is

From b21e0baa47dc715f0d9d0c700919133ce1619895 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 13:14:08 -0500
Subject: [PATCH 294/879] TW-1667: hooks: upon failure indicate which hook
 failed

- Thanks to Daniel Shahaf.
---
 ChangeLog              |  2 ++
 src/Hooks.cpp          | 59 +++++++++++++++++++++++++-----------------
 src/Hooks.h            |  8 +++---
 src/l10n/deu-DEU.h     | 14 +++++-----
 src/l10n/eng-USA.h     | 14 +++++-----
 src/l10n/epo-RUS.h     | 14 +++++-----
 src/l10n/esp-ESP.h     | 14 +++++-----
 src/l10n/fra-FRA.h     | 14 +++++-----
 src/l10n/ita-ITA.h     | 14 +++++-----
 src/l10n/jpn-JPN.h     | 14 +++++-----
 src/l10n/pol-POL.h     | 14 +++++-----
 src/l10n/por-PRT.h     | 14 +++++-----
 test/hooks.on-add.t    |  2 +-
 test/hooks.on-modify.t |  2 +-
 14 files changed, 106 insertions(+), 93 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5649b90f8..6e90d1cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
           (thanks to Eric Fluger).
 - TW-1572 Alternative approach to urgency inheritance
           (thanks to Jens Erat, Wim Schuermann).
+- TW-1667 hooks: upon failure indicate which hook failed
+          (thanks to Daniel Shahaf).
 - TW-1785 Purge command to remove deleted tasks
           (thanks to Paul Beckingham).
 - TW-1772 Implementation of circular dependency detection is
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index b6a2dd05f..944e7a0bd 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -42,6 +42,7 @@
 #include <Lexer.h>
 #include <JSON.h>
 #include <Timer.h>
+#include <FS.h>
 #include <format.h>
 #include <shared.h>
 #include <util.h>
@@ -138,7 +139,7 @@ void Hooks::onLaunch () const
       std::vector <std::string> outputFeedback;
       separateOutput (output, outputJSON, outputFeedback);
 
-      assertNTasks (outputJSON, 0);
+      assertNTasks (outputJSON, 0, script);
 
       if (status == 0)
       {
@@ -147,7 +148,7 @@ void Hooks::onLaunch () const
       }
       else
       {
-        assertFeedback (outputFeedback);
+        assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
           context.error (message);
 
@@ -200,7 +201,7 @@ void Hooks::onExit () const
       std::vector <std::string> outputFeedback;
       separateOutput (output, outputJSON, outputFeedback);
 
-      assertNTasks (outputJSON, 0);
+      assertNTasks (outputJSON, 0, script);
 
       if (status == 0)
       {
@@ -209,7 +210,7 @@ void Hooks::onExit () const
       }
       else
       {
-        assertFeedback (outputFeedback);
+        assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
           context.error (message);
 
@@ -259,9 +260,9 @@ void Hooks::onAdd (Task& task) const
 
       if (status == 0)
       {
-        assertNTasks    (outputJSON, 1);
-        assertValidJSON (outputJSON);
-        assertSameTask  (outputJSON, task);
+        assertNTasks    (outputJSON, 1, script);
+        assertValidJSON (outputJSON, script);
+        assertSameTask  (outputJSON, task, script);
 
         // Propagate forward to the next script.
         input[0] = outputJSON[0];
@@ -271,7 +272,7 @@ void Hooks::onAdd (Task& task) const
       }
       else
       {
-        assertFeedback (outputFeedback);
+        assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
           context.error (message);
 
@@ -326,9 +327,9 @@ void Hooks::onModify (const Task& before, Task& after) const
 
       if (status == 0)
       {
-        assertNTasks    (outputJSON, 1);
-        assertValidJSON (outputJSON);
-        assertSameTask  (outputJSON, before);
+        assertNTasks    (outputJSON, 1, script);
+        assertValidJSON (outputJSON, script);
+        assertSameTask  (outputJSON, before, script);
 
         // Propagate accepted changes forward to the next script.
         input[1] = outputJSON[0];
@@ -338,7 +339,7 @@ void Hooks::onModify (const Task& before, Task& after) const
       }
       else
       {
-        assertFeedback (outputFeedback);
+        assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
           context.error (message);
 
@@ -399,7 +400,9 @@ bool Hooks::isJSON (const std::string& input) const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Hooks::assertValidJSON (const std::vector <std::string>& input) const
+void Hooks::assertValidJSON (
+  const std::vector <std::string>& input,
+  const std::string& script) const
 {
   for (auto& i : input)
   {
@@ -407,7 +410,7 @@ void Hooks::assertValidJSON (const std::vector <std::string>& input) const
         i[0] != '{'     ||
         i[i.length () - 1] != '}')
     {
-      context.error (STRING_HOOK_ERROR_OBJECT);
+      context.error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
       throw 0;
     }
 
@@ -416,19 +419,19 @@ void Hooks::assertValidJSON (const std::vector <std::string>& input) const
       json::value* root = json::parse (i);
       if (root->type () != json::j_object)
       {
-        context.error (STRING_HOOK_ERROR_OBJECT);
+        context.error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
         throw 0;
       }
 
       if (((json::object*)root)->_data.find ("description") == ((json::object*)root)->_data.end ())
       {
-        context.error (STRING_HOOK_ERROR_NODESC);
+        context.error (format (STRING_HOOK_ERROR_NODESC, Path (script).name ()));
         throw 0;
       }
 
       if (((json::object*)root)->_data.find ("uuid") == ((json::object*)root)->_data.end ())
       {
-        context.error (STRING_HOOK_ERROR_NOUUID);
+        context.error (format (STRING_HOOK_ERROR_NOUUID, Path (script).name ()));
         throw 0;
       }
 
@@ -452,17 +455,23 @@ void Hooks::assertValidJSON (const std::vector <std::string>& input) const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Hooks::assertNTasks (const std::vector <std::string>& input, unsigned int n) const
+void Hooks::assertNTasks (
+  const std::vector <std::string>& input,
+  unsigned int n,
+  const std::string& script) const
 {
   if (input.size () != n)
   {
-    context.error (format (STRING_HOOK_ERROR_BAD_NUM, n, (int) input.size ()));
+    context.error (format (STRING_HOOK_ERROR_BAD_NUM, n, (int) input.size (), Path (script).name ()));
     throw 0;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Hooks::assertSameTask (const std::vector <std::string>& input, const Task& task) const
+void Hooks::assertSameTask (
+  const std::vector <std::string>& input,
+  const Task& task,
+  const std::string& script) const
 {
   std::string uuid = task.get ("uuid");
 
@@ -475,7 +484,7 @@ void Hooks::assertSameTask (const std::vector <std::string>& input, const Task&
     if (u == root_obj->_data.end ()          ||
         u->second->type () != json::j_string)
     {
-      context.error (format (STRING_HOOK_ERROR_SAME1, uuid));
+      context.error (format (STRING_HOOK_ERROR_SAME1, uuid, Path (script).name ()));
       throw 0;
     }
 
@@ -485,7 +494,7 @@ void Hooks::assertSameTask (const std::vector <std::string>& input, const Task&
     std::string json_uuid = json::decode (text);
     if (json_uuid != uuid)
     {
-      context.error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid));
+      context.error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid, Path (script).name ()));
       throw 0;
     }
 
@@ -494,7 +503,9 @@ void Hooks::assertSameTask (const std::vector <std::string>& input, const Task&
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Hooks::assertFeedback (const std::vector <std::string>& input) const
+void Hooks::assertFeedback (
+  const std::vector <std::string>& input,
+  const std::string& script) const
 {
   bool foundSomething = false;
   for (auto& i : input)
@@ -503,7 +514,7 @@ void Hooks::assertFeedback (const std::vector <std::string>& input) const
 
   if (! foundSomething)
   {
-    context.error (STRING_HOOK_ERROR_NOFEEDBACK);
+    context.error (format (STRING_HOOK_ERROR_NOFEEDBACK, Path (script).name ()));
     throw 0;
   }
 }
diff --git a/src/Hooks.h b/src/Hooks.h
index d4e29e9f9..f25915a69 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -47,10 +47,10 @@ private:
   std::vector <std::string> scripts (const std::string&) const;
   void separateOutput (const std::vector <std::string>&, std::vector <std::string>&, std::vector <std::string>&) const;
   bool isJSON (const std::string&) const;
-  void assertValidJSON (const std::vector <std::string>&) const;
-  void assertNTasks (const std::vector <std::string>&, unsigned int) const;
-  void assertSameTask (const std::vector <std::string>&, const Task&) const;
-  void assertFeedback (const std::vector <std::string>&) const;
+  void assertValidJSON (const std::vector <std::string>&, const std::string&) const;
+  void assertNTasks (const std::vector <std::string>&, unsigned int, const std::string&) const;
+  void assertSameTask (const std::vector <std::string>&, const Task&, const std::string&) const;
+  void assertFeedback (const std::vector <std::string>&, const std::string&) const;
   std::vector <std::string>& buildHookScriptArgs (std::vector <std::string>&) const;
   int callHookScript (const std::string&, const std::vector <std::string>&, std::vector <std::string>&) const;
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 033bf85e8..69bb1271b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Leerer Datensatz in der Eingabe."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 15e30e0f0..cfcdd6eb7 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -796,16 +796,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7d4b1b4c4..1d0d8c322 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Malplena rikordo en la inigo."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c973c33c7..ea19eb8e4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -807,16 +807,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} tarea restante)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: se esperaba 0bjeto JSON '{...}'."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: falta atributo 'description' en objeto JSON."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: falta atributo 'uuid' en objeto JSON."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: se esperaba 0bjeto JSON '{...}' hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: falta atributo 'description' en objeto JSON hook script: {1}."
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: falta atributo 'uuid' en objeto JSON hook script: {1}."
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: error de sintaxis JSON en: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "  // |esp-ESP|==|eng-USA|
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: fallo al interpretar JSON: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: se esperaba {1} tarea(s) JSON, se encontraron {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON debe ser para la misma tarea: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON debe ser para la misma tarea: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: se esperaba retro-alimentación desde un hook script que falló."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: se esperaba {1} tarea(s) JSON, se encontraron {2}, hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON debe ser para la misma tarea: {1}, hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON debe ser para la misma tarea: {1} != {2}, hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: se esperaba retro-alimentación desde un hook script que falló: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Registro vacío en la entrada."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8b5e358ac..24310a516 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index cfe41b3c1..87a67bdfc 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -797,16 +797,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Voce vuota in ingresso."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 8d97727e8..609d8fa2e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b43e5d053..6c8399b2e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Pusty wpis na wejściu."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 7f7709fa5..2accecc39 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -798,16 +798,16 @@
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
 // Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected."
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute."
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
 #define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
 #define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
 #define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from a failing hook script."
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 // Record
 #define STRING_RECORD_EMPTY          "Registo vazio na entrada fornecida."
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index 985a1c444..ad5a2abd1 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -147,7 +147,7 @@ class TestHooksOnAdd(TestCase):
         self.t.hooks.add_default(hookname, log=True)
 
         code, out, err = self.t.runError("add foo")
-        self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err)
+        self.assertIn("Hook Error: JSON Object missing 'uuid' attribute from hook script: on-add-misbehave6", err)
 
         hook = self.t.hooks[hookname]
         hook.assertTriggeredCount(1)
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index f8f7ce5f6..bf9a40a01 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -146,7 +146,7 @@ class TestHooksOnModify(TestCase):
 
         code, out, err = self.t("add foo")
         code, out, err = self.t.runError("1 modify +tag")
-        self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err)
+        self.assertIn("Hook Error: JSON Object missing 'uuid' attribute from hook script: on-modify-misbehave6", err)
 
         hook = self.t.hooks[hookname]
         hook.assertTriggeredCount(1)

From ee49ce3165e2f0f559d1f73c9c4059c67ec18657 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 15:20:50 -0500
Subject: [PATCH 295/879] Tests: Added TW-1837 test

---
 test/tw-1837.t | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 test/tw-1837.t

diff --git a/test/tw-1837.t b/test/tw-1837.t
new file mode 100644
index 000000000..c23b7549e
--- /dev/null
+++ b/test/tw-1837.t
@@ -0,0 +1,69 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2017, 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
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+# Test methods available:
+#     self.assertEqual(a, b)
+#     self.assertNotEqual(a, b)
+#     self.assertTrue(x)
+#     self.assertFalse(x)
+#     self.assertIs(a, b)
+#     self.assertIsNot(a, b)
+#     self.assertIsNone(x)
+#     self.assertIsNotNone(x)
+#     self.assertIn(a, b)
+#     self.assertNotIn(a, b)
+#     self.assertIsInstance(a, b)
+#     self.assertNotIsInstance(a, b)
+#     self.assertRaises(e)
+#     self.assertRegexpMatches(t, r)
+#     self.assertNotRegexpMatches(t, r)
+#     self.tap("")
+
+class TestBug1837(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_chinese_character_search(self):
+        """Add a task with Chinese characters and search for them."""
+        self.t("add 中文测试zzz")
+        code, out, err = self.t("/中/ info")
+        self.tap(out)
+        self.tap(err)
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4 ft=python

From e71be41e72143ba3e3da42ae188e6a4777ced9a7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 15:29:11 -0500
Subject: [PATCH 296/879] Tests: Added debug info, which makes it look like
 TW-1837 it working

---
 test/tw-1837.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tw-1837.t b/test/tw-1837.t
index c23b7549e..44fb5e548 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -58,7 +58,7 @@ class TestBug1837(TestCase):
     def test_chinese_character_search(self):
         """Add a task with Chinese characters and search for them."""
         self.t("add 中文测试zzz")
-        code, out, err = self.t("/中/ info")
+        code, out, err = self.t("rc.debug=1 /中/ info")
         self.tap(out)
         self.tap(err)
 

From ce97fd590197f257350dc507f31763698092035a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 16:00:16 -0500
Subject: [PATCH 297/879] TW-1827: Extract annotations from a task

- Thanks to Ryan.
---
 ChangeLog     |  2 ++
 NEWS          |  1 +
 src/DOM.cpp   |  7 +++++++
 src/Lexer.cpp |  8 ++++++++
 src/Task.cpp  | 11 +++++++++++
 src/Task.h    |  1 +
 test/dom.t    | 10 ++++++++++
 7 files changed, 40 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6e90d1cd7..74f0c1ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
           (thanks to george js).
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
           (thanks to E. Manuel Cerr'on Angeles)
+- TW-1827 Extract annotations from a task
+          (thanks to Ryan).
 - TW-1855 "Well-known" CA certificates not properly auto-loaded
           (thanks to Flavio Poletti).
 - TW-1857 Change Task::get call to the more efficient Task::has
diff --git a/NEWS b/NEWS
index 569c6d1b3..ebd69fb29 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ New Features in Taskwarrior 2.5.2
   - The 'help' command now takes a 'usage' argument, which displays only the
     command usage.
   - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
+  - New DOM reference: annotations.count.
 
 New Commands in Taskwarrior 2.5.2
 
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 539e2fe37..4f9be1621 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -167,6 +167,7 @@ bool getDOM (const std::string& name, Variant& value)
 //   <date>.second
 //
 // Annotations (entry is a date):
+//   annotations.count
 //   annotations.<N>.entry
 //   annotations.<N>.description
 //
@@ -298,6 +299,12 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
     }
   }
 
+  if (ref.data.size () && size == 2 && elements[0] == "annotations" && elements[1] == "count")
+  {
+    value = Variant (static_cast<int> (ref.getAnnotationCount ()));
+    return true;
+  }
+
   if (ref.data.size () && size == 3 && elements[0] == "annotations")
   {
     auto annos = ref.getAnnotations ();
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index ba9174cbb..486229499 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1159,6 +1159,7 @@ bool Lexer::isOperator (std::string& token, Lexer::Type& type)
 //   <date>.second
 //
 // Annotations (entry is a date):
+//   annotations.count
 //   annotations.<N>.entry
 //   annotations.<N>.description
 //
@@ -1259,6 +1260,13 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
   if (isLiteral ("annotations", true,  false) &&
       isLiteral (".",           false, false))
   {
+    if (isLiteral ("count", false, false))
+    {
+      token = _text.substr (marker, _cursor - marker);
+      type = Lexer::Type::dom;
+      return true;
+    }
+
     std::string extractedToken;
     Lexer::Type extractedType;
     if (isInteger (extractedToken, extractedType))
diff --git a/src/Task.cpp b/src/Task.cpp
index b07cc918f..51e444cf7 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1032,6 +1032,17 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
   return out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int Task::getAnnotationCount () const
+{
+  int count = 0;
+  for (auto& ann : data)
+    if (! ann.first.compare (0, 11, "annotation_", 11))
+      ++count;
+
+  return count;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool Task::hasAnnotations () const
 {
diff --git a/src/Task.h b/src/Task.h
index 2cf4da61a..6aa8121c7 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -128,6 +128,7 @@ public:
   std::vector <std::string> getTags () const;
   void removeTag (const std::string&);
 
+  int getAnnotationCount () const;
   bool hasAnnotations () const;
   std::map <std::string, std::string> getAnnotations () const;
   void setAnnotations (const std::map <std::string, std::string>&);
diff --git a/test/dom.t b/test/dom.t
index c75eed548..ed084f4bd 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -146,6 +146,16 @@ class TestDOM(TestCase):
         code, out, err = self.t("_get 3.due.second")
         self.assertEqual("0\n", out)
 
+    def test_dom_annotation_count_1(self):
+        """ DOM 1.annotation.count """
+        code, out, err = self.t("_get 1.annotations.count")
+        self.assertEqual("0\n", out)
+
+    def test_dom_annotation_count_3(self):
+        """ DOM 3.annotation.count """
+        code, out, err = self.t("_get 3.annotations.count")
+        self.assertEqual("1\n", out)
+
     def test_dom_annotation_entry(self):
         """ DOM 3.annotations.1.entry """
         code, out, err = self.t("_get 3.annotations.1.entry")

From 8dcf0d0c72830698021f18da4038bbe4dd045bef Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 16:06:49 -0500
Subject: [PATCH 298/879] TW-1823: Incorrect unicode text wrapping /
 justifying.

- Thanks to Sergey Trofimov.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 352b737f6..ea75e7b04 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -307,3 +307,4 @@ suggestions:
   OKOMper
   eldios
   Eli
+  Sergey Trofimov
diff --git a/ChangeLog b/ChangeLog
index 74f0c1ad5..dcb37a9d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
           (thanks to george js).
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
           (thanks to E. Manuel Cerr'on Angeles)
+- TW-1823 Incorrect unicode text wrapping / justifying.
+          (thanks to Sergey Trofimov).
 - TW-1827 Extract annotations from a task
           (thanks to Ryan).
 - TW-1855 "Well-known" CA certificates not properly auto-loaded

From a60c373caf0293c45d1f059bccdb2a8c20bf020e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 20:05:08 -0500
Subject: [PATCH 299/879] TW-1861: Truncated description when adding annotation

- Thanks to eezewaek.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index ea75e7b04..e4c8c2f7f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -308,3 +308,4 @@ suggestions:
   eldios
   Eli
   Sergey Trofimov
+  eezewaek
diff --git a/ChangeLog b/ChangeLog
index dcb37a9d5..5aee9fc93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@
 - TW‐1858 Change signature for dependencyGetBlocked
 - TW-1859 Change signature of Task::getTags
 - TW-1860 Change signature of Task::getAnnotations
+- TW-1861 Truncated description when adding annotation
+          (thanks to eezewaek).
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited

From 5ff5a5c1aed563c00d478bb17c0d1d13c6bb329c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 20:25:58 -0500
Subject: [PATCH 300/879] TW-1881: default.scheduled seems not to work

- Thanks to Onion.
---
 ChangeLog                     |  2 ++
 doc/man/taskrc.5.in           |  8 ++++++++
 scripts/vim/syntax/taskrc.vim |  1 +
 src/Config.cpp                |  1 +
 src/Context.cpp               |  1 +
 src/Task.cpp                  | 28 ++++++++++++++++++++++------
 src/Task.h                    |  1 +
 src/commands/CmdShow.cpp      |  1 +
 test/default.t                |  5 +++++
 9 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5aee9fc93..62a74b1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@
           (thanks to Eli).
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
           (thanks to Scott Kostyshak).
+- TW-1881 default.scheduled seems not to work
+          (thanks to Onion).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index cb22bf429..eae6c4ce0 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1183,6 +1183,14 @@ Provides a default due date for the
 command, if you don't specify one. You can use a date, or a duration value which
 is assumed to be relative to 'now'. The default is blank.
 
+.TP
+.B
+default.scheduled=...
+Provides a default scheduled date for the
+.I task add
+command, if you don't specify one. You can use a date, or a duration value which
+is assumed to be relative to 'now'. The default is blank.
+
 .TP
 .B
 uda.<name>.default=...
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index 42841d2a8..9e2eb8f4c 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -102,6 +102,7 @@ syn match taskrcGoodKey '^\s*\Vdefault.command='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.due='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.priority='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.project='he=e-1
+syn match taskrcGoodKey '^\s*\Vdefault.scheduled='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefaultheight='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefaultwidth='he=e-1
 syn match taskrcGoodKey '^\s*\Vdependency.confirmation='he=e-1
diff --git a/src/Config.cpp b/src/Config.cpp
index d230e1624..84682b8b6 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -249,6 +249,7 @@ std::string Config::_defaults =
   "\n"
   "#default.project=foo                           # Default project for 'add' command\n"
   "#default.due=eom                               # Default due date for 'add' command\n"
+  "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"
   "default.command=next                           # When no arguments are specified\n"
   "\n"
   "_forcecolor=0                                  # Forces color to be on, even for non TTY output\n"
diff --git a/src/Context.cpp b/src/Context.cpp
index 1b0bfd131..5808d6ea6 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -686,6 +686,7 @@ void Context::staticInitialization ()
 
   Task::defaultProject      = config.get ("default.project");
   Task::defaultDue          = config.get ("default.due");
+  Task::defaultScheduled    = config.get ("default.scheduled");
 
   Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
   Task::regex               = Variant::searchUsingRegex    = config.getBoolean ("regex");
diff --git a/src/Task.cpp b/src/Task.cpp
index 51e444cf7..087ce66d4 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -67,10 +67,11 @@ extern Task& contextTask;
 static const float epsilon = 0.000001;
 #endif
 
-std::string Task::defaultProject  = "";
-std::string Task::defaultDue      = "";
-bool Task::searchCaseSensitive    = true;
-bool Task::regex                  = false;
+std::string Task::defaultProject   = "";
+std::string Task::defaultDue       = "";
+std::string Task::defaultScheduled = "";
+bool Task::searchCaseSensitive     = true;
+bool Task::regex                   = false;
 std::map <std::string, std::string> Task::attributes;
 
 std::map <std::string, float> Task::coefficients;
@@ -1565,6 +1566,20 @@ void Task::validate (bool applyDefault /* = true */)
       }
     }
 
+    // Override with default.scheduled, if not specified.
+    if (Task::defaultScheduled != "" &&
+        ! has ("scheduled"))
+    {
+      if (context.columns["scheduled"]->validate (Task::defaultScheduled))
+      {
+        Duration dur (Task::defaultScheduled);
+        if (dur.toTime_t () != 0)
+          set ("scheduled", (Datetime () + dur.toTime_t ()).toEpoch ());
+        else
+          set ("scheduled", Datetime (Task::defaultScheduled).toEpoch ());
+      }
+    }
+
     // If a UDA has a default value in the configuration,
     // override with uda.(uda).default, if not specified.
     // Gather a list of all UDAs with a .default value
@@ -2044,8 +2059,9 @@ void Task::modify (modType type, bool text_required /* = false */)
           // ::composeF4 will skip if the value is blank, but the presence of
           // the attribute will prevent ::validate from applying defaults.
           if ((has (name) && get (name) != "") ||
-              (name == "due"     && context.config.has ("default.due")) ||
-              (name == "project" && context.config.has ("default.project")))
+              (name == "due"       && context.config.has ("default.due")) ||
+              (name == "scheduled" && context.config.has ("default.scheduled")) ||
+              (name == "project"   && context.config.has ("default.project")))
           {
             mods = true;
             set (name, "");
diff --git a/src/Task.h b/src/Task.h
index 6aa8121c7..a159a3bab 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -39,6 +39,7 @@ class Task
 public:
   static std::string defaultProject;
   static std::string defaultDue;
+  static std::string defaultScheduled;
   static bool searchCaseSensitive;
   static bool regex;
   static std::map <std::string, std::string> attributes;  // name -> type
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index b756f862a..b617fc95a 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -144,6 +144,7 @@ int CmdShow::execute (std::string& output)
     " default.command"
     " default.due"
     " default.project"
+    " default.scheduled"
     " defaultheight"
     " defaultwidth"
     " dependency.confirmation"
diff --git a/test/default.t b/test/default.t
index 29f84d99b..af583cd8e 100755
--- a/test/default.t
+++ b/test/default.t
@@ -64,6 +64,7 @@ class TestDefaults(TestCase):
         cls.t.config("default.project",      "PROJECT")
         cls.t.config("uda.priority.default", "M")
         cls.t.config("default.due",          "eom")
+        cls.t.config("default.scheduled",    "eom")
 
     def test_all_defaults(self):
         """Verify all defaults are employed"""
@@ -73,6 +74,7 @@ class TestDefaults(TestCase):
         self.assertIn('"project":"PROJECT"', out)
         self.assertIn('"priority":"M"', out)
         self.assertIn('"due":"', out)
+        self.assertIn('"scheduled":"', out)
 
     def test_all_specified(self):
         self.t("add project:specific priority:L due:eoy all specified")
@@ -81,6 +83,7 @@ class TestDefaults(TestCase):
         self.assertIn('"project":"specific"', out)
         self.assertIn('"priority":"L"', out)
         self.assertIn('"due":"', out)
+        self.assertIn('"scheduled":"', out)
 
     def test_project_specified(self):
         self.t("add project:specific project specified")
@@ -89,6 +92,7 @@ class TestDefaults(TestCase):
         self.assertIn('"project":"specific"', out)
         self.assertIn('"priority":"M"', out)
         self.assertIn('"due":"', out)
+        self.assertIn('"scheduled":"', out)
 
     def test_priority_specified(self):
         self.t("add priority:L priority specified")
@@ -97,6 +101,7 @@ class TestDefaults(TestCase):
         self.assertIn('"project":"PROJECT"', out)
         self.assertIn('"priority":"L"', out)
         self.assertIn('"due":"', out)
+        self.assertIn('"scheduled":"', out)
 
     def test_default_command(self):
         self.t("add foo")

From 241fbe0581f93f0758bd897a7b18fad8651354df Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 20:29:51 -0500
Subject: [PATCH 301/879] TW-1881: Missing last character(s) in Description
 field

- Thanks to Hubert Toullec.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index e4c8c2f7f..f63e42e88 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -309,3 +309,4 @@ suggestions:
   Eli
   Sergey Trofimov
   eezewaek
+  Hubert Toullec
diff --git a/ChangeLog b/ChangeLog
index 62a74b1cb..528bfbe93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@
           (thanks to Eli).
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
           (thanks to Scott Kostyshak).
+- TW-1881 Missing last character(s) in Description field
+          (thanks to Hubert Toullec).
 - TW-1881 default.scheduled seems not to work
           (thanks to Onion).
 - Added 'juhannus' as a synonym for 'midsommarafton'

From 54c1ca0786daa4eca0449e4fa0ca7681dd184ddb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 20:32:40 -0500
Subject: [PATCH 302/879] Docs: Updated NEWS

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index ebd69fb29..f77276b28 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ New Configuration Options in Taskwarrior 2.5.2
 
   - New 'relative' column format for 'date' type columns does what 'remaining'
     and 'countdown' do, but in one format.
+  - The 'default.scheduled' date/duraiton works just like 'default.due'.
 
 Newly Deprecated Features in Taskwarrior 2.5.2
 

From 3e7958619a51c80acb880e7063d13b56396fdb4b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jan 2017 20:48:45 -0500
Subject: [PATCH 303/879] TW-1877: task done, task edit, task is now pending

- Thanks to Eric Hymowitz.
---
 AUTHORS                  | 1 +
 ChangeLog                | 2 ++
 src/commands/CmdEdit.cpp | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index f63e42e88..cc6fb0a1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -310,3 +310,4 @@ suggestions:
   Sergey Trofimov
   eezewaek
   Hubert Toullec
+  Eric Hymowitz
diff --git a/ChangeLog b/ChangeLog
index 528bfbe93..7de0c7a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,8 @@
           (thanks to eezewaek).
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
+- TW-1877 task done, task edit, task is now pending
+          (thanks to Eric Hymowitz).
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
           (thanks to Scott Kostyshak).
 - TW-1881 Missing last character(s) in Description field
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 633f02962..d3b618b43 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -458,7 +458,6 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     if (task.get ("scheduled") != "")
     {
       context.footnote (STRING_EDIT_SCHED_DEL);
-      task.setStatus (Task::pending);
       task.remove ("scheduled");
     }
   }

From c690a3d58d1dbb8326caee3764a26ffa718b4914 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 19:13:59 -0500
Subject: [PATCH 304/879] TW-1869 segmentation fault (on unusual installation)

- Thanks to Eric Hymowitz.
---
 ChangeLog    | 2 ++
 src/CLI2.cpp | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7de0c7a82..db7673fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
 - TW-1860 Change signature of Task::getAnnotations
 - TW-1861 Truncated description when adding annotation
           (thanks to eezewaek).
+- TW-1869 segmentation fault (on unusual installation)
+          (thanks to Eric Hymowitz).
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
 - TW-1877 task done, task edit, task is now pending
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 271a39e23..ddf51e2e2 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -376,9 +376,7 @@ void CLI2::handleArg0 ()
     A2 cal ("calendar", Lexer::Type::word);
     _args.push_back (cal);
   }
-  else if (basename == "task" ||
-           basename == "tw" ||
-           basename == "t")
+  else
   {
     _args.push_back (a);
   }

From ff67f8c791a35f7eb089d73716a7db7500ee322e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 19:55:01 -0500
Subject: [PATCH 305/879] PKI: Updated CA

---
 test/test_certs/ca.cert.pem |  52 ++---
 test/test_certs/ca.key.pem  | 420 ++++++++++++++++++------------------
 2 files changed, 237 insertions(+), 235 deletions(-)

diff --git a/test/test_certs/ca.cert.pem b/test/test_certs/ca.cert.pem
index c030ff383..9832d1231 100644
--- a/test/test_certs/ca.cert.pem
+++ b/test/test_certs/ca.cert.pem
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFoDCCA4igAwIBAgIMWId0/Tdzb0Anm7xOMA0GCSqGSIb3DQEBCwUAMHQxFTAT
 BgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBGYWN0
 b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEgR8O2dGFs
-YW5kMQswCQYDVQQGEwJTRTAeFw0xNjAxMjMyMDE3NTRaFw0xNzAxMjIyMDE3NTRa
+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
-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
-QS129w==
+AgoCggIBAKc95KldnRqe+UVbHdcQLOfCpCevV8vJjwlgiEZX6iPaekPyVjGnxAQ3
+Zq2j1mepTbRh37FBb1xl8vPu2UHRe7d79LF7M6SlP/Wz/wpi74hiDaOgnSVS/7c+
+wg/nJqtuCUPAJUW+z5m3PtlyGj/4Xt6yjBQ4wN1uLY45JfIE6OdW9KRTAy5s+Kpf
+qGSyb9HLAjsNgB65BCL8/ZQYc9v5P/2woyqR0Ee09R1JL0gvJEqBvdvl7DcdRhqt
+XFl1f7wnEW+Qwg0d+YkFnGX8gL3f9CYWaKm58Ys0A6kq/EzlbPCTn8PqgEP8pVZ1
+/+WGVirULfqjzLOwhUEHzkCggKSpLIkrm5OzDtx1lQ9KSF9M9q+hxiNzg9djMhvI
+fjOOkL8M7e2+gmnfuJ8oJSkf6md9lNEar/r+K1B9p6vOF3i6elCu79L4xSnMtM2O
+88G9TTjwRX9CtT2qqCLbMPm8eKc/yVmMNhLDWyUyfXZ9BLrXhFAwclwCRwMHfnkC
+ORW1EZvFGtmimxJSTDlCWYb1/ciB2MSIJktNpNPUdV/IhdEVDZjBGtBxEfWaW3CE
+PU1QbakBMNdfLfGHGQhFOklrZuQFngwEEHaSgojxXkz/Yloh+rLHZnSltfchBaVm
+DwzdqdD4dztMNI03VB5isZtl10cPMjfiEQ9u9ch98wZj3yLidtJfAgMBAAGjMjAw
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIs7BvGArBW1hgbUU7xdTWfwJAvg
+MA0GCSqGSIb3DQEBCwUAA4ICAQB9D0662JXbMwqQL5pvPEUZiBN2DSmuijNEIFEY
+Q83zy0PcNg9Gce3tBdy4GI5gk5HpfDWwd78ahnqotxZUVt2RbdsaXvZ5VYRpIiyZ
+dY9fBG1g23iE6cmlW8FTRkcke/cjOOtHfohys9tFdRrS+pIMzP+BB9tOoxfpQ+8w
+LgHEzZ4I0EGKsqoSPOPHDug9ZGN3IPZTRKdCxahV4cc0nxVbYFebJqpocv7xkXLb
+HQA5HkhImKDPzY6cX+n+zL9f8F0KozXqt/f9AP3v2F/QNWRSjiiPCFw5qhKiyeRv
+bbrW01XJsUDmPxL08U0fenPYC9RuzDGWeJJxFpG6OSfn/dOry3As7bvrh6C9Q5ox
+QLrEFRIbrq37DICBTTs4LW0wG1A0kKLxTVsTK7e99FCZwfKO2K6ra3UPNwlQYxlv
+C7NMEtbCGx43gWoQngpzYNvoXyb8j5GhzEeniELdCzISXMBx3tPhGc9ZWvYtMe5c
+ZdN67pcx6hNPs3PpVuHS5otDUe2rw7DlqeMJokkoPgFD7CDioRZbq/kMvbkHTXAs
+0rqUkH9SP14q6SbuA7t/j43JGrzKiayKYdXmn/EGd31GUdI6hOWCLzsLKg/8lDA1
+TposJN5apxRy3FVuuFcFbG7TjEFu5LGQUJrKQYbrnED74btoALBenrNHEznQhXfO
+HbNnhg==
 -----END CERTIFICATE-----
diff --git a/test/test_certs/ca.key.pem b/test/test_certs/ca.key.pem
index 97d46a36c..fcb891c37 100644
--- a/test/test_certs/ca.key.pem
+++ b/test/test_certs/ca.key.pem
@@ -3,236 +3,238 @@ Public Key Info:
 	Key Security Level: High (4096 bits)
 
 modulus:
-	00:a6:2f:6b:3c:8b:a2:3a:62:d9:2c:c6:df:40:55:a0
-	4a:3a:71:98:bb:40:7e:9c:34:13:bc:80:02:e8:3e:44
-	c9:6c:b5:04:91:c4:57:a2:7a:18:9a:ad:d3:cd:5f:f1
-	26:11:50:50:06:4f:26:6a:f6:c9:56:e3:ab:b2:ef:33
-	d4:96:f2:db:cb:2e:03:0d:09:2c:9b:22:5c:b5:50:3c
-	c8:52:ca:1c:f8:dc:b9:c4:c5:8b:0a:8d:36:ef:0c:c3
-	45:92:29:74:79:51:44:f1:24:a4:85:b1:57:92:3a:6b
-	6b:ab:f4:9d:9b:2a:7b:45:38:94:51:d4:1e:88:53:b9
-	d4:be:b0:5a:ad:88:18:10:10:3a:f2:b9:95:42:74:60
-	4e:5d:af:e6:fb:3b:11:6d:ba:79:dd:90:ad:d4:24:e8
-	02:3a:b0:cb:b9:19:3e:45:34:34:3a:53:1d:91:30:87
-	97:da:f1:f4:17:d3:9c:e8:b4:cc:0e:a7:7c:ca:c3:de
-	c0:7c:59:23:95:9a:69:d3:76:83:73:46:7a:d6:5b:31
-	73:af:ca:89:c9:17:4f:d1:81:f7:f9:8b:e8:7f:9d:ba
-	f6:01:65:f1:1c:71:7b:fa:fb:5f:2a:1b:7e:ea:78:25
-	24:62:f8:c8:4b:f0:47:5a:13:18:3e:42:d3:82:91:90
-	9b:86:29:d5:09:2a:1d:10:8a:88:11:05:8d:89:0a:78
-	ab:b9:87:1b:14:af:34:a5:79:8c:de:5a:9f:57:da:8b
-	ae:da:9e:5f:93:e3:1e:ec:29:6a:dc:99:6e:d9:2b:9e
-	7b:d4:0d:c6:ec:74:1b:f7:0b:16:ca:31:b5:a4:44:8f
-	11:b6:cc:bd:47:1b:5d:78:cd:10:84:4c:4a:83:72:b2
-	17:43:47:5f:9a:19:2f:5c:95:77:22:f2:b8:9e:e5:fa
-	f6:a1:88:f5:5e:69:05:d1:66:17:0b:f9:b2:72:6c:75
-	e2:2d:18:9e:0c:b1:6c:c7:96:23:58:49:98:fc:0e:84
-	f5:da:dc:9f:02:1d:24:71:f8:dc:b2:ec:11:cc:37:85
-	d4:f6:c3:6a:4a:59:32:6d:ce:96:c9:f9:2f:ee:d9:3f
-	14:bc:15:2e:eb:72:ad:89:ef:08:0d:00:11:56:c6:c4
-	32:74:2b:69:44:9c:9c:e3:35:dd:e0:4b:eb:b2:bd:12
-	b1:fb:81:3b:25:67:76:00:a0:c5:47:30:87:1f:bb:8f
-	fb:3d:16:7e:a7:4c:6b:32:9b:09:65:4e:d4:14:e7:48
-	d7:5e:60:ac:fb:df:fb:5d:25:c4:17:41:a9:d1:3a:c8
-	d0:ee:25:59:3f:b7:86:20:ba:79:0a:33:43:fd:1c:11
-	27:
+	00:a7:3d:e4:a9:5d:9d:1a:9e:f9:45:5b:1d:d7:10:2c
+	e7:c2:a4:27:af:57:cb:c9:8f:09:60:88:46:57:ea:23
+	da:7a:43:f2:56:31:a7:c4:04:37:66:ad:a3:d6:67:a9
+	4d:b4:61:df:b1:41:6f:5c:65:f2:f3:ee:d9:41:d1:7b
+	b7:7b:f4:b1:7b:33:a4:a5:3f:f5:b3:ff:0a:62:ef:88
+	62:0d:a3:a0:9d:25:52:ff:b7:3e:c2:0f:e7:26:ab:6e
+	09:43:c0:25:45:be:cf:99:b7:3e:d9:72:1a:3f:f8:5e
+	de:b2:8c:14:38:c0:dd:6e:2d:8e:39:25:f2:04:e8:e7
+	56:f4:a4:53:03:2e:6c:f8:aa:5f:a8:64:b2:6f:d1:cb
+	02:3b:0d:80:1e:b9:04:22:fc:fd:94:18:73:db:f9:3f
+	fd:b0:a3:2a:91:d0:47:b4:f5:1d:49:2f:48:2f:24:4a
+	81:bd:db:e5:ec:37:1d:46:1a:ad:5c:59:75:7f:bc:27
+	11:6f:90:c2:0d:1d:f9:89:05:9c:65:fc:80:bd:df:f4
+	26:16:68:a9:b9:f1:8b:34:03:a9:2a:fc:4c:e5:6c:f0
+	93:9f:c3:ea:80:43:fc:a5:56:75:ff:e5:86:56:2a:d4
+	2d:fa:a3:cc:b3:b0:85:41:07:ce:40:a0:80:a4:a9:2c
+	89:2b:9b:93:b3:0e:dc:75:95:0f:4a:48:5f:4c:f6:af
+	a1:c6:23:73:83:d7:63:32:1b:c8:7e:33:8e:90:bf:0c
+	ed:ed:be:82:69:df:b8:9f:28:25:29:1f:ea:67:7d:94
+	d1:1a:af:fa:fe:2b:50:7d:a7:ab:ce:17:78:ba:7a:50
+	ae:ef:d2:f8:c5:29:cc:b4:cd:8e:f3:c1:bd:4d:38:f0
+	45:7f:42:b5:3d:aa:a8:22:db:30:f9:bc:78:a7:3f:c9
+	59:8c:36:12:c3:5b:25:32:7d:76:7d:04:ba:d7:84:50
+	30:72:5c:02:47:03:07:7e:79:02:39:15:b5:11:9b:c5
+	1a:d9:a2:9b:12:52:4c:39:42:59:86:f5:fd:c8:81:d8
+	c4:88:26:4b:4d:a4:d3:d4:75:5f:c8:85:d1:15:0d:98
+	c1:1a:d0:71:11:f5:9a:5b:70:84:3d:4d:50:6d:a9:01
+	30:d7:5f:2d:f1:87:19:08:45:3a:49:6b:66:e4:05:9e
+	0c:04:10:76:92:82:88:f1:5e:4c:ff:62:5a:21:fa:b2
+	c7:66:74:a5:b5:f7:21:05:a5:66:0f:0c:dd:a9:d0:f8
+	77:3b:4c:34:8d:37:54:1e:62:b1:9b:65:d7:47:0f:32
+	37:e2:11:0f:6e:f5:c8:7d:f3:06:63:df:22:e2:76:d2
+	5f:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	00:9c:af:b2:dd:18:0e:72:1c:47:05:77:d0:80:98:fb
-	13:61:7d:3f:72:b5:c1:6a:47:93:a0:33:d6:09:e0:c3
-	fc:62:19:5e:60:8d:8d:ce:ec:6d:8c:51:7e:94:71:f4
-	2d:5f:3f:a8:e3:f9:f6:8f:fd:75:22:0e:71:11:b9:84
-	d5:d9:28:cb:e1:0a:d5:e7:91:91:d4:07:17:00:00:d1
-	fe:52:48:ab:fe:5c:26:6f:07:8e:2b:f9:af:24:be:94
-	d2:60:97:e3:70:8b:16:84:82:76:f8:72:97:cd:90:75
-	3d:c4:98:53:8d:3c:05:93:e3:5f:bc:b3:51:c2:59:a6
-	a9:96:cd:32:01:d1:82:56:8a:e6:f9:79:ce:e8:24:4f
-	b5:33:92:29:27:10:af:43:15:01:d7:cc:94:88:a3:ef
-	78:42:9b:f4:c8:e5:ab:17:96:bb:f3:8d:f0:1f:b7:70
-	f0:d5:87:31:0c:d2:01:6c:4b:22:e6:62:36:3f:fb:63
-	67:7b:16:94:7d:76:64:76:f3:93:c6:b9:5a:12:07:53
-	5d:ef:0d:f8:d1:77:c0:53:19:c6:93:2b:bd:9f:ad:38
-	dc:bf:be:bd:11:83:52:50:f6:76:e8:7d:9a:31:39:ec
-	53:1d:59:d1:87:ff:d9:56:6d:10:7b:8b:88:5e:e0:1e
-	45:6e:dc:53:a6:3c:a7:70:1c:d9:61:70:b7:9d:8a:57
-	94:1f:37:13:d2:7b:c7:6c:d5:ac:0a:72:d4:a9:57:0a
-	6c:2d:42:58:58:70:68:7d:43:88:29:2d:23:ee:58:14
-	bf:05:63:e3:f3:69:35:63:67:e1:63:e1:e6:59:0f:38
-	71:72:5b:9c:d1:54:fc:05:68:bb:10:5b:02:ba:b3:aa
-	80:16:13:1d:c0:6e:78:04:07:a5:5b:3e:0c:2e:89:6b
-	7a:85:f6:a2:6b:2e:a2:b4:55:ce:4f:81:05:4c:81:4f
-	4e:a9:54:27:82:0f:37:62:85:8d:10:3c:53:fb:f7:14
-	50:eb:81:10:d7:a4:92:58:62:c6:53:85:a2:31:7b:aa
-	60:bb:d3:4f:a8:dc:ae:56:ee:0a:d5:5a:a5:81:ed:96
-	ea:71:b8:85:7b:82:16:50:55:a0:3e:1c:cf:0e:b0:ce
-	ce:60:5c:af:86:0f:6a:f9:92:09:3c:d7:ad:ac:6e:25
-	c0:10:f1:9e:1f:14:aa:75:5f:0d:1e:68:9b:5a:e5:40
-	ef:ac:54:e7:dc:1d:a0:69:66:81:7d:5c:ef:b9:a0:19
-	35:e8:c7:cf:91:d5:f4:d9:b9:58:09:73:35:54:5f:da
-	0e:b7:55:8d:0d:ca:3a:8b:c3:ad:19:ab:87:87:2c:b1
-	11:
+	1c:34:af:14:f5:69:e2:ac:7f:23:f8:5b:0f:03:76:5f
+	5c:0f:6d:76:00:1b:a9:91:cb:26:11:b5:b3:6c:14:c1
+	eb:2e:fc:77:17:06:d1:63:58:a8:a3:8e:67:41:b2:67
+	1d:8e:08:39:0f:ed:25:2b:38:8f:75:70:04:ce:bc:cb
+	d4:47:0f:8b:d4:c8:e6:e9:e3:99:88:e1:0a:90:95:72
+	dc:14:05:a9:9b:3a:e5:4f:d5:70:cb:57:d3:c8:c3:d5
+	22:2d:0c:dc:37:73:31:dc:9a:e7:f7:7b:7f:e0:76:b7
+	9e:6b:4b:99:ca:c5:4d:a8:b7:3c:e2:2e:70:2f:8b:9c
+	b9:c3:e1:10:3f:4b:37:a1:1c:62:fd:20:af:05:35:f4
+	d9:5a:cc:89:e1:f0:55:aa:4f:66:23:bd:9e:92:e9:fc
+	f2:46:82:8e:77:0f:30:f0:ca:10:a6:bd:c8:dd:99:07
+	4a:ab:04:9b:13:2c:87:bf:46:0f:b6:32:bf:e9:4e:b9
+	7d:14:6f:f5:e0:61:4e:7f:b8:c1:e6:95:1b:f0:e2:6f
+	6e:06:16:e1:fa:5f:dc:d4:e5:3a:0f:b5:34:58:6c:36
+	a9:92:54:41:6f:b5:f3:78:a2:8c:16:fc:d2:19:85:11
+	80:1d:12:10:18:2c:51:2c:6c:d7:af:7a:22:cb:39:6c
+	5f:18:2b:75:9d:1c:45:70:31:22:da:a5:c8:72:bb:e8
+	85:00:56:3d:18:f0:0e:3a:a7:73:49:a4:b1:d2:42:9e
+	9e:4d:21:9d:69:d5:b7:e0:1e:b8:91:e4:94:1e:b5:f1
+	31:3e:1e:f3:20:2c:ab:e7:bf:3f:f1:88:15:4c:bf:a6
+	e8:03:78:35:8a:94:d3:2d:e9:c7:07:3a:f8:d8:c8:9d
+	7d:87:3a:c2:a7:f7:4d:62:d3:2c:09:e1:7b:a6:e5:99
+	ba:7c:24:08:16:3a:2a:29:21:e5:78:47:fb:13:f8:e4
+	de:05:2b:ac:73:f0:08:9d:d5:4d:fd:ca:6a:50:1e:b7
+	09:f0:31:47:5c:b7:09:9b:3a:af:0d:df:fb:89:88:4b
+	98:1e:2e:dc:f7:4a:2b:74:a6:4b:1d:ef:76:5f:fb:36
+	6f:ce:f4:34:8b:40:38:58:8d:3b:7e:42:97:74:0a:0c
+	d8:41:98:81:7b:18:bb:e3:b9:2e:f9:3a:ef:91:ca:41
+	46:e0:a0:99:70:e0:32:ce:09:5a:78:ed:2e:3a:4e:de
+	b3:a4:85:1a:05:8a:fe:bf:25:a1:cf:d7:de:6f:33:81
+	33:6e:c3:82:5d:de:f9:93:ba:06:46:ec:d1:d3:3a:80
+	39:94:d9:35:5f:58:df:55:2d:b6:4d:0b:66:e2:f8:39
+	
 
 prime1:
-	00:dd:14:2a:a8:be:b8:1e:9e:58:28:4f:6d:ea:fd:c8
-	1a:01:5d:45:01:d1:cc:b3:95:c6:ce:8e:0d:1e:93:ec
-	7f:96:c8:31:46:0c:60:11:56:50:bb:38:ff:8d:dd:49
-	d1:dd:17:91:01:57:01:08:5b:7f:e8:ae:92:b8:c0:4e
-	5e:d8:d7:c5:c9:9f:e8:b8:1e:ab:2d:a8:b9:22:25:dc
-	5c:dd:3f:d3:16:01:74:cd:a8:05:a7:cd:73:b6:8b:80
-	8a:42:12:59:92:aa:58:2a:63:2b:a5:ec:e9:ee:f4:d0
-	9d:ad:f8:d4:be:b0:53:0a:2d:65:a7:7f:5d:82:58:7f
-	b7:8e:30:e3:2f:08:7b:b4:a4:3a:ac:bf:fe:97:86:d3
-	7b:b4:a5:a6:c1:b0:e9:13:d3:d3:5b:32:38:81:ad:94
-	5b:3e:5c:b1:b4:ba:44:4c:6e:f9:01:fb:4c:c0:97:50
-	e6:66:13:be:bc:2f:30:9c:2f:b0:24:99:61:75:77:60
-	5a:d7:55:08:87:e3:62:bc:b8:a8:de:a3:ee:5c:b6:e0
-	d9:62:62:ab:16:75:4e:cf:62:55:90:ee:35:81:0a:44
-	9f:f7:91:d5:fc:e6:9e:73:d2:d2:91:42:d1:06:23:f0
-	77:2c:15:87:f9:1f:2d:0e:7a:1a:30:4c:d9:fd:1d:75
-	49:
+	00:db:a2:a3:71:db:9f:13:8a:1e:4a:a6:b9:8a:4e:bd
+	eb:89:c3:27:1d:29:42:c4:71:0e:cc:5e:59:fd:63:72
+	d6:5d:d4:1b:16:57:e6:9e:4e:e7:b6:dc:2b:30:a2:55
+	be:36:94:0c:e1:06:ea:e0:c3:9f:fa:89:d0:eb:05:f0
+	a2:ed:9c:45:42:46:4b:85:45:f2:ab:63:b9:4f:6e:1b
+	c4:fd:15:a4:09:26:f0:b1:77:e3:ee:2a:30:3b:4d:e2
+	0e:53:35:94:9e:26:aa:b6:65:d9:1d:de:94:79:5f:47
+	80:7f:34:cf:d9:2a:63:0f:1a:9f:4a:ea:10:95:7c:2f
+	13:4b:a4:37:5a:aa:cd:55:3c:6f:38:a2:10:06:2a:4e
+	26:2b:47:22:ae:c6:73:38:8a:cc:0c:05:92:86:ae:9a
+	37:aa:c5:65:92:72:dc:d0:45:3f:a3:b6:b2:c0:1f:b6
+	1a:66:16:a8:45:3a:8e:14:d3:a0:1e:85:a5:59:64:6e
+	a5:49:43:76:62:52:79:4b:85:88:af:ec:07:5e:32:39
+	6e:71:65:2f:90:cc:32:7d:1d:db:8c:40:b7:ab:e9:46
+	22:42:29:0f:32:af:7d:05:6a:67:ab:9b:80:57:5e:12
+	4f:26:54:a6:3b:9c:88:8c:58:5f:20:02:f3:4c:a6:32
+	5d:
 
 prime2:
-	00:c0:6f:81:1c:2b:af:44:68:94:20:80:29:25:2c:73
-	0f:72:a3:91:dd:7c:f6:28:b6:b0:a9:a2:20:2e:cf:d7
-	d1:8a:0c:cd:c5:e9:88:c9:2f:03:42:12:6e:0f:ca:b0
-	d3:12:2a:40:e8:95:f7:30:2c:53:de:6f:db:ab:3b:43
-	71:57:99:66:d1:20:45:77:8c:d0:9c:db:b9:d3:41:7c
-	82:7a:66:57:66:85:f0:5d:91:b9:57:80:6f:20:62:8e
-	97:78:7e:a1:c9:93:ec:4d:8c:ae:09:10:28:0e:a3:fd
-	26:22:51:4f:fa:f2:55:43:6f:76:6f:a0:94:f4:66:c8
-	d3:75:ea:18:c8:3d:ab:b4:c5:4a:5e:95:7b:7c:0e:df
-	2a:7c:b3:c4:6f:af:a4:c6:d1:94:2f:30:40:ca:dc:24
-	87:51:16:99:c2:46:5f:25:69:c0:1e:b8:f6:78:6e:4f
-	5e:45:67:c5:80:30:ff:47:83:51:96:52:e3:72:28:8a
-	a7:5a:eb:66:a4:f1:f8:5e:67:37:53:e3:a3:50:e9:d8
-	b1:f2:59:29:07:07:9b:4c:c8:8a:1e:51:e4:06:3b:46
-	45:b8:46:ec:55:7a:4a:4a:3b:68:77:32:18:be:02:50
-	95:0c:00:32:5f:b1:35:6b:bb:22:ea:c8:c8:53:29:02
-	ef:
+	00:c2:ee:86:bc:d2:32:81:f8:a1:7c:3e:4b:6e:03:66
+	34:dc:1f:2f:db:44:ec:de:2a:d0:58:fc:0c:08:6a:4c
+	8d:27:2f:d1:c9:10:18:ed:ee:00:72:75:78:6e:fe:08
+	70:5d:77:57:b9:0f:5f:0e:70:ad:50:1e:75:52:b0:80
+	aa:70:44:44:bb:38:ae:cb:a4:4e:e1:29:3b:3a:98:8f
+	4a:48:f3:8d:2a:89:d5:02:f3:e2:0b:3e:f5:d1:14:af
+	87:cf:69:d1:4f:ca:d5:af:2d:c7:53:61:09:c7:52:09
+	62:c7:66:9e:87:e3:6c:94:a9:44:a9:ae:48:f9:0a:c9
+	65:b0:85:87:9a:b3:f8:62:f6:8d:7e:24:84:5d:cf:8b
+	0e:44:8e:c4:4e:67:41:ab:f2:b0:76:27:c1:62:dd:3b
+	65:07:23:27:c4:2c:43:1f:8b:65:7c:db:6c:fa:05:dd
+	89:c7:21:a3:df:96:42:7a:e7:12:e3:f2:02:a6:f0:5a
+	9e:50:37:29:0a:fa:de:4c:82:41:9f:9d:cc:43:b6:c0
+	e4:5a:2d:40:ad:3f:61:f6:31:b2:76:ff:57:86:ec:b9
+	57:26:db:b1:f6:3b:ee:eb:82:f0:ca:15:d1:c9:ea:3b
+	81:b5:f1:a9:ca:b7:88:77:fb:dc:0f:b4:f5:32:95:83
+	eb:
 
 coefficient:
-	52:bd:b6:49:e1:d2:05:e9:1e:23:7d:5a:80:94:d2:18
-	dd:f2:72:53:32:38:33:3a:d3:9e:8f:59:02:b8:21:af
-	ef:b9:fc:ca:c7:80:d1:8d:d0:f2:60:e5:fb:ca:ef:b7
-	a7:ad:47:c1:c8:e9:99:72:94:a5:b0:99:5a:35:40:5b
-	6f:46:1e:01:bd:e3:e9:3d:a6:a2:dd:00:ea:5b:bc:6f
-	61:2c:78:cc:87:9c:a0:d1:d6:d0:3b:87:f8:47:64:11
-	b1:39:6f:14:e9:ed:75:a3:3f:ee:96:da:ed:3b:db:c3
-	4b:62:4d:de:2c:15:7c:c3:47:df:e4:a7:40:c3:31:30
-	c9:18:e9:d2:06:2d:70:2a:cc:65:c3:63:34:47:cd:29
-	bf:7b:c4:bc:ee:d8:f7:8e:2f:4b:6f:40:1a:e6:b8:26
-	71:c3:c9:90:b0:78:f2:4c:cc:d9:e6:b9:65:91:29:e1
-	21:07:07:61:b0:04:48:b3:d1:75:7e:11:5a:e3:f5:bb
-	b6:2f:71:55:7f:c5:2c:2b:10:d5:db:07:2e:ab:26:06
-	60:f8:89:46:0d:e5:7e:39:f9:9b:95:3c:df:2a:1e:2c
-	f5:5f:63:6d:6e:f4:c0:19:d0:53:58:dc:fa:de:30:5b
-	9a:90:4b:35:00:d3:1a:38:0e:69:74:42:19:1a:0c:fe
+	63:04:df:d0:5f:bd:e4:1f:94:21:97:c6:60:6e:1c:e8
+	fb:1a:d8:96:82:a4:4d:2d:2b:97:0c:dc:58:20:63:a7
+	9d:dc:bf:4c:0a:49:59:12:2f:0b:b2:2d:e6:f5:3a:1e
+	88:d9:31:db:49:38:22:0b:ac:36:68:35:d5:49:10:6e
+	2f:45:7e:55:32:4b:7f:cc:b2:23:2f:c3:34:6e:61:ba
+	9f:20:66:52:e1:89:80:d2:3f:9e:84:74:bb:46:dc:55
+	93:6a:11:78:8c:4c:d7:84:8c:7f:ee:8c:cd:7a:13:66
+	d4:6c:15:43:6f:8d:c3:ed:86:ba:41:7d:d0:6e:24:b1
+	a7:58:7a:b4:f5:47:7d:b4:8c:38:6f:18:39:4a:e4:04
+	04:f9:5f:e1:1a:b1:f8:10:e1:05:e2:7f:d6:64:94:1f
+	f0:7f:52:bf:01:79:49:06:5f:92:21:24:0e:d8:e3:53
+	65:09:12:ff:33:b5:99:83:49:30:2a:8b:44:03:18:6b
+	30:84:ff:61:91:63:2e:6a:72:16:e6:40:d8:10:f9:60
+	cc:09:1c:4a:15:3c:49:9a:86:b3:66:f6:83:55:8d:86
+	33:c3:13:e1:61:d2:5e:7d:d8:02:67:c5:5d:3e:82:d1
+	8c:f5:93:4a:83:35:1c:7b:d7:a0:e5:f6:76:20:dc:e3
 	
 
 exp1:
-	61:ff:bd:85:3d:bd:aa:3c:f0:c1:35:ac:78:dd:74:65
-	2a:b3:a8:92:4c:e8:db:b6:8a:01:27:f0:e2:dc:19:9a
-	d9:40:f6:ae:a1:6f:b8:5f:b5:bb:b8:61:78:06:5e:e1
-	bb:8a:e5:c9:5d:42:e4:ec:82:7f:a7:5a:fc:b0:aa:4c
-	da:fc:92:fd:74:78:19:9d:e6:ad:7f:bc:49:49:d5:2c
-	09:1b:70:bb:b1:7b:90:6a:69:cf:5f:80:6a:ab:de:17
-	eb:7f:ec:da:d9:cd:e9:44:3a:a5:fb:a6:1b:39:c4:7c
-	11:11:5b:65:08:0e:57:55:96:59:30:59:48:1d:68:c7
-	fa:2c:eb:97:fe:bf:af:6c:99:61:d8:5d:c7:d7:89:49
-	ad:e3:3c:4f:61:d7:7f:e5:87:2c:46:cf:cb:94:21:4e
-	6d:0f:73:ea:b4:22:f0:6a:c4:d0:bf:0f:df:d3:73:96
-	1e:2b:a4:82:10:bd:10:8f:07:1a:c2:2e:f4:7e:2d:65
-	37:4c:c7:52:4d:56:88:67:a6:db:c2:79:37:fa:0d:23
-	ef:bb:e3:31:3a:60:ec:07:1f:fc:f5:cb:1b:df:6c:5a
-	28:c9:29:bd:48:91:76:b0:3e:8d:0b:bc:52:67:7e:01
-	a5:b6:09:a7:41:cd:9c:3c:3d:fd:a9:23:7c:53:21:99
-	
+	00:8c:4e:67:6f:32:c7:7a:69:ff:53:dd:12:26:02:8b
+	5c:ce:52:b6:c7:f0:35:d0:dc:10:82:09:bc:1f:1c:ca
+	9d:9a:af:06:e6:cd:1c:6c:01:28:11:2e:b1:00:8e:93
+	8b:c1:bd:ee:44:4a:70:fd:48:bb:08:07:c6:48:7d:30
+	ee:44:30:52:26:36:55:c4:3b:9c:fc:53:e6:6b:91:81
+	77:e3:dd:51:3e:ef:7b:4f:43:b1:7d:d1:c1:a2:00:ec
+	ea:0d:c9:ea:b8:e5:26:a5:02:87:22:87:af:fd:a1:1a
+	42:42:00:f0:ce:60:3f:8b:c4:8c:02:05:68:b6:b5:f0
+	34:b9:5b:9c:68:f5:37:da:bd:92:a7:71:10:1f:80:23
+	10:4b:11:54:5c:a6:35:b0:e7:29:d6:7c:30:d0:8c:f5
+	c3:9d:fa:20:1a:df:f9:a3:aa:b9:2e:d2:65:7a:4a:47
+	c0:b1:7a:c3:e0:05:ba:02:1f:f6:e7:c8:a4:8a:68:98
+	2e:4a:91:28:2d:43:56:6d:22:4e:e1:63:3c:89:b6:37
+	ee:0f:ce:7e:06:58:0b:e0:d5:94:0d:12:c2:c2:b5:70
+	b2:2d:e5:a0:e9:d6:25:5d:b2:4d:ab:d8:d8:b1:f7:4c
+	66:f7:ab:97:cd:f8:ff:59:f8:92:3c:16:e6:6a:0e:b9
+	99:
 
 exp2:
-	00:a6:51:38:e3:62:16:2f:27:bb:ae:83:56:0c:5c:e8
-	6d:17:85:ab:92:24:68:94:33:a1:68:5b:49:39:6c:45
-	79:42:b9:62:37:85:69:c5:87:ae:67:32:8a:91:77:7b
-	70:51:a8:d7:44:ae:28:60:28:4f:ac:56:3d:23:37:2b
-	49:10:8e:f2:c0:18:06:32:17:30:4e:01:d2:0f:75:ef
-	e8:cd:65:1a:70:ef:9e:19:20:d3:71:7e:fd:8c:9d:e1
-	e3:a4:2e:be:21:fc:89:25:55:4b:2d:66:1b:58:db:fe
-	f5:30:7f:da:82:67:63:ad:ce:ee:2b:f8:3c:05:27:b8
-	b6:9a:98:e3:26:5d:b6:c3:9c:28:74:aa:f9:78:f5:59
-	87:dd:13:79:d9:95:92:f2:8b:3c:69:b4:68:ab:6b:ac
-	de:8f:04:db:8b:7f:4a:c8:89:27:94:e6:03:8f:7e:b7
-	76:20:c2:59:7e:3b:da:c6:b2:06:97:c7:b7:f0:78:7d
-	ad:ba:f4:ed:57:ee:11:dd:75:93:ea:1b:3a:91:ba:2a
-	a1:51:76:21:f1:83:6f:83:e3:67:0c:61:76:94:b4:32
-	3e:1b:d0:a0:7e:18:1d:91:1e:db:60:f9:99:4c:cf:af
-	59:c2:6f:81:1a:17:8c:b6:39:9d:2a:12:b2:a0:bd:37
-	5d:
+	6c:20:a5:8a:9d:ca:38:80:33:0b:58:fe:bc:52:94:62
+	23:ec:04:be:cb:57:dc:d0:c0:eb:6b:3c:3d:7a:c1:65
+	d6:e3:d6:a9:82:0d:62:05:90:27:ed:73:55:96:02:16
+	5a:32:35:ed:c8:52:01:0f:8d:83:90:b1:a1:a1:98:6d
+	72:82:db:e1:42:4a:eb:59:04:0c:2f:b3:d4:08:06:0b
+	bd:b5:a3:8b:82:13:2f:65:1a:f1:04:06:94:e8:b5:89
+	4f:0b:32:78:e1:59:70:a7:a3:16:64:10:69:88:de:fd
+	f4:ff:be:56:40:57:dd:8a:9b:34:c8:21:60:4b:94:75
+	9c:da:24:e3:32:8b:48:51:dd:20:a8:9e:e7:ee:95:02
+	e0:12:95:5f:ac:35:28:6d:21:67:19:1c:53:7b:c6:53
+	7f:07:08:2a:f0:26:77:9b:fa:3a:ac:f8:a1:23:99:c4
+	b0:39:bf:cd:e9:6a:8d:04:1a:5d:68:c4:01:d7:f7:5c
+	33:c0:b5:3a:8a:f7:be:56:ce:91:fc:94:ee:c6:b3:ee
+	b6:fa:bd:12:9c:c2:f9:2e:8e:01:26:18:66:16:6f:a4
+	a1:40:62:51:e4:e2:dd:ae:af:64:59:80:1a:51:9c:9a
+	91:d3:30:4c:eb:4b:7e:ca:ad:41:e5:2d:d1:d6:4f:eb
+	
 
 
-Public Key ID: 7E:CA:32:64:90:B4:29:23:65:C8:EC:F5:08:D5:89:9F:B9:58:76:A3
+Public Key ID:
+	sha256:1C:1B:09:C3:1E:D5:B3:D7:16:60:45:8E:DB:B4:64:4D:67:F3:81:11:49:3B:D3:A1:F7:EE:4E:75:27:F7:66:03
+	sha1:8B:3B:06:F1:80:AC:15:B5:86:06:D4:53:BC:5D:4D:67:F0:24:0B:E0
 Public key's random art:
 +--[ RSA 4096]----+
-|o...o .          |
-|.+oo.o           |
-|.oo.++o          |
-|..o.=B o         |
-| . o+.+ S        |
-|   . Eo.         |
-|     o  . .      |
-|      o. o       |
-|       oo        |
+|o...+. ...o+.+   |
+| ..+ o.  ...B    |
+| .oo+ oE.  . .   |
+| .+.o. .         |
+| o   +  S        |
+|.   . .. .       |
+|     .. .        |
+|      o.         |
+|     ...         |
 +-----------------+
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

From a9651883cdfff2bb1c37f7d2e23ae62b3aeccae6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 19:58:40 -0500
Subject: [PATCH 306/879] PKI: Updated client

---
 test/test_certs/client.cert.pem |  56 ++---
 test/test_certs/client.key.pem  | 410 ++++++++++++++++----------------
 2 files changed, 234 insertions(+), 232 deletions(-)

diff --git a/test/test_certs/client.cert.pem b/test/test_certs/client.cert.pem
index a7709a965..27838d74f 100644
--- a/test/test_certs/client.cert.pem
+++ b/test/test_certs/client.cert.pem
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3koPyIHNgDwS
-fDK8bZ6NxJ/hJUCYoPhg72fZGU4+fY75Jtsy/2yJTibSE2Ipmj7Dv16/SHLDDPB7
-ajoYwKLydCdTTmF7E7jvRIqGAELZbW7xr9I9315bV57jT4O5Qp9CLVTHB/TaSh3B
-Gtx9brNOVKInraNvBSfoQcLEcsJy0pWGRTvG5LVsfdeaIinpd4JFxz2Zy/cDxjqW
-Zbp5uGFdYvViE8BOtMQGqTf/dRbug24RCXqxCiZ6kFH8s0xTv95PpHryxnV1fdz6
-z7FjcoXG/2wrEUVNQYMaY/7FawriAbx/viDatzPRCH4k5IvL8kCLtUb9DFHRpCJJ
-wOJsL2gc3SjASDKIAK9ds9p0/t4iHqs3kmDMHsELI0Huq/kI/Da5n3QKaCIt+mB4
-Et6A6bn8cQZGvDjbyGv6Z2B2d3oBKKBKQjpG223p7Ei9KIRMuIqy48d8giKhVA9s
-5ZZob2WZ8VsJd4AcjC/FZCI4iK0qv+VIEdOPPxiBE3mWFBtX9KW5HlskN9sMgxGm
-OdcigaqMWY7FQHmHJiYkR25D9aZGFyvA7PIngpcIbX/HqSEk0fuSqyjrnlEc5Hs4
-l+YzXolDl/yFt1cShdcuJT/yRXE9V0N0625O3+Ou6dNW+pxZlJw8GwzOS/WATU6U
-y9daPOlSD+rNkGNH8ElxIiuAo4T9Nb0CAwEAAaN1MHMwDAYDVR0TAQH/BAIwADAT
-BgNVHSUEDDAKBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBoAwHQYDVR0OBBYEFOuD
-4MJqvq4F5x8jhd2fqPZpPP41MB8GA1UdIwQYMBaAFH7KMmSQtCkjZcjs9QjViZ+5
-WHajMA0GCSqGSIb3DQEBCwUAA4ICAQCdGaMFVbMpnr29jtyJotxYLamsflxGuaZx
-729ijl/wxdnCXD+d2YjABEZbNFEc5Zh2x7+N8n8clZyhILobKQr+fjYKjnvLYwoP
-NWJQsWGVHxa1RbYPpurFEMiDGlediFGjnUCZDMdNqha6t2jdJyD3szroszpxUSeT
-gZqXIePcMZ/kwhpgvlmK2afrJd2GZDPGgZFFSC1TgFyONCODwSng2dzuUwqIlxR/
-G9IH82DXuBOV24ZFjUnIh9T9EFWq62DR0qbSI2m744BlyGxlUp5EjQsjGu5lcCYC
-vZN+BNj4huXo+gWvODE0unXdq8l1RK8YBJCQK0KMGS2f7Uv+a7+Rctjahv1RSm2U
-NRil9rD3HuXS6ODEopURMclrzSFDab1pvEUZZuRqyy0dsmJlELIkQDcX2Iobt+ch
-Lk2elKMJpkKrVDN8COosWHYR+/cVUM1CUSlj7LlhMxu8AOt28TrxClmP8yBI18pM
-VhXxXkCzo3nIx/c/16D213aj+7+BOR8Ke/Uk3ifv+NiIcUWI4xPP2HKGJjkzw0+c
-ukE3l3RvElF53Z8lvNVZ/WBNK9h9z1Bpd/7ukjE+GB/dzP51/ouV1GTPxZDndin4
-slGWt9ybhXwhA2yvm9M9X17Fwgoo7nGCPVr9cp9c8clBpX5ZwbQEYa0RpBKc/EyL
-iEcOMtk9aQ==
+YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApOz4wcdTiEdj
+O192j39Q1EhzLq9qqZghpWUxQHSV0/Fpm7kUj/wtK1xky130+H2ab+k/Sp8jjda0
+TVV7es7yXYQM2iYEDIc1i3oCtygFkISFpzNG5SGLV2GANovwYfgPhvpnGo9inAVJ
+lXv2DJouLBxsL3c86dA3auMjcJ8FNgfvSJ7So7vEdoZQo1QGKpToUUVPD9e+K/y+
+j4WI8swP8lJaZ/EIDK74ESAyyk7R+jYjItF4GrwR7RM7CxWHOENwO/3pxbiJF+oW
+XOt+2jsTTKyL1FZJHI2beBcPvQql9baBY/q0koT7cS8PJiGI/D6TqXQ25XkbTG/l
+dmzJ7K5toLJ+7iUcdt+q8sF0owS4hR/3VUXM24DgBduzvmihD9G0k0wDNmjHu3te
+8tGQogvMJRTUtiw1AEO2DiUUZqd6p/pFGrJfRyxU6nHBvr1ADeClBwcQB0hH2mVD
+59affexzBsUwhouk3v0fTgNQpX2/qfeKwVbnV4bEN1fd+xSwzdmSelLa6rE+pYER
+JOl+zdLSq0AtZE2GTp2A60jk+AurALcQqhdNU9YV8tCVhFTidO49GXqTmuAJAzvu
+SAoIqCFuU1TWeiNQCHI3clzxUAZcqDBxTZUvbkP3QK7v0Ib5c7HiRp5kmO4CQuUg
+y8mT1RZhaMp9qIy3HKUNEBdYwhj45wECAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
+BgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQ3
+DVC7k5DA5XjW4dD+mWRthF48NjAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
+8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEASw6rojEtxVNLmqhuCGRXpBkeJcEC3hgd
+usOmw3QFwMRwG0JkQuDTZobs20bWCSJzCnGcou6mvdOhjtaErZ/KUA2uAr9YvlmO
++F7mpXlGjfETm3Ta8JzvTtqgCPjQmz+Wn7nnFmwl9MLOOh//NXQ1KJd/ixWtpaLG
+GhY3zduNczLT7O+qganFneostaZFpa/BL3PVXoI669zp7GmzJYSjuxQIyAMP/hKJ
+aFfTNIv9WhPzXrzEviLspJ7OwfWW/S46WZWcXzauXiYS5y21rfFSBSAo1J3oRV95
+qi2IMM4PVpwQISMPwdJe3f2+Gc6qn3TaHFrnSv8OuRNOdvuqV9MLn9uxovgTTyw4
+j1sb7kO6OoLCqrbdZ+lTHy48jahpV3q+Vcep8WA+fC42sV/lfMuuS3EaQTJIfu89
++R+pFQPco60risM8Gy/k0QkwxVwoxsq5xM+SaGyHpEazSasX/qJBj+VH97a9rlje
+fzPpmApWRtZNMNx4qSx7ZEFVtSynM7vDWsWsB9x+OYdObzl4bbZUZ3MSCY0/smGO
+PIbNPmqhlr8bRuJGGlXuftOGLPnssWrZSbQhMzBJQWGiKsHQF+AsdQzaDrtgwuWM
+6REkiXd/cs0QXZh9P2ZzzIqKuIwwOazppJ5mdenWx/0X3Ex7PfdiGZPL8f8DEE7/
+lHXLHvTvWag=
 -----END CERTIFICATE-----
diff --git a/test/test_certs/client.key.pem b/test/test_certs/client.key.pem
index ee73e090d..6bcd83661 100644
--- a/test/test_certs/client.key.pem
+++ b/test/test_certs/client.key.pem
@@ -3,236 +3,238 @@ Public Key Info:
 	Key Security Level: High (4096 bits)
 
 modulus:
-	00:de:4a:0f:c8:81:cd:80:3c:12:7c:32:bc:6d:9e:8d
-	c4:9f:e1:25:40:98:a0:f8:60:ef:67:d9:19:4e:3e:7d
-	8e:f9:26:db:32:ff:6c:89:4e:26:d2:13:62:29:9a:3e
-	c3:bf:5e:bf:48:72:c3:0c:f0:7b:6a:3a:18:c0:a2:f2
-	74:27:53:4e:61:7b:13:b8:ef:44:8a:86:00:42:d9:6d
-	6e:f1:af:d2:3d:df:5e:5b:57:9e:e3:4f:83:b9:42:9f
-	42:2d:54:c7:07:f4:da:4a:1d:c1:1a:dc:7d:6e:b3:4e
-	54:a2:27:ad:a3:6f:05:27:e8:41:c2:c4:72:c2:72:d2
-	95:86:45:3b:c6:e4:b5:6c:7d:d7:9a:22:29:e9:77:82
-	45:c7:3d:99:cb:f7:03:c6:3a:96:65:ba:79:b8:61:5d
-	62:f5:62:13:c0:4e:b4:c4:06:a9:37:ff:75:16:ee:83
-	6e:11:09:7a:b1:0a:26:7a:90:51:fc:b3:4c:53:bf:de
-	4f:a4:7a:f2:c6:75:75:7d:dc:fa:cf:b1:63:72:85:c6
-	ff:6c:2b:11:45:4d:41:83:1a:63:fe:c5:6b:0a:e2:01
-	bc:7f:be:20:da:b7:33:d1:08:7e:24:e4:8b:cb:f2:40
-	8b:b5:46:fd:0c:51:d1:a4:22:49:c0:e2:6c:2f:68:1c
-	dd:28:c0:48:32:88:00:af:5d:b3:da:74:fe:de:22:1e
-	ab:37:92:60:cc:1e:c1:0b:23:41:ee:ab:f9:08:fc:36
-	b9:9f:74:0a:68:22:2d:fa:60:78:12:de:80:e9:b9:fc
-	71:06:46:bc:38:db:c8:6b:fa:67:60:76:77:7a:01:28
-	a0:4a:42:3a:46:db:6d:e9:ec:48:bd:28:84:4c:b8:8a
-	b2:e3:c7:7c:82:22:a1:54:0f:6c:e5:96:68:6f:65:99
-	f1:5b:09:77:80:1c:8c:2f:c5:64:22:38:88:ad:2a:bf
-	e5:48:11:d3:8f:3f:18:81:13:79:96:14:1b:57:f4:a5
-	b9:1e:5b:24:37:db:0c:83:11:a6:39:d7:22:81:aa:8c
-	59:8e:c5:40:79:87:26:26:24:47:6e:43:f5:a6:46:17
-	2b:c0:ec:f2:27:82:97:08:6d:7f:c7:a9:21:24:d1:fb
-	92:ab:28:eb:9e:51:1c:e4:7b:38:97:e6:33:5e:89:43
-	97:fc:85:b7:57:12:85:d7:2e:25:3f:f2:45:71:3d:57
-	43:74:eb:6e:4e:df:e3:ae:e9:d3:56:fa:9c:59:94:9c
-	3c:1b:0c:ce:4b:f5:80:4d:4e:94:cb:d7:5a:3c:e9:52
-	0f:ea:cd:90:63:47:f0:49:71:22:2b:80:a3:84:fd:35
-	bd:
+	00:a4:ec:f8:c1:c7:53:88:47:63:3b:5f:76:8f:7f:50
+	d4:48:73:2e:af:6a:a9:98:21:a5:65:31:40:74:95:d3
+	f1:69:9b:b9:14:8f:fc:2d:2b:5c:64:cb:5d:f4:f8:7d
+	9a:6f:e9:3f:4a:9f:23:8d:d6:b4:4d:55:7b:7a:ce:f2
+	5d:84:0c:da:26:04:0c:87:35:8b:7a:02:b7:28:05:90
+	84:85:a7:33:46:e5:21:8b:57:61:80:36:8b:f0:61:f8
+	0f:86:fa:67:1a:8f:62:9c:05:49:95:7b:f6:0c:9a:2e
+	2c:1c:6c:2f:77:3c:e9:d0:37:6a:e3:23:70:9f:05:36
+	07:ef:48:9e:d2:a3:bb:c4:76:86:50:a3:54:06:2a:94
+	e8:51:45:4f:0f:d7:be:2b:fc:be:8f:85:88:f2:cc:0f
+	f2:52:5a:67:f1:08:0c:ae:f8:11:20:32:ca:4e:d1:fa
+	36:23:22:d1:78:1a:bc:11:ed:13:3b:0b:15:87:38:43
+	70:3b:fd:e9:c5:b8:89:17:ea:16:5c:eb:7e:da:3b:13
+	4c:ac:8b:d4:56:49:1c:8d:9b:78:17:0f:bd:0a:a5:f5
+	b6:81:63:fa:b4:92:84:fb:71:2f:0f:26:21:88:fc:3e
+	93:a9:74:36:e5:79:1b:4c:6f:e5:76:6c:c9:ec:ae:6d
+	a0:b2:7e:ee:25:1c:76:df:aa:f2:c1:74:a3:04:b8:85
+	1f:f7:55:45:cc:db:80:e0:05:db:b3:be:68:a1:0f:d1
+	b4:93:4c:03:36:68:c7:bb:7b:5e:f2:d1:90:a2:0b:cc
+	25:14:d4:b6:2c:35:00:43:b6:0e:25:14:66:a7:7a:a7
+	fa:45:1a:b2:5f:47:2c:54:ea:71:c1:be:bd:40:0d:e0
+	a5:07:07:10:07:48:47:da:65:43:e7:d6:9f:7d:ec:73
+	06:c5:30:86:8b:a4:de:fd:1f:4e:03:50:a5:7d:bf:a9
+	f7:8a:c1:56:e7:57:86:c4:37:57:dd:fb:14:b0:cd:d9
+	92:7a:52:da:ea:b1:3e:a5:81:11:24:e9:7e:cd:d2:d2
+	ab:40:2d:64:4d:86:4e:9d:80:eb:48:e4:f8:0b:ab:00
+	b7:10:aa:17:4d:53:d6:15:f2:d0:95:84:54:e2:74:ee
+	3d:19:7a:93:9a:e0:09:03:3b:ee:48:0a:08:a8:21:6e
+	53:54:d6:7a:23:50:08:72:37:72:5c:f1:50:06:5c:a8
+	30:71:4d:95:2f:6e:43:f7:40:ae:ef:d0:86:f9:73:b1
+	e2:46:9e:64:98:ee:02:42:e5:20:cb:c9:93:d5:16:61
+	68:ca:7d:a8:8c:b7:1c:a5:0d:10:17:58:c2:18:f8:e7
+	01:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	4e:6d:cd:21:ce:82:86:33:2b:c6:7c:54:35:4d:12:f2
-	04:02:f9:14:d0:85:42:fd:58:9a:c8:63:80:52:d6:14
-	22:de:4d:ca:b1:8a:46:eb:b7:10:b9:dc:11:97:a5:7b
-	85:42:d5:b4:a7:21:20:a8:9c:b2:bf:2a:ca:94:f3:7c
-	7d:ff:8b:91:23:4e:b3:1a:60:91:8b:73:fe:22:1e:d5
-	5d:1a:ce:d0:1b:c6:7b:ed:ef:56:7e:50:98:85:e4:11
-	02:53:7e:21:d5:87:4b:4d:32:3b:da:fd:ba:98:33:13
-	f3:5e:92:8a:2e:7a:a0:38:f7:32:d4:03:35:8e:33:b4
-	a3:fa:3b:7c:12:67:dc:8e:8e:0a:88:f1:46:b9:6e:d2
-	55:d8:eb:31:a6:c6:c3:23:1a:bb:6b:ce:d4:7a:2d:eb
-	e3:6e:26:4f:dc:b5:34:d0:b0:d5:dc:21:20:e5:28:a4
-	26:08:b5:2c:4f:cb:81:c4:f7:d8:74:1e:83:12:18:4a
-	fb:5a:91:db:e9:c7:79:90:05:42:50:71:29:10:00:45
-	50:91:e5:77:11:2a:03:2a:c5:8b:37:76:6c:11:8f:d1
-	45:34:fc:fc:8e:55:0e:f4:b3:25:2b:2a:13:dc:36:5f
-	d4:a6:e6:53:79:6e:c1:3d:83:ce:35:55:3c:68:bc:7d
-	b7:32:9f:d5:ef:a4:99:99:c0:e7:0a:69:df:79:a5:b4
-	59:7a:90:6e:43:05:77:1c:91:84:32:99:0f:e7:0e:2a
-	eb:bb:c7:bb:30:98:0a:14:18:66:72:5d:72:dd:e4:96
-	e7:d2:9a:a1:1e:54:5e:c4:a6:cb:6d:25:6e:bd:6d:b9
-	1f:25:0e:01:ad:14:ea:9d:4a:93:b0:4a:e8:fd:1c:63
-	c7:3b:8f:cd:56:8b:d8:90:f6:8b:0a:ff:db:62:e2:39
-	f3:3f:22:f6:75:87:fd:f5:eb:96:14:9f:67:89:6e:02
-	5f:b3:ee:08:2e:a5:c8:3d:a9:dc:81:01:19:27:ca:29
-	da:c9:68:48:73:39:3d:e3:cb:00:d0:97:23:6e:a4:d5
-	76:9b:d3:64:eb:d9:a7:65:e2:8c:2c:ef:c5:56:a3:d4
-	7f:94:ee:55:6c:9f:7e:87:59:c4:42:51:cd:4b:d3:a5
-	07:e5:15:6b:cb:d7:2c:05:a6:ab:28:a3:f0:a7:6e:93
-	4e:5b:3f:7b:a5:73:c4:9f:08:6e:40:82:e0:18:7f:54
-	de:9d:a2:9b:77:e8:ea:0f:b7:5a:65:2d:3a:11:c0:17
-	9d:bd:99:9f:db:57:c7:e5:2b:c0:17:3f:9c:04:63:92
-	85:36:45:07:77:ae:9d:07:75:fd:59:de:1c:31:01:21
+	44:b8:a9:7e:b5:3b:cd:51:51:bb:ef:af:4b:63:d5:9e
+	5f:01:ff:b6:00:4f:e2:a0:42:76:c3:eb:03:a9:5a:c3
+	01:2a:6e:18:6f:56:b8:cb:94:98:3b:55:4f:3a:2b:bc
+	2a:5d:9a:8d:d1:79:d3:24:5f:c4:c9:95:c6:3a:6d:2b
+	22:56:e8:9f:66:98:81:ce:81:eb:b9:2d:f0:73:41:20
+	b7:40:50:51:7e:30:58:0b:75:09:23:b1:73:dc:9e:ac
+	79:a5:e5:48:5f:ee:ca:ec:39:19:1c:aa:0d:de:40:d7
+	08:90:db:c6:67:8f:55:bf:81:be:5b:8a:15:f8:e9:e6
+	ac:82:2a:0b:c3:45:fe:3b:15:04:8c:c9:fa:37:cc:0c
+	71:b0:db:9c:d2:5c:df:9f:55:18:20:a0:4b:eb:53:c9
+	b9:1f:0a:a8:98:9e:10:5a:35:68:a1:41:43:4e:a3:5f
+	e3:8c:22:94:55:2f:80:98:b4:a6:a9:9b:b2:d8:72:e1
+	55:5e:1c:06:d3:39:ec:c9:11:c0:6e:30:51:66:c4:47
+	f2:ad:e1:30:83:0e:6e:c3:15:6b:26:97:b2:d4:2c:6a
+	7b:c7:d9:33:5c:ca:24:ab:a8:dc:3b:1b:46:25:35:3d
+	fa:21:fe:ad:e7:a4:c4:58:eb:d8:48:c4:6a:e6:d3:ae
+	b2:f1:c6:b1:ed:7b:ca:23:fc:51:bc:9f:3a:3e:56:9e
+	6d:23:b0:e5:9a:46:ae:f9:ee:8f:1a:5e:cc:42:37:22
+	6e:4b:52:37:0d:36:59:72:1a:19:c1:17:f9:45:55:bd
+	33:ce:15:5b:b5:ee:a3:88:a2:b8:46:fe:b8:e2:93:54
+	0a:68:81:a3:b8:63:95:c6:b2:96:d0:f8:ac:d6:5d:df
+	97:58:85:6f:eb:2d:66:3b:27:7a:db:2c:7d:8d:04:01
+	44:af:4a:91:2e:e8:f7:6c:e8:52:7a:70:a4:31:9a:f0
+	b7:d3:bc:dd:f4:46:d0:61:f9:5f:57:98:c0:79:b9:e1
+	0f:6e:76:33:66:46:82:7a:31:61:a4:88:19:48:15:86
+	0e:b1:40:6a:af:1a:3f:75:db:12:bc:79:c7:f2:fe:41
+	49:02:88:3b:66:33:44:12:9d:43:f4:e6:cf:0d:4d:c5
+	44:d4:a9:4e:0d:fe:dd:00:87:bf:5e:f2:aa:5f:71:cf
+	f8:4a:24:4c:2c:bf:ee:88:3d:f5:78:e1:5c:95:a7:4c
+	82:c8:65:7d:e7:b3:d7:98:b2:f2:4b:66:5c:1c:f7:d5
+	6a:6e:af:a7:e9:98:31:e8:92:99:1d:64:85:fb:8a:f6
+	6c:3b:a1:dc:22:be:fc:f8:8c:3b:51:c4:c0:dc:44:71
 	
 
 prime1:
-	00:ec:60:d3:bb:de:49:06:62:15:aa:eb:9f:b7:7c:e3
-	6e:57:3f:8b:ad:5c:f9:4b:8a:a2:77:b7:3f:da:31:ce
-	7a:e5:c2:f4:88:f1:bf:d8:3e:3c:81:58:ba:ca:d1:0a
-	1b:7a:10:fe:6a:0b:96:b8:34:9c:4b:16:c3:29:98:e1
-	ed:6a:2b:dd:e4:d4:31:a2:2d:ee:2e:2a:76:a7:8b:b9
-	f3:36:ec:74:bf:d2:47:b0:36:cc:95:52:df:a1:fb:a2
-	01:b5:99:20:84:3b:61:08:ae:ef:e1:11:21:d3:ba:d4
-	25:97:e6:e4:8e:6b:f7:be:39:ec:31:f4:a9:5a:7c:9b
-	8e:9b:ae:8b:b3:c8:f4:b2:a4:4e:65:b2:dc:26:db:53
-	93:d0:be:89:98:5b:30:8a:b4:78:51:c8:7b:46:d7:5d
-	93:64:8b:2f:08:5d:42:ae:6b:69:d2:56:94:c7:7e:e5
-	a2:eb:67:42:64:cc:8b:fb:8a:b5:02:38:68:79:16:ec
-	25:60:c2:11:54:e0:3d:4c:d5:70:bf:6a:db:88:f9:1a
-	bb:41:39:b9:ea:9c:f7:a3:a5:cf:93:1b:b4:b7:99:82
-	b6:30:49:a9:72:f0:a8:87:38:b6:da:d3:97:86:38:63
-	ea:04:2d:6f:3e:a9:d9:1a:b7:80:b9:e3:12:28:4f:41
-	45:
+	00:cb:37:46:9c:11:91:72:90:0e:18:7a:ad:d9:c4:cb
+	3d:64:2c:47:9a:2f:04:69:05:d5:22:b4:f0:af:3e:30
+	26:2e:32:35:83:ba:e1:80:3b:5a:5d:1c:c9:ac:c5:85
+	f2:87:93:8e:f3:dd:7c:f5:cd:a5:77:8b:c2:bf:47:67
+	4d:c7:df:49:cd:41:bf:6c:14:f8:95:0e:db:00:70:d7
+	3a:43:b8:ae:43:be:a3:ce:48:5d:1b:c5:30:14:34:91
+	2c:6e:c5:00:81:ab:86:4b:9f:f0:ab:45:27:62:e0:ea
+	2d:89:61:a2:bd:06:4d:2e:c7:2c:9d:bd:fd:f5:39:b8
+	29:2a:f4:2e:bf:1f:13:9d:c8:d0:bb:56:67:d3:de:2d
+	31:63:22:61:5c:30:14:ea:b7:72:a8:f4:ea:d6:db:0b
+	35:86:a6:e4:8d:c7:c2:9f:2b:33:85:d7:05:45:f7:05
+	d4:5a:74:8f:26:4a:91:b3:7a:cc:8d:57:1b:c2:a8:b8
+	e8:b5:ef:b0:24:4d:1d:8d:03:a1:79:0b:d4:0b:06:1a
+	62:ca:5c:b8:aa:f9:ff:f4:cb:54:e1:6e:a5:d7:41:46
+	7c:2d:36:4b:15:01:c9:17:45:3c:33:44:79:4c:99:b0
+	43:0d:f7:c0:05:13:e5:82:3d:53:a3:2b:88:d9:ee:3b
+	83:
 
 prime2:
-	00:f0:bd:d6:37:5d:0b:11:69:f2:bd:2a:d5:de:74:8c
-	99:ac:5b:2e:63:ae:71:1d:55:fd:43:40:86:72:e9:1e
-	36:44:9d:e7:a9:2e:1d:20:f8:41:a1:25:8b:40:a1:0e
-	5b:90:dd:82:83:70:d7:e4:2f:d6:9e:6c:db:c8:c6:77
-	0d:40:51:06:8f:ce:8b:52:34:1d:c4:44:c2:33:e7:b4
-	62:ae:5b:85:c8:af:e1:b9:ef:77:07:63:10:fc:3c:ae
-	2e:72:b5:a1:dc:f3:c0:8d:af:8d:54:b1:3b:b1:23:c7
-	2b:ef:4a:e0:85:54:27:07:57:b2:5d:fd:a9:08:d4:48
-	1a:39:a8:13:f3:5a:61:67:42:da:57:35:17:b0:72:a4
-	26:ad:53:de:a6:75:52:72:9f:4b:4b:ea:cc:c0:30:c4
-	be:0a:f2:c0:7e:6c:df:67:8f:a0:ce:8f:a6:54:b1:6f
-	72:ef:e7:6b:e7:08:c7:6d:19:45:47:25:b1:5f:b3:bc
-	9e:95:89:3d:0b:1e:dc:1e:7b:53:01:74:3c:a7:07:df
-	13:63:d6:5b:e8:c4:68:29:f2:b9:a4:5b:2c:26:5c:1a
-	a0:4d:37:60:70:68:41:64:01:85:9f:95:f8:76:25:59
-	49:0b:18:b1:45:6c:be:c5:59:2d:8a:8c:ab:03:6e:de
-	19:
+	00:cf:c3:9b:a6:b3:b2:65:0b:88:8c:64:db:1e:00:21
+	42:a5:bd:47:75:0d:a4:29:e5:e9:9b:b7:1a:cf:df:9f
+	a3:44:9c:67:a4:a9:0c:87:97:94:94:40:54:44:3b:bf
+	1a:f3:71:97:05:d6:a5:ad:28:f5:a9:94:92:f5:7f:f8
+	cd:82:40:6e:ca:ff:d8:3f:18:84:42:83:dd:9e:87:bf
+	fa:2e:96:5e:fc:1d:db:d4:d5:dd:2d:c3:71:f4:bf:54
+	6d:06:21:95:8f:0a:89:b8:14:62:7c:a7:9b:10:fc:ae
+	4b:0c:51:ac:46:5a:ee:04:cc:e2:ad:fc:97:50:32:b9
+	c7:1e:40:6f:07:de:45:7f:2e:ac:12:39:30:b8:7b:6d
+	0f:07:75:bd:58:c2:e2:e7:52:2a:6f:7e:8a:2f:07:c5
+	eb:10:db:8d:10:2e:d4:a2:1c:28:ca:f5:c4:de:56:6a
+	20:f3:47:21:b7:4c:b6:04:93:86:e6:78:b5:89:64:cb
+	9e:f2:cd:78:e7:43:e6:a0:94:41:b4:c5:a8:c7:43:2b
+	20:17:50:7a:a9:c0:ee:db:9a:f0:48:85:1f:1f:64:11
+	4e:4d:dd:99:6f:49:7a:f2:65:2a:83:98:96:5b:a3:7e
+	64:da:77:00:7e:4b:7a:55:d9:cf:d7:73:fb:63:1a:f8
+	2b:
 
 coefficient:
-	00:8a:9b:f3:b5:a5:67:96:28:52:dd:cd:4f:cb:7e:12
-	27:c8:c3:ad:b9:6e:37:2d:a9:fa:ff:fc:ec:ee:69:48
-	b7:10:b6:c7:c6:53:3f:f1:58:c7:42:3b:f2:ca:be:46
-	b8:97:8b:bb:72:85:05:6e:81:82:97:81:6d:f7:72:c4
-	3d:73:54:30:b8:a4:79:98:ce:3b:af:84:ed:ef:39:3f
-	44:24:57:02:11:bb:30:af:da:96:70:6f:64:4d:63:af
-	75:6b:7b:60:3d:84:8e:d6:15:32:2c:ef:4c:0f:1b:0e
-	59:db:13:72:41:53:7b:57:f5:ce:d7:48:6f:2e:e6:d1
-	f1:c0:01:14:9a:4b:c1:97:7d:2e:ad:c7:74:a0:2f:08
-	6d:da:22:4f:5c:77:fa:d9:bf:f1:e9:66:e6:39:e7:2e
-	80:a8:c5:47:e7:b3:eb:07:68:0f:be:18:de:c8:a6:45
-	31:52:1d:b3:02:96:3a:49:f1:31:6b:03:58:91:7d:d0
-	ca:06:0a:82:c1:49:b7:d5:be:0a:50:ef:d2:70:22:e0
-	d7:26:ab:b9:99:d4:91:e6:84:96:96:a8:72:fb:68:f7
-	fd:05:b9:56:d3:7e:77:03:10:bf:7a:34:cf:03:84:22
-	67:f0:00:7d:b7:5a:02:23:8e:88:77:74:b3:bb:05:d2
-	4c:
+	69:74:f7:c6:34:ec:d8:f9:08:c2:d8:5b:6a:61:4e:33
+	b3:9b:dd:f1:30:8d:2e:bf:12:2d:74:de:53:6c:d2:88
+	e5:9f:5d:5f:f1:e3:59:00:c4:1d:e3:5a:1d:07:6a:53
+	ea:c8:46:0e:b1:61:5d:03:27:d9:1a:67:54:8d:bb:85
+	53:07:39:19:56:8a:dd:9f:f4:30:13:fa:2e:ce:1c:8e
+	1c:cb:d6:54:b7:a9:92:26:87:f6:60:c1:04:41:fc:7c
+	f7:fd:fb:a7:fc:f2:d0:2c:4a:65:ef:62:5b:f9:b4:d6
+	e8:f6:68:57:1f:b2:d1:d6:c4:78:0e:d4:66:39:cd:4c
+	42:d7:5b:d1:ce:ae:5a:b6:25:12:7f:d1:2c:ae:95:4c
+	14:cb:0a:31:7c:a8:0a:71:b8:98:c8:2b:03:19:92:d0
+	e1:4c:a8:c4:0b:8c:b9:8b:d0:9a:b3:8f:27:b3:a4:09
+	8b:6d:95:e3:12:a0:60:e6:e7:b9:8f:53:fa:b4:56:f1
+	cd:fe:11:31:20:01:fd:82:73:f1:51:ba:13:71:f1:0f
+	8b:78:3f:36:71:7e:15:93:35:01:06:8b:40:a3:b5:23
+	22:9d:c7:c7:88:c8:25:07:dd:0d:1d:70:43:37:3e:ea
+	25:b0:54:f0:5d:83:29:ca:5a:ec:4e:f5:a7:66:f0:fa
+	
 
 exp1:
-	7c:09:9b:51:dc:25:09:ba:72:90:4c:30:75:82:8d:7d
-	9b:3e:f7:36:b3:b1:05:98:ec:04:52:1e:a9:8a:b5:44
-	fc:48:3f:35:95:56:0c:4d:2c:46:db:9e:b9:4a:d4:38
-	f2:e6:f3:fa:05:b6:c3:56:a8:25:26:fe:a6:57:59:46
-	d2:0d:ce:d4:83:1c:c0:73:c5:a6:68:15:f7:79:74:cc
-	51:a7:e6:e3:b9:9e:70:b3:70:cb:72:bf:73:2a:ae:2a
-	a3:76:84:ff:9e:81:1e:a3:5d:b1:06:e2:6f:4e:7c:80
-	75:a3:6d:8f:e6:cc:0c:00:2d:17:51:c1:84:80:1a:c8
-	cc:9c:dd:26:2c:6f:6b:46:98:f4:f8:d4:59:77:81:f5
-	f0:f5:eb:12:0d:d7:fd:11:12:8a:27:df:b8:9e:ce:b5
-	c7:6e:d9:f1:53:ae:e8:03:e9:75:bc:85:39:e2:36:f2
-	35:00:ec:70:24:7d:d8:33:43:24:b5:20:ed:59:bf:f5
-	25:3e:f1:05:4e:de:1b:f1:6c:c6:a5:76:29:fc:3d:b0
-	c1:5b:5f:59:e3:a0:77:39:4d:21:6e:ca:78:05:8f:f7
-	b6:83:10:ee:05:a7:09:be:13:05:e5:3e:7f:ea:1b:53
-	f3:79:3c:04:ef:ef:c2:fb:44:0b:47:42:81:f0:84:d9
+	4a:04:cd:3c:45:8d:e3:db:a2:b6:b9:e0:9f:04:76:3e
+	db:40:e1:a7:c0:5e:6b:de:8a:fe:84:47:72:9d:45:2e
+	72:ff:28:cc:dd:82:0b:92:12:dc:fd:82:5b:e2:ea:62
+	27:8d:d0:b0:f4:c8:f2:43:40:74:e5:bc:3e:ad:c4:6b
+	e9:54:64:6e:55:f7:62:67:d5:0f:7e:04:b9:09:60:eb
+	c1:05:00:bc:7e:30:ee:0f:1f:92:e0:e5:1d:46:f4:65
+	e9:c6:e9:e3:51:55:ae:30:08:9a:69:aa:e9:f2:20:7a
+	0b:a3:3b:82:7c:4c:1a:b0:c3:88:85:4e:7e:46:d2:d4
+	73:e7:d3:2b:1c:27:a9:fe:1e:41:4e:3c:ad:48:2c:cf
+	e3:5a:ff:79:73:ad:fa:bc:6d:10:2b:7d:6a:5b:08:9f
+	2b:77:98:a2:27:d3:b4:e4:28:75:24:97:b0:1f:44:c9
+	4f:55:4b:5a:d8:28:6f:e6:57:a1:57:cc:2d:c0:04:f2
+	06:6a:d2:8e:b6:64:00:1c:05:71:b0:a4:40:8b:ad:8a
+	b4:48:c7:9e:c7:46:ba:a4:61:3b:67:71:12:91:9d:19
+	d7:e2:01:c1:1a:10:63:e0:7d:07:f3:75:f7:37:b7:a3
+	04:f0:6b:c9:ad:b0:98:1a:bc:5f:1f:99:4e:3f:de:ff
 	
 
 exp2:
-	67:e0:21:ac:65:d3:3e:c2:4e:60:dd:38:c6:f1:d7:30
-	ff:b3:a0:42:96:a4:6c:1a:0c:5b:96:5d:ec:fb:35:74
-	09:0b:71:48:08:83:bd:14:21:8d:5c:db:c7:19:37:4e
-	bf:25:35:09:6e:09:59:86:62:be:9d:0e:00:85:d2:1c
-	bf:a1:b6:89:1a:7f:f7:0a:51:c5:bc:3d:67:94:14:bb
-	77:ac:39:ff:ac:14:63:dc:35:a9:d4:4f:21:e7:34:e9
-	09:c9:e1:7b:ab:19:6c:89:51:1c:38:15:1f:8b:e6:86
-	c8:8b:b0:71:17:2c:77:f8:99:18:01:39:8c:7b:bc:58
-	c4:84:07:87:bb:79:c7:ca:8a:d7:92:2b:14:91:82:ce
-	c5:7f:28:d4:fe:4e:82:f2:c4:d4:8f:0d:a5:e7:e5:1c
-	73:30:e7:6a:25:a4:07:d5:6b:77:75:78:39:97:0e:15
-	b3:fa:51:0e:b1:35:0b:98:19:d2:67:2b:2f:b6:28:2e
-	ed:2a:f8:51:f2:10:dc:7e:2e:04:b4:98:ef:21:70:59
-	b7:7c:68:cf:f8:df:51:2a:50:7b:e0:73:1e:62:23:83
-	03:8e:5f:68:61:33:c5:e8:fa:35:2f:ca:b3:7f:ce:14
-	bc:5a:fd:32:8d:87:8b:33:bd:78:c8:d5:89:77:af:11
+	0d:a2:8b:bb:83:fd:88:2e:1a:97:04:23:71:33:96:fb
+	35:bf:57:4a:32:4b:fc:c7:ee:ed:de:35:6f:41:00:cc
+	09:3b:ae:7d:9a:ee:8c:93:81:17:bd:a5:0a:19:55:b0
+	62:1b:a9:4a:a3:cc:99:b1:9f:75:b2:9f:76:67:20:9f
+	f4:15:60:70:08:1c:5b:ff:b2:e6:5e:9b:13:c5:5a:ef
+	03:51:b1:08:20:b9:85:9d:47:77:b2:64:ef:28:03:55
+	68:5a:99:e3:1a:50:f1:78:bd:01:eb:49:fc:f2:68:49
+	da:94:1d:97:3c:6e:74:78:31:c4:33:58:86:d5:dd:65
+	58:f1:e7:97:7f:99:d5:ff:ed:21:01:09:d6:81:9b:25
+	aa:5a:aa:c3:81:7e:bc:a9:a2:c9:50:67:a7:30:7e:67
+	af:e2:88:be:70:24:5a:43:38:d6:21:0c:fb:7e:76:56
+	95:40:ac:d0:c7:c3:06:47:dc:49:91:d0:70:24:e2:4c
+	1b:29:2a:ef:1a:80:af:37:2b:9c:be:80:16:1b:ad:5f
+	dc:c7:d6:54:ff:a9:6d:56:1c:c0:d5:a3:b6:3e:ad:f8
+	12:9a:21:70:b1:44:d5:55:98:55:ac:94:e9:8c:b0:45
+	d4:24:8d:2e:bc:ab:59:a9:02:bf:e4:07:b2:78:59:a3
 	
 
 
-Public Key ID: EB:83:E0:C2:6A:BE:AE:05:E7:1F:23:85:DD:9F:A8:F6:69:3C:FE:35
+Public Key ID:
+	sha256:99:0C:C5:EF:0C:3C:DC:71:32:9D:02:23:F8:28:E8:3B:55:D8:00:3D:D0:12:F3:56:33:03:B1:FD:30:3B:71:F1
+	sha1:37:0D:50:BB:93:90:C0:E5:78:D6:E1:D0:FE:99:64:6D:84:5E:3C:36
 Public key's random art:
 +--[ RSA 4096]----+
+|     ...+oo  o   |
+|      .+ *.o. E  |
+|      . *.=. = o |
+|       o ..=+ o  |
+|        S *+.+   |
+|         . o+    |
 |                 |
 |                 |
 |                 |
-|   o .           |
-|. o o . S        |
-| + ..  o o       |
-| .+.oo..+ E      |
-| oooo+=o.. .     |
-|B=.oo++oo.       |
 +-----------------+
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

From d772eb6add1cbda0232e86b45aafe7160c69e295 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 20:04:24 -0500
Subject: [PATCH 307/879] PKI: Updated server

---
 test/test_certs/server.cert.pem |  56 ++---
 test/test_certs/server.key.pem  | 414 ++++++++++++++++----------------
 2 files changed, 236 insertions(+), 234 deletions(-)

diff --git a/test/test_certs/server.cert.pem b/test/test_certs/server.cert.pem
index 6d84d8017..32f9d38dd 100644
--- a/test/test_certs/server.cert.pem
+++ b/test/test_certs/server.cert.pem
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-4Ec90+pFHA==
+YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzhorPKY3cEsy
+vbKPvLn6aA3RArbRAgDMR+a4knyMWpQ8Nhb+xgLG/CUAO/fHhuyltw6vg7dx3+X+
+5jXMc7dfZf2YNGZTAn7jAlpTYPJMMO5m/VCOaiDdymU41YHYuV64pmKCrDv5EeHE
+Fi7A2LuCXfsn+jIV6iPs6ASbgCavVs8yVp2Sb4qrrXVlgBuOv5ety369mNi91Yot
+wZ8jbI1qAAe/nujrJwshg1qSTGTTseaZ0aAgimuoE+BsMB59VL9fVUEBH+dn7Qp/
+ff/AQpwjJK7hrCL9177bLMp23t6uyGkZlqEqlJ1+1ZTP4fl9ZOPmGhZE6laohcLx
+kI0VThH8jmoOp7nQWWkjzAqj28qSYfbXd975pw3ZdztqTt3vgVmvWLWJfOfXcJ4+
++OUu9Boocsirxx53p4ONjz+a5BQ7RI0dDEx0yKmrzDTmuBiLqeZPxQBwtYRBIw0g
+sGCIp8jYGdlzBg39cETQ48BA0jwKdDO819+ZCh4ZlE707clz/GMR2v3DiGQTOac8
+vlagpmsWsmzNtGjLEZKKAlppx/OMoOKEi0LGA7Nos+Du6RzKYKEqkGwLW2gxj43A
+FPjr9Pvr+sbUectDLZz3DvwXkrsBvz7ySObS+1LZWMgt5mvT+NSx5oHSaok4g/fZ
+fBf2jHABuIHTkGiTlKaO3NjAwj3nEZkCAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
+BgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQS
+NmTiVjC6QIA8chtyQhUb4Se1wzAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
+8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEAj5V6MSHkRWAWUaEzMxVuyYMHhVqZenM2
+KBhaoM3Y9zbd5RHpYaypAKqr2joLGnNgIi9jsnCOOc+fdwh0lFd+faW5DvbPpIH/
+n1DlmnFv5mJ4uKuaRKhSY5NjPsL304riZKGjoi7fIuZgOv2lqXkvwB7e1b0/T4e4
+e9BjXuXLBkWSpPVo6TwdzJsQTRdr82uha+HxWs464Bo/Z/kgLaWTOQE3zpDXd5Yj
+oC4sMlbIHb86hDQJrJwLmSpy5J2hIKyoQDhDRagxzULkDgrHUEhC4Ri9e2hgeZbX
+/Na3AJw6EBnHP58yI6JpWX40B3HBGSJghzEUX+fijXbKPKLBjSD4rAj4kYNDkQim
+SaRzU1MfFYp8MXMHTQw9cVH9wiLt1/HHWSfVZK5oTxjXFBnmV5INvMoPbHFrydy0
+a9aiOb9usJwOjwgBwnQFruvsEOl5xltBWHSGRC4iA28o8jlOPzR0XTijsUczrO08
+s10rTzuFNFymumGcMCoHWVFtQdK3Z3TSC1mvPeh5o/pHFXAO25YZjbMcx/cWcZq0
+Fg5CdQpkOZB+UJE7QBdN+xg++AxPsHihSp3RJTgZaTgaPL7eQXNCDHp3l+5QTWTX
+39wPkU672ANEjG2+P2VfACVZQFmDXA3MNkLdPmGkJ78sohfkAP+qZEm6wAX7id9C
+3glO5S3cYm4=
 -----END CERTIFICATE-----
diff --git a/test/test_certs/server.key.pem b/test/test_certs/server.key.pem
index 2a243ec9b..e7688538f 100644
--- a/test/test_certs/server.key.pem
+++ b/test/test_certs/server.key.pem
@@ -3,236 +3,238 @@ Public Key Info:
 	Key Security Level: High (4096 bits)
 
 modulus:
-	00:d8:15:13:75:05:09:1d:70:63:1c:e7:30:e5:90:3d
-	fa:6c:5d:c0:2b:be:10:28:b6:57:12:d1:41:1d:22:a8
-	1b:98:f7:58:84:c6:14:98:63:9b:e2:de:4b:bf:6d:d4
-	c4:d5:92:95:5f:35:69:73:a2:df:1d:7f:d2:d3:47:d2
-	3e:43:ca:18:44:db:cd:4e:25:b6:74:a3:73:09:19:08
-	30:54:ec:bb:fa:b8:cf:cc:5b:74:22:60:3d:2a:3d:93
-	28:66:14:72:53:57:21:91:64:94:b0:1c:79:d0:cd:c8
-	dc:d0:cb:f6:30:c4:f8:a6:4d:21:f6:2f:dd:88:8b:f3
-	be:a0:95:c9:3f:a3:5e:6f:37:b5:e4:12:11:ed:51:2b
-	59:25:c4:df:11:b5:af:2f:61:00:c6:ed:8d:49:bb:31
-	e8:d2:6f:1e:fa:ac:73:5f:57:20:ad:26:f3:31:9e:67
-	7b:e5:b3:04:6c:5b:81:30:2b:95:7a:8d:01:7c:9f:05
-	d3:3f:3b:c5:b5:d5:ea:a5:52:8c:e1:5d:d8:97:51:6e
-	6e:33:44:20:f6:c1:0f:61:52:d2:1a:81:a6:ca:18:b8
-	4f:b6:ba:69:eb:b7:ff:54:34:c3:55:fa:92:5e:e1:ca
-	6d:ea:74:20:22:b9:7f:49:95:22:ff:58:bb:03:4c:d1
-	62:2d:34:44:d7:ff:59:41:f3:e3:04:1d:a7:6f:8d:8f
-	57:35:03:a1:25:e4:4b:4c:98:13:4d:0e:0e:8c:29:5f
-	37:25:a1:7f:57:73:55:0f:a1:fb:6d:d8:5e:b1:2e:65
-	8b:29:52:7d:1c:5b:3d:87:05:16:2e:bb:4d:28:f2:76
-	d0:70:59:88:1a:2d:0f:bd:c7:08:b7:f4:1d:6e:73:cd
-	35:5f:ef:b1:e9:c0:de:a2:0b:d7:e5:68:ea:c4:51:b9
-	ae:1b:7e:36:fb:e3:2a:17:19:39:6c:7c:38:8a:6e:9f
-	3a:73:72:71:46:78:13:24:59:e1:f5:d1:44:11:65:2c
-	05:6f:56:61:11:5f:70:68:6e:9f:74:e6:8c:ec:32:99
-	30:f0:ed:06:ad:43:31:ef:b2:2c:41:c2:ed:b8:e1:41
-	ca:3a:bf:bf:21:46:fc:a1:86:88:74:ef:c9:ce:50:30
-	24:19:f7:6b:05:02:c6:c1:e5:9e:e4:7c:78:aa:47:32
-	c7:06:78:94:ab:ab:0d:e7:63:08:3d:de:f1:4e:5a:53
-	c3:7f:a9:f9:07:55:13:1d:b9:42:f7:1f:43:41:2f:8a
-	9f:9e:d0:70:a9:5e:f4:58:37:3f:52:39:97:65:81:ee
-	2a:90:f4:59:ec:02:29:87:84:27:9f:a5:b1:04:e1:f8
-	9b:
+	00:ce:1a:2b:3c:a6:37:70:4b:32:bd:b2:8f:bc:b9:fa
+	68:0d:d1:02:b6:d1:02:00:cc:47:e6:b8:92:7c:8c:5a
+	94:3c:36:16:fe:c6:02:c6:fc:25:00:3b:f7:c7:86:ec
+	a5:b7:0e:af:83:b7:71:df:e5:fe:e6:35:cc:73:b7:5f
+	65:fd:98:34:66:53:02:7e:e3:02:5a:53:60:f2:4c:30
+	ee:66:fd:50:8e:6a:20:dd:ca:65:38:d5:81:d8:b9:5e
+	b8:a6:62:82:ac:3b:f9:11:e1:c4:16:2e:c0:d8:bb:82
+	5d:fb:27:fa:32:15:ea:23:ec:e8:04:9b:80:26:af:56
+	cf:32:56:9d:92:6f:8a:ab:ad:75:65:80:1b:8e:bf:97
+	ad:cb:7e:bd:98:d8:bd:d5:8a:2d:c1:9f:23:6c:8d:6a
+	00:07:bf:9e:e8:eb:27:0b:21:83:5a:92:4c:64:d3:b1
+	e6:99:d1:a0:20:8a:6b:a8:13:e0:6c:30:1e:7d:54:bf
+	5f:55:41:01:1f:e7:67:ed:0a:7f:7d:ff:c0:42:9c:23
+	24:ae:e1:ac:22:fd:d7:be:db:2c:ca:76:de:de:ae:c8
+	69:19:96:a1:2a:94:9d:7e:d5:94:cf:e1:f9:7d:64:e3
+	e6:1a:16:44:ea:56:a8:85:c2:f1:90:8d:15:4e:11:fc
+	8e:6a:0e:a7:b9:d0:59:69:23:cc:0a:a3:db:ca:92:61
+	f6:d7:77:de:f9:a7:0d:d9:77:3b:6a:4e:dd:ef:81:59
+	af:58:b5:89:7c:e7:d7:70:9e:3e:f8:e5:2e:f4:1a:28
+	72:c8:ab:c7:1e:77:a7:83:8d:8f:3f:9a:e4:14:3b:44
+	8d:1d:0c:4c:74:c8:a9:ab:cc:34:e6:b8:18:8b:a9:e6
+	4f:c5:00:70:b5:84:41:23:0d:20:b0:60:88:a7:c8:d8
+	19:d9:73:06:0d:fd:70:44:d0:e3:c0:40:d2:3c:0a:74
+	33:bc:d7:df:99:0a:1e:19:94:4e:f4:ed:c9:73:fc:63
+	11:da:fd:c3:88:64:13:39:a7:3c:be:56:a0:a6:6b:16
+	b2:6c:cd:b4:68:cb:11:92:8a:02:5a:69:c7:f3:8c:a0
+	e2:84:8b:42:c6:03:b3:68:b3:e0:ee:e9:1c:ca:60:a1
+	2a:90:6c:0b:5b:68:31:8f:8d:c0:14:f8:eb:f4:fb:eb
+	fa:c6:d4:79:cb:43:2d:9c:f7:0e:fc:17:92:bb:01:bf
+	3e:f2:48:e6:d2:fb:52:d9:58:c8:2d:e6:6b:d3:f8:d4
+	b1:e6:81:d2:6a:89:38:83:f7:d9:7c:17:f6:8c:70:01
+	b8:81:d3:90:68:93:94:a6:8e:dc:d8:c0:c2:3d:e7:11
+	99:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	00:d2:c8:ac:74:48:77:3d:ca:76:44:a9:99:df:36:37
-	df:63:7a:88:8d:a3:18:2c:3e:c2:ed:ce:46:90:5f:50
-	51:ab:84:0d:4b:67:d6:8b:59:0f:a5:dd:67:52:d3:96
-	ec:73:d2:4b:f7:d6:28:89:ee:e5:6a:e7:58:07:56:56
-	56:fa:d5:d7:9a:c4:37:9f:f5:d5:e8:2d:d1:77:9c:7d
-	8a:78:2d:7e:a9:f3:42:71:7c:fc:ea:d3:aa:96:db:fe
-	03:38:a0:d5:6d:4a:df:a9:ee:cd:c4:85:e2:a6:b7:37
-	2b:80:5a:96:4b:b8:b9:3d:b0:9c:62:85:0a:bb:ba:9a
-	08:e8:a9:74:e9:a9:39:e3:90:1a:d4:e2:73:ae:66:b1
-	bc:82:c5:6b:3c:e1:58:85:05:41:36:cc:60:38:fe:6c
-	8f:4b:47:ae:96:a5:46:de:48:25:ce:02:e2:d5:12:4a
-	ac:67:c3:9b:9b:00:20:23:97:40:77:8d:b9:57:91:e0
-	a2:d3:5a:41:61:41:cd:65:7c:03:85:8c:80:4e:0b:d7
-	87:94:66:ef:29:05:e7:34:ef:0f:99:5f:c4:0d:fc:d3
-	3e:9f:67:75:0f:c6:2b:42:3f:3e:15:4f:1b:1d:87:70
-	6a:8c:7c:bf:24:60:83:34:8a:50:db:79:f8:e4:1d:39
-	59:9a:f1:36:3d:99:9a:0d:a5:15:21:0b:c2:a7:73:09
-	de:48:6f:53:51:c8:16:d3:06:67:1b:08:f2:44:b6:8e
-	0d:31:a6:0e:85:94:3e:11:98:28:51:a7:c6:41:f8:f9
-	64:08:98:a4:64:de:2c:d0:f1:15:1e:e5:59:78:2b:5b
-	1c:bc:2e:80:d8:16:8d:cd:9b:a1:e0:25:86:65:2b:bd
-	d3:23:e5:81:5f:50:94:63:d9:77:e6:0b:b3:be:84:ba
-	50:92:09:3c:bc:85:0b:60:32:7a:b3:11:a7:cb:5a:0c
-	4f:e2:a0:ef:70:85:16:31:f4:27:5b:bb:c6:54:3c:36
-	29:a4:28:b7:ea:b3:db:2b:b6:b1:aa:5f:fa:a6:6a:68
-	96:30:26:10:30:ab:b1:a4:fa:2d:c6:4f:5b:57:ae:49
-	8d:26:e9:64:e7:d2:5f:5f:61:4e:53:33:6e:7a:0a:88
-	5f:aa:eb:75:05:28:47:60:dd:5b:bf:cc:c3:70:e4:75
-	87:b8:df:5e:06:bb:07:1a:69:c6:63:dd:8b:a1:77:06
-	69:51:5d:94:b3:c6:aa:57:cb:5c:2e:f6:87:89:f3:5f
-	e4:82:53:ca:46:e1:83:19:a2:9f:3b:4f:dc:6b:49:c5
-	6e:e1:10:51:0a:bf:6d:fb:b4:d2:c5:d4:59:4e:5c:2c
-	61:
+	35:c7:94:52:ae:18:b7:3f:98:0c:f1:e4:19:dd:f9:9e
+	5f:44:93:cd:ba:7a:28:55:25:c9:e9:8d:a7:dc:43:e2
+	7c:57:ac:e6:6c:2a:db:5b:7e:18:32:8d:b4:4d:db:c0
+	5e:25:01:dd:7f:e7:c2:01:d4:e2:a3:55:27:38:c9:36
+	e6:d6:69:8d:ed:c9:2f:ec:f2:77:39:5c:89:bd:21:e3
+	83:92:44:0b:f5:5b:80:24:49:07:6c:87:06:53:50:89
+	24:39:7e:59:8d:08:b0:06:d6:50:e7:80:40:cd:a4:f5
+	fb:0c:72:77:d1:4a:18:77:c0:0f:3b:b8:53:df:da:ea
+	13:fb:90:00:5f:04:b3:49:7e:e1:ae:6d:02:71:b2:15
+	92:8d:0e:d2:2c:74:54:9d:4a:d5:44:3e:4d:1c:15:75
+	ce:8f:cc:da:80:49:de:d8:ae:da:da:63:fe:c7:52:9b
+	96:b5:a1:6f:fc:4e:9d:3c:1a:8a:80:7f:e4:3a:51:f9
+	81:58:85:ff:9a:35:7f:20:07:26:8c:ae:d1:72:c6:a4
+	d2:d1:66:46:77:30:6d:c7:e9:47:27:7f:7e:61:e3:3f
+	b1:82:a1:a9:67:c0:35:11:6c:54:56:65:f0:b7:7b:d4
+	56:28:4b:71:4e:8d:88:e1:d6:80:de:9f:99:90:8d:f2
+	ef:07:ae:db:65:fb:70:90:89:22:c6:de:6a:06:83:01
+	16:51:a0:bb:3b:d2:ed:98:cc:62:24:df:37:e0:98:06
+	b3:88:1d:b9:c6:1c:d5:a7:18:e5:b7:3b:34:0f:63:90
+	f1:ab:0b:3e:e6:b4:9a:54:69:41:f6:c5:ad:03:44:b2
+	48:48:66:55:a8:4b:0e:bb:43:48:53:a7:07:23:a6:06
+	64:46:b5:e3:9d:9b:b2:de:35:67:cd:e6:e1:39:0f:0d
+	8b:c5:8b:68:bb:38:86:b7:a0:81:f4:b0:89:fa:6d:2d
+	56:80:77:66:6d:32:02:1f:93:82:47:01:37:35:95:6d
+	55:87:9c:75:cd:9a:f9:16:f4:09:3b:a8:60:47:5e:34
+	7f:6b:58:99:c8:db:fb:60:f5:dd:54:9c:27:42:5b:a7
+	4e:27:28:92:af:c6:76:56:c5:0f:db:73:1c:e0:06:bd
+	4a:4f:75:37:19:39:9a:a7:7f:f2:8c:18:a4:25:77:c4
+	e9:4a:3a:9d:3a:83:67:2b:bf:bd:c5:4d:bb:37:68:8e
+	6f:a9:0d:67:d4:87:e9:59:02:61:60:e1:3f:b0:81:81
+	89:ba:29:4a:f0:37:4b:42:95:90:99:fd:7d:a9:30:31
+	33:ba:dc:86:6b:ce:29:98:8b:37:f2:72:b1:90:79:a5
+	
 
 prime1:
-	00:e5:66:3a:d6:00:5d:21:0b:19:9c:20:5a:d8:fd:33
-	db:14:9f:68:27:22:ff:32:89:90:9c:c2:44:4a:63:44
-	a2:e5:4b:7b:8c:ff:12:7a:54:44:0a:e1:a2:90:67:b9
-	1f:a3:e8:bc:fb:3d:28:30:17:31:d6:37:03:2f:81:dd
-	50:d3:7b:24:59:8c:2d:e0:37:3c:70:c5:8e:18:30:f5
-	9a:85:e2:16:f4:da:27:a9:98:a9:2d:4b:ec:2a:47:c6
-	32:ec:d7:b1:9b:e3:98:36:73:00:12:6a:56:a2:82:38
-	42:8f:c7:da:a1:8d:8d:c4:74:d4:9b:31:e3:81:cf:1f
-	a5:fd:fe:9b:b8:a2:e0:25:71:72:14:e5:4c:e0:1c:58
-	51:88:71:49:30:15:5e:1f:9d:b3:52:d8:79:4a:25:39
-	86:58:54:7a:93:87:0e:a5:12:28:70:cf:84:e1:0a:25
-	47:9c:81:07:8f:0d:a3:65:78:ed:13:e8:6e:bc:f6:20
-	cb:62:eb:ed:67:21:02:31:92:a5:77:ac:c5:45:2a:3c
-	c3:01:c3:63:11:9f:7f:5d:a6:2a:bb:c6:f8:9c:25:59
-	6f:4d:1c:30:87:cc:c8:95:4d:62:75:fa:7c:75:f7:33
-	1e:51:2d:f3:42:10:da:b3:0f:a2:02:7f:1c:1a:da:48
-	f3:
+	00:fc:59:48:15:f7:ed:1a:7d:0b:ba:2d:4e:b2:bd:75
+	10:a4:f3:68:2b:db:18:6a:b2:ff:93:c8:0d:c4:4c:55
+	99:58:02:ba:60:43:81:ee:09:14:e5:5a:38:91:37:6d
+	f6:b4:4b:b3:5e:be:9e:3a:43:27:a7:06:06:a1:ae:dd
+	36:2f:8c:b1:17:1d:b5:55:bc:1a:05:cc:35:d2:03:25
+	18:97:f7:84:a4:2b:18:f9:50:67:ee:3f:c9:8c:d1:35
+	95:0e:9d:28:0b:f5:9d:00:cd:e5:e9:43:3f:8a:90:59
+	c1:ae:a2:74:60:2b:c8:9c:50:9e:f8:5f:f2:87:13:36
+	dd:8e:b3:d9:52:4c:26:40:7f:b6:52:81:9a:29:90:af
+	85:ba:4a:9c:e6:38:4e:7d:9e:05:2e:e4:af:b1:a4:51
+	5d:fe:1f:ce:aa:b2:e2:b8:74:9f:ac:86:c7:ab:a9:5e
+	5b:8a:33:49:c6:14:f1:10:0d:d6:02:55:6a:6a:57:92
+	5c:21:b3:c8:cf:b2:49:78:cb:23:47:d3:f5:5a:c9:ad
+	2c:4d:18:9d:c4:2b:84:e0:91:d9:8b:99:ce:cd:02:cb
+	b0:c2:db:02:f5:23:a2:e7:d4:93:ed:40:72:eb:29:4b
+	71:85:46:03:d3:f2:da:d3:f1:3f:89:b0:cf:7a:29:2b
+	5f:
 
 prime2:
-	00:f1:23:87:22:26:de:b0:fd:88:ca:80:6b:77:0f:04
-	c4:cb:fb:11:90:46:cf:12:94:60:5b:7b:ab:52:09:4d
-	61:32:59:02:68:22:b3:46:6e:b2:5f:b4:30:c0:aa:80
-	51:da:66:3b:0e:ca:8b:95:9d:3e:57:1d:03:b9:34:cf
-	1f:f1:65:6d:e3:a1:0f:15:10:8e:8e:30:9f:be:7e:9b
-	8b:2e:03:af:74:ae:61:de:22:3b:20:6f:dc:ac:fc:57
-	43:df:51:04:31:d6:32:6e:a3:1e:fd:22:81:53:04:67
-	e3:bc:4a:c1:5f:84:a1:75:07:48:cb:a3:3c:b6:b0:d3
-	f9:c9:49:1d:53:3e:54:78:51:e1:60:28:91:af:da:93
-	7d:19:00:e0:5f:48:64:24:dc:85:2b:2f:6b:6d:32:c3
-	e5:8a:16:95:7a:34:07:20:6b:51:7e:84:52:ef:b0:2e
-	4c:9b:87:e5:5a:35:c4:44:b9:45:9a:90:ad:9a:79:76
-	f9:02:a8:37:47:e6:11:2a:9a:2b:dc:0d:59:89:a1:34
-	c0:ca:80:3b:ca:b0:52:ab:55:45:68:6e:6d:00:16:76
-	52:21:9a:30:05:d8:72:a8:88:a6:20:f5:10:b8:4e:03
-	6b:9f:9a:60:5f:69:44:a9:88:72:20:3d:d9:c1:2f:fb
-	b9:
+	00:d1:15:96:34:3b:7b:31:af:5d:07:83:c8:1b:20:50
+	33:51:3d:6a:8f:83:80:86:cc:1b:b2:d1:d2:63:58:d3
+	4b:6f:d6:6e:fa:18:06:f3:9f:0d:1c:c6:fe:2e:64:72
+	b6:cd:8d:8e:93:e0:71:c6:8b:20:2b:49:32:99:70:e8
+	89:51:11:63:ad:53:ff:a7:2e:0f:3c:f8:e3:a0:63:16
+	a2:12:44:65:1f:d4:e8:81:03:54:9f:e3:1e:c6:a8:68
+	fa:fb:70:f7:ad:59:f9:e3:8e:f4:e4:e1:2e:c6:35:f5
+	43:8c:83:34:2d:f2:4f:ee:43:68:95:16:e9:51:f9:bc
+	1c:6b:f3:6b:46:83:b2:7d:90:6a:cc:8a:cb:a8:31:dd
+	64:cf:60:58:af:dd:82:9a:55:95:36:fa:cf:89:24:38
+	ad:bd:75:02:28:83:8f:95:2d:95:9e:c5:44:d7:c5:80
+	cb:53:74:82:12:9d:d6:1b:df:9f:6e:a8:6d:a4:99:1f
+	b9:b9:83:bb:c8:b9:f1:b1:9a:d1:a6:16:43:71:a8:27
+	4d:6d:c3:46:10:cd:be:1b:03:af:1c:67:9c:13:58:47
+	93:f2:07:eb:73:65:f0:b1:cd:10:11:5b:20:c6:2a:b4
+	9f:f0:52:53:0f:e2:8a:2a:e5:c1:d3:f8:4d:1f:66:5e
+	07:
 
 coefficient:
-	00:bb:b6:0a:1d:d8:41:95:de:18:81:ea:79:a8:c0:00
-	fe:d9:e3:c3:3b:33:81:75:28:27:7c:10:02:0b:ce:a4
-	3f:a1:da:7d:96:b3:63:59:2a:fe:8f:a8:21:da:0f:06
-	5a:9f:33:ff:22:98:6b:08:d4:47:77:74:66:1d:69:50
-	8d:39:ac:51:b4:58:10:19:c6:6a:c1:89:d1:03:68:2a
-	1e:f6:25:3b:ba:9c:df:0f:c5:ae:6b:86:ef:94:44:69
-	73:05:3d:fa:f9:79:ac:0c:45:3a:7e:a1:dc:d1:1d:02
-	29:cb:e1:fd:5a:5d:5e:78:cd:65:46:f6:5b:f5:13:8b
-	fd:04:d2:9a:21:c7:3f:03:4d:34:56:37:83:b6:43:f8
-	d7:21:b7:02:82:03:4e:4d:de:dd:0a:77:a1:d8:79:08
-	3d:78:56:29:c6:26:cd:aa:ae:77:93:a2:a2:97:6c:1f
-	93:d4:20:37:d5:f8:03:db:22:cb:7c:de:97:f0:4c:2e
-	c8:57:ee:7e:6f:95:fe:b4:37:70:36:d0:5e:d4:fb:29
-	0f:74:da:45:4f:c4:83:e6:f5:e7:63:8d:28:2d:36:08
-	52:ee:5c:f3:15:fa:98:c8:22:1b:01:8c:71:1f:ac:05
-	ff:c6:5b:c3:7c:a1:5e:b8:e5:f3:b8:3b:b1:70:b9:f1
-	be:
+	0b:81:01:5e:44:50:b1:e2:3f:99:45:3a:6f:97:ae:f9
+	b3:e9:fd:bd:d1:3e:f0:82:30:69:d7:99:89:fa:75:e8
+	e9:64:f2:76:6e:72:3d:81:c1:bf:5a:21:63:06:71:e3
+	28:92:bd:58:58:35:b5:d3:65:5a:79:89:01:bd:09:70
+	2d:b8:89:c3:76:25:f0:41:d7:72:08:0b:59:e8:8f:4e
+	22:fd:e9:97:a3:4a:13:40:de:1c:0f:fc:3f:87:a0:4f
+	ba:6e:41:cb:e7:df:04:67:90:14:3f:dd:18:33:01:6d
+	3b:a8:ae:7c:5a:e2:23:e1:9c:2b:a0:d6:8f:d1:8b:8c
+	c8:ca:39:17:11:82:65:d3:a2:c0:05:d3:bd:c5:b0:17
+	ea:62:a5:1a:fe:3e:c8:f0:fb:c6:5e:6b:60:50:a7:34
+	f1:ff:a9:70:79:16:ce:9e:c0:15:34:b3:cc:e6:22:1b
+	02:bb:b5:59:2a:b1:b8:82:f5:4d:b1:6b:a1:27:a9:1d
+	4a:22:44:98:08:c3:7e:34:7a:01:56:27:29:20:80:10
+	27:10:b8:d1:ab:d1:d6:5f:69:80:68:27:74:96:41:7f
+	c1:91:3a:b1:25:c0:39:e9:58:f6:4a:36:3f:73:c9:ab
+	39:7b:02:72:76:7a:2f:74:5a:63:93:b0:b2:52:d8:2c
+	
 
 exp1:
-	2c:b8:49:2f:fe:d2:28:e6:e9:0f:2e:9f:87:3d:95:26
-	58:56:db:0f:06:1b:89:d6:97:82:77:bc:a8:63:c1:b5
-	9f:cd:9f:40:55:59:5c:cf:a0:94:1e:78:7a:7e:3d:f0
-	95:1b:81:fb:d8:68:45:37:c0:57:6a:52:0c:a8:dc:64
-	2d:56:0c:38:08:c3:c8:b9:fb:e6:60:1c:db:4a:70:16
-	b7:92:e3:b6:c7:f0:83:77:67:43:95:51:6c:cc:a1:2e
-	bc:4d:30:2a:9b:ab:c8:b1:92:8a:04:80:ef:1d:43:aa
-	76:2d:17:c9:f6:b6:74:5d:f2:34:6e:fd:53:08:f5:ba
-	7e:51:6c:3a:0a:46:78:06:2d:9f:35:34:4f:5c:37:3b
-	6d:c5:e7:e6:9f:c3:c1:96:14:a7:49:dc:1b:40:36:7e
-	a2:29:95:db:bc:b0:76:2d:9c:04:a1:ef:dd:8f:04:c5
-	79:15:0e:4c:2c:f4:75:8b:a5:6c:04:1b:d2:6a:88:ea
-	1d:56:b0:e9:31:de:23:9b:da:f6:01:90:53:73:70:74
-	f3:9b:0b:6d:1c:12:d0:46:dc:7d:ce:c4:18:6c:8f:8a
-	cb:15:7b:c0:7d:83:7c:d7:a1:22:2e:ba:a4:a4:94:2a
-	8c:d8:d0:5b:48:bd:d9:ba:6a:72:e2:24:b0:77:6d:51
-	
+	00:af:90:01:f9:de:ba:23:b2:99:a5:16:7e:69:16:2c
+	4a:bf:27:e4:f2:96:04:7f:bf:36:d6:7e:d9:2d:17:9a
+	7a:0b:e4:21:fc:75:1b:01:1b:6a:61:42:8a:96:65:44
+	e8:dd:78:c9:3b:02:4d:1c:e5:b9:c1:97:0c:a8:11:fb
+	2f:06:97:d0:60:ef:b7:48:05:8c:e9:39:b0:bc:02:9a
+	1d:69:24:b8:30:6b:17:7d:e4:b5:d9:e8:a0:f5:8a:5b
+	c7:ef:19:e1:51:a8:b8:69:65:d6:2d:9a:2e:ab:dd:4f
+	c4:d3:15:8c:f7:97:9e:83:3a:07:cf:6f:19:51:66:49
+	c6:8c:d0:8d:42:97:5e:09:83:90:ba:08:16:d4:12:28
+	3b:56:67:30:8f:6e:df:14:c0:0a:85:1c:6f:2b:9c:d1
+	4b:1e:50:cc:bc:af:a5:d2:84:b8:ce:14:1a:f8:4f:e6
+	28:b3:96:89:1d:f9:55:d9:40:77:02:ba:a0:45:89:d5
+	76:a9:af:e5:e6:b1:f8:31:c4:ca:2f:df:c4:14:3c:b9
+	71:57:d5:e7:75:22:7d:d8:ab:3f:f9:c2:b1:40:aa:50
+	42:12:de:c2:49:00:59:07:07:3b:3f:55:96:5e:0b:25
+	c4:bd:de:ff:2c:c7:09:fd:68:1b:37:55:3e:93:93:ee
+	eb:
 
 exp2:
-	5f:72:b5:a9:a2:03:21:c1:a9:64:a6:82:63:25:11:b9
-	28:18:a0:32:20:a5:14:70:a0:d7:75:53:31:ec:b6:b1
-	53:71:82:0f:60:34:e0:1b:2f:05:cc:d8:43:5a:f9:e1
-	ec:75:ec:c8:85:09:cd:55:e9:78:27:e6:f2:67:61:d8
-	fd:ff:2d:09:1e:16:4f:3b:37:82:36:e2:f4:4f:3f:18
-	4f:45:6c:2c:de:5d:a4:c4:9d:ec:cf:fa:64:8a:99:ac
-	26:f7:f5:96:18:77:eb:ed:2b:75:fd:33:7d:7d:cf:f5
-	87:f1:7b:2b:68:df:53:e8:67:3b:1b:c9:0b:73:60:e4
-	8d:75:20:63:73:d7:91:ac:af:6e:15:80:dd:3f:c2:83
-	90:e3:14:ed:02:45:89:85:b4:3c:8c:cf:93:f0:b5:33
-	e5:7d:dc:fa:fb:1f:1b:08:ff:bf:f9:76:ae:a3:69:20
-	2f:ac:11:ef:ac:3a:9d:0d:4c:ec:ca:79:bd:1c:79:28
-	45:91:fa:17:be:8c:6a:f5:8d:88:d3:cb:ee:3b:5e:1b
-	35:cc:9e:5e:33:7e:f5:8c:92:25:ad:17:fe:21:e6:01
-	ca:85:32:9f:0d:b7:0c:d8:d2:11:57:8f:9f:b4:59:8c
-	3f:27:a7:1f:fd:16:0d:99:11:bb:8b:5f:e7:25:2c:19
+	1d:39:2f:2d:4d:c3:02:46:c8:71:ec:71:63:99:38:9c
+	73:96:69:f6:75:22:d9:b4:5d:8a:b8:d8:f7:19:cb:2e
+	98:0b:18:a7:cc:03:ec:b9:26:54:07:5c:2f:8f:ca:98
+	d2:52:1e:c3:7c:73:6a:94:b7:82:55:50:c5:31:8a:ce
+	e6:8d:cf:a8:c2:3c:d1:59:16:b8:26:f1:69:d1:6f:b0
+	67:6d:37:d5:23:24:fc:23:43:08:b5:ed:ef:46:4a:a6
+	09:ce:d8:4f:5a:6c:1a:ea:38:40:65:58:ec:4b:4e:64
+	8a:97:2c:0b:df:fa:5c:0a:ff:eb:16:b0:b5:cc:7a:06
+	5e:f0:3e:e6:34:32:16:6a:c1:02:a5:c3:a1:56:96:e3
+	28:39:07:2c:4d:81:9b:a0:aa:a2:6c:9b:e5:47:32:c4
+	d5:de:2c:d7:0c:cc:5c:c5:6a:4c:2e:b6:58:92:3a:56
+	30:eb:ef:e2:3a:3d:5a:d7:fe:a8:b0:d1:e2:57:a4:9f
+	88:d6:68:c0:bd:7c:92:9e:58:ff:25:cd:77:6d:51:50
+	f9:2e:79:f4:8f:4d:2a:e9:70:e8:3f:73:09:21:25:a0
+	00:0c:2b:54:8d:c2:fe:96:f2:cf:fa:34:b2:7d:f5:91
+	05:3d:fc:6e:13:f3:cb:db:21:24:47:68:40:23:46:b1
 	
 
 
-Public Key ID: 70:21:C9:E3:47:35:C5:E8:F3:54:AA:00:3A:81:11:1A:32:BA:05:60
+Public Key ID:
+	sha256:01:06:99:B3:BD:7B:A9:83:6F:D4:D0:AF:49:52:0D:19:23:66:EC:EB:7E:8C:A7:E0:4A:C7:DC:A1:C0:98:9B:76
+	sha1:12:36:64:E2:56:30:BA:40:80:3C:72:1B:72:42:15:1B:E1:27:B5:C3
 Public key's random art:
 +--[ RSA 4096]----+
-|BEo+ .....o+.    |
-|+=. . =...... .  |
-|o .  +.+..   o   |
-| o  o .oo o o    |
-|.    . .S. =     |
-|          . .    |
+|*o.=*o+          |
+|*o=o=*.          |
+|o=o*oE+          |
+| ..oo..o         |
+|  .   . S        |
+|       .         |
 |                 |
 |                 |
 |                 |
 +-----------------+
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIJKAIBAAKCAgEAzhorPKY3cEsyvbKPvLn6aA3RArbRAgDMR+a4knyMWpQ8Nhb+
+xgLG/CUAO/fHhuyltw6vg7dx3+X+5jXMc7dfZf2YNGZTAn7jAlpTYPJMMO5m/VCO
+aiDdymU41YHYuV64pmKCrDv5EeHEFi7A2LuCXfsn+jIV6iPs6ASbgCavVs8yVp2S
+b4qrrXVlgBuOv5ety369mNi91YotwZ8jbI1qAAe/nujrJwshg1qSTGTTseaZ0aAg
+imuoE+BsMB59VL9fVUEBH+dn7Qp/ff/AQpwjJK7hrCL9177bLMp23t6uyGkZlqEq
+lJ1+1ZTP4fl9ZOPmGhZE6laohcLxkI0VThH8jmoOp7nQWWkjzAqj28qSYfbXd975
+pw3ZdztqTt3vgVmvWLWJfOfXcJ4++OUu9Boocsirxx53p4ONjz+a5BQ7RI0dDEx0
+yKmrzDTmuBiLqeZPxQBwtYRBIw0gsGCIp8jYGdlzBg39cETQ48BA0jwKdDO819+Z
+Ch4ZlE707clz/GMR2v3DiGQTOac8vlagpmsWsmzNtGjLEZKKAlppx/OMoOKEi0LG
+A7Nos+Du6RzKYKEqkGwLW2gxj43AFPjr9Pvr+sbUectDLZz3DvwXkrsBvz7ySObS
++1LZWMgt5mvT+NSx5oHSaok4g/fZfBf2jHABuIHTkGiTlKaO3NjAwj3nEZkCAwEA
+AQKCAgA1x5RSrhi3P5gM8eQZ3fmeX0STzbp6KFUlyemNp9xD4nxXrOZsKttbfhgy
+jbRN28BeJQHdf+fCAdTio1UnOMk25tZpje3JL+zydzlcib0h44OSRAv1W4AkSQds
+hwZTUIkkOX5ZjQiwBtZQ54BAzaT1+wxyd9FKGHfADzu4U9/a6hP7kABfBLNJfuGu
+bQJxshWSjQ7SLHRUnUrVRD5NHBV1zo/M2oBJ3tiu2tpj/sdSm5a1oW/8Tp08GoqA
+f+Q6UfmBWIX/mjV/IAcmjK7Rcsak0tFmRncwbcfpRyd/fmHjP7GCoalnwDURbFRW
+ZfC3e9RWKEtxTo2I4daA3p+ZkI3y7weu22X7cJCJIsbeagaDARZRoLs70u2YzGIk
+3zfgmAaziB25xhzVpxjltzs0D2OQ8asLPua0mlRpQfbFrQNEskhIZlWoSw67Q0hT
+pwcjpgZkRrXjnZuy3jVnzebhOQ8Ni8WLaLs4hreggfSwifptLVaAd2ZtMgIfk4JH
+ATc1lW1Vh5x1zZr5FvQJO6hgR140f2tYmcjb+2D13VScJ0Jbp04nKJKvxnZWxQ/b
+cxzgBr1KT3U3GTmap3/yjBikJXfE6Uo6nTqDZyu/vcVNuzdojm+pDWfUh+lZAmFg
+4T+wgYGJuilK8DdLQpWQmf19qTAxM7rchmvOKZiLN/JysZB5pQKCAQEA/FlIFfft
+Gn0Lui1Osr11EKTzaCvbGGqy/5PIDcRMVZlYArpgQ4HuCRTlWjiRN232tEuzXr6e
+OkMnpwYGoa7dNi+MsRcdtVW8GgXMNdIDJRiX94SkKxj5UGfuP8mM0TWVDp0oC/Wd
+AM3l6UM/ipBZwa6idGAryJxQnvhf8ocTNt2Os9lSTCZAf7ZSgZopkK+Fukqc5jhO
+fZ4FLuSvsaRRXf4fzqqy4rh0n6yGx6upXluKM0nGFPEQDdYCVWpqV5JcIbPIz7JJ
+eMsjR9P1WsmtLE0YncQrhOCR2YuZzs0Cy7DC2wL1I6Ln1JPtQHLrKUtxhUYD0/La
+0/E/ibDPeikrXwKCAQEA0RWWNDt7Ma9dB4PIGyBQM1E9ao+DgIbMG7LR0mNY00tv
+1m76GAbznw0cxv4uZHK2zY2Ok+BxxosgK0kymXDoiVERY61T/6cuDzz446BjFqIS
+RGUf1OiBA1Sf4x7GqGj6+3D3rVn544705OEuxjX1Q4yDNC3yT+5DaJUW6VH5vBxr
+82tGg7J9kGrMisuoMd1kz2BYr92CmlWVNvrPiSQ4rb11AiiDj5UtlZ7FRNfFgMtT
+dIISndYb359uqG2kmR+5uYO7yLnxsZrRphZDcagnTW3DRhDNvhsDrxxnnBNYR5Py
+B+tzZfCxzRARWyDGKrSf8FJTD+KKKuXB0/hNH2ZeBwKCAQEAr5AB+d66I7KZpRZ+
+aRYsSr8n5PKWBH+/NtZ+2S0XmnoL5CH8dRsBG2phQoqWZUTo3XjJOwJNHOW5wZcM
+qBH7LwaX0GDvt0gFjOk5sLwCmh1pJLgwaxd95LXZ6KD1ilvH7xnhUai4aWXWLZou
+q91PxNMVjPeXnoM6B89vGVFmScaM0I1Cl14Jg5C6CBbUEig7Vmcwj27fFMAKhRxv
+K5zRSx5QzLyvpdKEuM4UGvhP5iizlokd+VXZQHcCuqBFidV2qa/l5rH4McTKL9/E
+FDy5cVfV53UifdirP/nCsUCqUEIS3sJJAFkHBzs/VZZeCyXEvd7/LMcJ/WgbN1U+
+k5Pu6wKCAQAdOS8tTcMCRshx7HFjmTicc5Zp9nUi2bRdirjY9xnLLpgLGKfMA+y5
+JlQHXC+PypjSUh7DfHNqlLeCVVDFMYrO5o3PqMI80VkWuCbxadFvsGdtN9UjJPwj
+Qwi17e9GSqYJzthPWmwa6jhAZVjsS05kipcsC9/6XAr/6xawtcx6Bl7wPuY0MhZq
+wQKlw6FWluMoOQcsTYGboKqibJvlRzLE1d4s1wzMXMVqTC62WJI6VjDr7+I6PVrX
+/qiw0eJXpJ+I1mjAvXySnlj/Jc13bVFQ+S559I9NKulw6D9zCSEloAAMK1SNwv6W
+8s/6NLJ99ZEFPfxuE/PL2yEkR2hAI0axAoIBAAuBAV5EULHiP5lFOm+Xrvmz6f29
+0T7wgjBp15mJ+nXo6WTydm5yPYHBv1ohYwZx4yiSvVhYNbXTZVp5iQG9CXAtuInD
+diXwQddyCAtZ6I9OIv3pl6NKE0DeHA/8P4egT7puQcvn3wRnkBQ/3RgzAW07qK58
+WuIj4ZwroNaP0YuMyMo5FxGCZdOiwAXTvcWwF+pipRr+Psjw+8Zea2BQpzTx/6lw
+eRbOnsAVNLPM5iIbAru1WSqxuIL1TbFroSepHUoiRJgIw340egFWJykggBAnELjR
+q9HWX2mAaCd0lkF/wZE6sSXAOelY9ko2P3PJqzl7AnJ2ei90WmOTsLJS2Cw=
 -----END RSA PRIVATE KEY-----

From 424592b873b0c4da1b8e33e0c6858452e9707d47 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 20:12:46 -0500
Subject: [PATCH 308/879] PKI: Updated CRL

---
 test/test_certs/server.crl.pem | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/test_certs/server.crl.pem b/test/test_certs/server.crl.pem
index e065a427d..c77e221b2 100644
--- a/test/test_certs/server.crl.pem
+++ b/test/test_certs/server.crl.pem
@@ -2,17 +2,17 @@
 MIIC+zCB5AIBATANBgkqhkiG9w0BAQsFADB0MRUwEwYDVQQDEwxsb2NhbGhvc3Qg
 Q0ExHjAcBgNVBAoMFUfDtnRlYm9yZyBCaXQgRmFjdG9yeTESMBAGA1UEBwwJR8O2
 dGVib3JnMRowGAYDVQQIDBFWw6RzdHJhIEfDtnRhbGFuZDELMAkGA1UEBhMCU0UX
-DTE2MDEyMzIwMTc1N1oXDTE3MDEyMjIwMTc1N1owAKA6MDgwHwYDVR0jBBgwFoAU
-fsoyZJC0KSNlyOz1CNWJn7lYdqMwFQYDVR0UBA4CDFaj3/UTIU7wShpaKTANBgkq
-hkiG9w0BAQsFAAOCAgEAKoroGrROhuvGeFuOSlCooYfmwphonVGVDiel9jZL3SCa
-JDGyVKetxB/kVm32wdoidjq42fYqB2ZJiIbLQld9wy899S6hXqAUx18HsvvZ5PCW
-VJEMqR5avj1awAKgYL0lW/B8TZI2AZFow9TM+M2CLf2mp1qVWDG2DuVhuojfTPSR
-g5vHdHBEK9aFwTnZICnF8t3jwHFxUTT+sHrQduOghOuvY9In6SCc1ReJTa06hyBS
-YJGBZLvZ0dRZE5INuKBRPNAlqtnHo9RgPux97Of/BGk6ybzqaHOCu/56JRbvKIF2
-XEa2zCcbZgfW0Qu5Kze+yrRfdCnefSGQjJtCsAPRn4l+v4AzHJccIDN8cDLXdwlZ
-qk1VvxYi2a8iQWnPzksOPNyOi0341nm0NR4hg2GyIUHa6TIC2xgGGpxo9t8w2th6
-+WY6IRtS6zuMRAfCjolOy9q5eqCCOG5caZz12McJ94M1M5vh5KaS9kcE9laXvsyv
-p7YFLyBL9ijhMGWz/Brng+fCHvpqgv9dc+HlW1IFEYurF1Z8eQUcJ+Vm78CSrHKk
-psbmFfcV1NUtNNCYUPwCp+w958XER8l0xW7Ndw8Z3dHJcfUCB/r63bXj2v6HMezl
-XWeRFGfRSmRDVsmbHNleZTty6sTAuwhAfqcD4lvKqe881K5SpPX3DG9kqczXmjI=
+DTE3MDEyNDE1MzgzOVoXDTE4MDEyNDE1MzgzOVowAKA6MDgwHwYDVR0jBBgwFoAU
+izsG8YCsFbWGBtRTvF1NZ/AkC+AwFQYDVR0UBA4CDFiHdP8sH+YAO+X4pTANBgkq
+hkiG9w0BAQsFAAOCAgEAhbN7sB2e4R/K0E1drwX1O5Uz9B2XiEt8aHO+LKcuGbsp
+u6m+M0QwkxBPVdcG2bdpoN0Q5YZr/azRiiZz/FtmoxkFiLziP1nLm2uJ68QTrzk7
+61vqZcM+oOKhjPMkf2YORHBFbwVOm/JDobDFrHjbE7gCMQD93L1TW1mlYdoujSV9
+qpUHZkfwJ7tlaNtMMSaGrtRh8PCl+TpzMvTpG30LPZY/VHlHxrb3RQL05ReCoHsn
+r2OHvzEh3E4/YjKjXKIVVFvZh4K6ljdPWgOeizGcp+LxHySe/HKgVr86ia2xKEqw
+tbSGD1okRrDrRu0rmRhAYgLh8BoKeJXROOKcyogDc3ViMNGJwVBE62ZajL/HcjPs
+NSSeaNoYt+njRUpOWF2RFj4pLDZQc2VNWTDiJR+ljvlBlqdZ/Raia9J76tU1MuAs
+wDTTTZpOA7URMqgR0gUigOGB2kSsWthscTfc3viL7WXBuh7a+3lURwQf9t3TnZLH
+HTNQNBgQS84Gyt8y8hOx5dlnxBoRr1+BZT90VlqE9Ccllrins74uK/pGVNyIvKNg
+Fk6Wfo9iCanP4Usdg1qj8mVAye8Zga/q/6C9/mpQ9rSc6z/vcoQ0Fehd03msTHpz
+++7djv8LKLsCd5TyCFsSCgAFxZL0qR6cp7S8K6kH7XH216TAag5Q+Zdl2j26law=
 -----END X509 CRL-----

From 9ccb83be578dfeedf004ee81c61b6ca015c634a4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 24 Jan 2017 20:15:47 -0500
Subject: [PATCH 309/879] PKI: Updated test_client

---
 test/test_certs/test_client.cert.pem |  56 ++--
 test/test_certs/test_client.key.pem  | 418 ++++++++++++++-------------
 2 files changed, 238 insertions(+), 236 deletions(-)

diff --git a/test/test_certs/test_client.cert.pem b/test/test_certs/test_client.cert.pem
index 28d8b71a7..27838d74f 100644
--- a/test/test_certs/test_client.cert.pem
+++ b/test/test_certs/test_client.cert.pem
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-KRJyiJcg6g==
+YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApOz4wcdTiEdj
+O192j39Q1EhzLq9qqZghpWUxQHSV0/Fpm7kUj/wtK1xky130+H2ab+k/Sp8jjda0
+TVV7es7yXYQM2iYEDIc1i3oCtygFkISFpzNG5SGLV2GANovwYfgPhvpnGo9inAVJ
+lXv2DJouLBxsL3c86dA3auMjcJ8FNgfvSJ7So7vEdoZQo1QGKpToUUVPD9e+K/y+
+j4WI8swP8lJaZ/EIDK74ESAyyk7R+jYjItF4GrwR7RM7CxWHOENwO/3pxbiJF+oW
+XOt+2jsTTKyL1FZJHI2beBcPvQql9baBY/q0koT7cS8PJiGI/D6TqXQ25XkbTG/l
+dmzJ7K5toLJ+7iUcdt+q8sF0owS4hR/3VUXM24DgBduzvmihD9G0k0wDNmjHu3te
+8tGQogvMJRTUtiw1AEO2DiUUZqd6p/pFGrJfRyxU6nHBvr1ADeClBwcQB0hH2mVD
+59affexzBsUwhouk3v0fTgNQpX2/qfeKwVbnV4bEN1fd+xSwzdmSelLa6rE+pYER
+JOl+zdLSq0AtZE2GTp2A60jk+AurALcQqhdNU9YV8tCVhFTidO49GXqTmuAJAzvu
+SAoIqCFuU1TWeiNQCHI3clzxUAZcqDBxTZUvbkP3QK7v0Ib5c7HiRp5kmO4CQuUg
+y8mT1RZhaMp9qIy3HKUNEBdYwhj45wECAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
+BgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQ3
+DVC7k5DA5XjW4dD+mWRthF48NjAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
+8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEASw6rojEtxVNLmqhuCGRXpBkeJcEC3hgd
+usOmw3QFwMRwG0JkQuDTZobs20bWCSJzCnGcou6mvdOhjtaErZ/KUA2uAr9YvlmO
++F7mpXlGjfETm3Ta8JzvTtqgCPjQmz+Wn7nnFmwl9MLOOh//NXQ1KJd/ixWtpaLG
+GhY3zduNczLT7O+qganFneostaZFpa/BL3PVXoI669zp7GmzJYSjuxQIyAMP/hKJ
+aFfTNIv9WhPzXrzEviLspJ7OwfWW/S46WZWcXzauXiYS5y21rfFSBSAo1J3oRV95
+qi2IMM4PVpwQISMPwdJe3f2+Gc6qn3TaHFrnSv8OuRNOdvuqV9MLn9uxovgTTyw4
+j1sb7kO6OoLCqrbdZ+lTHy48jahpV3q+Vcep8WA+fC42sV/lfMuuS3EaQTJIfu89
++R+pFQPco60risM8Gy/k0QkwxVwoxsq5xM+SaGyHpEazSasX/qJBj+VH97a9rlje
+fzPpmApWRtZNMNx4qSx7ZEFVtSynM7vDWsWsB9x+OYdObzl4bbZUZ3MSCY0/smGO
+PIbNPmqhlr8bRuJGGlXuftOGLPnssWrZSbQhMzBJQWGiKsHQF+AsdQzaDrtgwuWM
+6REkiXd/cs0QXZh9P2ZzzIqKuIwwOazppJ5mdenWx/0X3Ex7PfdiGZPL8f8DEE7/
+lHXLHvTvWag=
 -----END CERTIFICATE-----
diff --git a/test/test_certs/test_client.key.pem b/test/test_certs/test_client.key.pem
index 3cc5e495e..6bcd83661 100644
--- a/test/test_certs/test_client.key.pem
+++ b/test/test_certs/test_client.key.pem
@@ -3,236 +3,238 @@ Public Key Info:
 	Key Security Level: High (4096 bits)
 
 modulus:
-	00:e2:fc:08:8c:ff:e7:a7:86:1b:53:1f:7a:04:f6:b3
-	13:3a:70:60:93:12:27:5c:0b:b1:fd:38:16:7e:ec:d6
-	cf:15:65:40:31:2f:29:da:01:5e:73:c9:e9:e2:fe:b4
-	ab:3f:51:17:2e:16:46:ef:aa:2e:1e:23:42:69:7e:1a
-	6e:7c:ea:99:fc:b7:9f:66:ac:8e:43:cc:38:e0:35:20
-	67:e0:03:69:b2:87:3e:37:4e:2c:67:cb:95:21:7a:51
-	77:25:3c:15:02:df:38:47:32:e3:5e:ff:74:2f:b9:3d
-	46:ce:44:bc:dd:2c:f3:89:15:a4:32:37:80:25:7f:82
-	2e:a7:29:c9:42:61:08:2e:56:cb:4d:6b:4c:e9:92:a9
-	6d:43:ff:3c:3a:cd:50:d0:fb:e9:41:59:f9:13:e2:fe
-	db:3b:df:ca:83:10:8f:51:1d:14:ff:8d:4f:c3:7b:0a
-	94:ab:4d:ef:03:2d:c1:ec:2b:ef:32:56:6f:be:99:bb
-	e4:64:e1:6a:ed:94:70:aa:15:e6:30:1f:98:9e:f3:74
-	3a:37:3e:e2:82:b8:ac:bb:ad:08:94:c3:fb:da:27:84
-	71:12:9d:38:00:da:18:85:de:0b:b4:15:70:ef:a8:76
-	f6:e9:d5:b9:c4:99:61:82:8b:a0:ea:11:0c:f6:38:a9
-	4e:32:a1:f2:7e:8b:71:32:42:79:a0:df:19:0b:20:9e
-	64:99:0e:68:02:05:4d:d0:f6:d6:2e:bf:85:34:2d:bd
-	db:04:f1:59:57:0f:07:4b:21:e9:a3:95:2d:11:aa:e3
-	36:4d:7a:22:8d:eb:05:cd:88:2f:4c:13:3c:68:ea:cc
-	57:82:a8:d3:fc:78:2b:99:15:ba:0e:8a:46:43:5f:51
-	da:e3:0d:3d:24:cb:f7:8d:bf:75:6f:c2:e8:3f:f3:39
-	ba:29:07:6d:ec:37:ea:ba:4b:46:f7:e0:87:70:6e:73
-	ca:58:0c:b6:b6:34:d2:46:10:0b:4a:2d:5a:5b:43:de
-	e3:89:eb:74:c3:0d:77:c9:46:2b:3b:b0:a4:8c:b0:61
-	54:99:18:ec:1d:f5:ae:ce:d3:0b:a2:a0:47:e5:fa:43
-	ba:81:bc:d1:f7:ed:8d:a4:93:9b:af:80:1c:f2:2c:b4
-	0e:d6:fa:25:4c:26:dc:b8:48:ba:01:b0:86:1c:a2:16
-	7f:9a:34:72:db:84:84:7b:49:7e:df:a0:95:1d:73:10
-	f5:36:42:f2:ee:48:b6:2a:1e:5d:22:71:31:c4:dd:9b
-	68:17:fc:c2:5a:b5:df:8f:55:ac:4d:fc:69:d6:74:08
-	f3:e3:e0:60:f5:c4:65:b6:f4:2a:70:ee:3f:de:03:48
-	57:
+	00:a4:ec:f8:c1:c7:53:88:47:63:3b:5f:76:8f:7f:50
+	d4:48:73:2e:af:6a:a9:98:21:a5:65:31:40:74:95:d3
+	f1:69:9b:b9:14:8f:fc:2d:2b:5c:64:cb:5d:f4:f8:7d
+	9a:6f:e9:3f:4a:9f:23:8d:d6:b4:4d:55:7b:7a:ce:f2
+	5d:84:0c:da:26:04:0c:87:35:8b:7a:02:b7:28:05:90
+	84:85:a7:33:46:e5:21:8b:57:61:80:36:8b:f0:61:f8
+	0f:86:fa:67:1a:8f:62:9c:05:49:95:7b:f6:0c:9a:2e
+	2c:1c:6c:2f:77:3c:e9:d0:37:6a:e3:23:70:9f:05:36
+	07:ef:48:9e:d2:a3:bb:c4:76:86:50:a3:54:06:2a:94
+	e8:51:45:4f:0f:d7:be:2b:fc:be:8f:85:88:f2:cc:0f
+	f2:52:5a:67:f1:08:0c:ae:f8:11:20:32:ca:4e:d1:fa
+	36:23:22:d1:78:1a:bc:11:ed:13:3b:0b:15:87:38:43
+	70:3b:fd:e9:c5:b8:89:17:ea:16:5c:eb:7e:da:3b:13
+	4c:ac:8b:d4:56:49:1c:8d:9b:78:17:0f:bd:0a:a5:f5
+	b6:81:63:fa:b4:92:84:fb:71:2f:0f:26:21:88:fc:3e
+	93:a9:74:36:e5:79:1b:4c:6f:e5:76:6c:c9:ec:ae:6d
+	a0:b2:7e:ee:25:1c:76:df:aa:f2:c1:74:a3:04:b8:85
+	1f:f7:55:45:cc:db:80:e0:05:db:b3:be:68:a1:0f:d1
+	b4:93:4c:03:36:68:c7:bb:7b:5e:f2:d1:90:a2:0b:cc
+	25:14:d4:b6:2c:35:00:43:b6:0e:25:14:66:a7:7a:a7
+	fa:45:1a:b2:5f:47:2c:54:ea:71:c1:be:bd:40:0d:e0
+	a5:07:07:10:07:48:47:da:65:43:e7:d6:9f:7d:ec:73
+	06:c5:30:86:8b:a4:de:fd:1f:4e:03:50:a5:7d:bf:a9
+	f7:8a:c1:56:e7:57:86:c4:37:57:dd:fb:14:b0:cd:d9
+	92:7a:52:da:ea:b1:3e:a5:81:11:24:e9:7e:cd:d2:d2
+	ab:40:2d:64:4d:86:4e:9d:80:eb:48:e4:f8:0b:ab:00
+	b7:10:aa:17:4d:53:d6:15:f2:d0:95:84:54:e2:74:ee
+	3d:19:7a:93:9a:e0:09:03:3b:ee:48:0a:08:a8:21:6e
+	53:54:d6:7a:23:50:08:72:37:72:5c:f1:50:06:5c:a8
+	30:71:4d:95:2f:6e:43:f7:40:ae:ef:d0:86:f9:73:b1
+	e2:46:9e:64:98:ee:02:42:e5:20:cb:c9:93:d5:16:61
+	68:ca:7d:a8:8c:b7:1c:a5:0d:10:17:58:c2:18:f8:e7
+	01:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	00:8c:f5:8d:6d:da:c2:06:c3:fe:96:19:57:12:5c:0e
-	0b:63:e0:43:e9:31:7d:e5:e8:91:69:3a:7a:a5:e9:f8
-	e0:73:5e:04:86:46:ce:cb:c6:cb:dc:46:49:0c:21:b7
-	1b:1d:e0:02:f0:28:ff:76:78:8d:d9:43:76:4b:c2:f7
-	31:24:3c:20:d2:d3:49:97:5e:93:9e:c0:e5:95:3f:08
-	d7:d9:42:e5:51:ec:31:13:f1:65:1c:34:4e:71:92:df
-	a2:89:2a:0d:b6:51:df:46:3f:f0:f9:9e:d4:8d:8a:90
-	e6:36:d4:73:21:3b:78:25:ea:9d:a4:5d:d9:23:f0:52
-	6d:1c:7c:93:b2:b8:45:77:59:89:39:93:e8:18:a9:6e
-	b4:1f:65:13:07:45:57:e9:e0:77:13:91:87:5f:f5:38
-	e5:f7:01:dc:66:96:53:1a:41:60:37:ef:8e:d8:4b:c1
-	df:5f:9e:af:4e:9f:0c:ed:d8:be:db:d8:d7:de:5a:e4
-	57:4a:da:be:27:ba:66:59:09:ee:80:76:2e:b6:8f:63
-	df:7f:4d:7b:27:48:fe:64:32:69:c0:d1:10:c7:82:80
-	fa:23:60:25:56:4a:1a:ae:8f:9d:5f:01:6d:b8:37:3b
-	61:cd:07:60:2d:1a:3f:76:ed:b5:49:86:bb:30:f1:31
-	19:e6:69:1f:89:94:4d:74:b9:a8:87:68:d3:94:24:cf
-	4f:6b:c7:4b:91:54:55:8d:df:72:2a:17:f7:ab:1a:09
-	bf:29:79:3b:18:09:27:50:f2:0a:83:15:45:bb:e1:70
-	fb:fa:22:d1:65:e9:76:55:5d:38:fd:ab:47:9c:2b:21
-	b1:22:58:b7:5d:5a:b5:6e:4a:f1:a6:5c:25:8f:bb:84
-	a3:e5:7e:60:63:94:a7:af:45:e6:1f:73:0e:06:65:1a
-	2b:18:ab:0a:24:f8:b6:91:e8:02:f3:09:65:da:ee:3b
-	8f:7e:d3:d9:39:91:6c:63:54:03:29:30:fb:21:c4:14
-	c0:0d:01:70:15:ff:0c:a9:ea:d1:4f:38:a4:da:4e:d8
-	ec:d3:2f:9a:76:c9:57:86:39:32:f8:5b:bd:40:d5:94
-	a8:1c:83:1a:7f:49:d4:54:d1:41:c3:2b:61:5b:7b:5e
-	ce:bf:05:1e:aa:73:7e:9e:d6:85:38:65:33:da:4b:1e
-	25:37:17:59:79:3c:62:50:32:2a:d0:2d:f4:ee:ba:cd
-	82:dd:ac:5b:9a:fb:d6:25:67:76:07:e9:e4:3d:e2:12
-	4d:e0:ef:22:51:f2:69:15:d1:e2:2f:fd:9a:37:12:f0
-	fe:4e:d5:fe:b4:7a:00:c3:e8:0e:67:43:6c:ac:55:a1
-	59:
+	44:b8:a9:7e:b5:3b:cd:51:51:bb:ef:af:4b:63:d5:9e
+	5f:01:ff:b6:00:4f:e2:a0:42:76:c3:eb:03:a9:5a:c3
+	01:2a:6e:18:6f:56:b8:cb:94:98:3b:55:4f:3a:2b:bc
+	2a:5d:9a:8d:d1:79:d3:24:5f:c4:c9:95:c6:3a:6d:2b
+	22:56:e8:9f:66:98:81:ce:81:eb:b9:2d:f0:73:41:20
+	b7:40:50:51:7e:30:58:0b:75:09:23:b1:73:dc:9e:ac
+	79:a5:e5:48:5f:ee:ca:ec:39:19:1c:aa:0d:de:40:d7
+	08:90:db:c6:67:8f:55:bf:81:be:5b:8a:15:f8:e9:e6
+	ac:82:2a:0b:c3:45:fe:3b:15:04:8c:c9:fa:37:cc:0c
+	71:b0:db:9c:d2:5c:df:9f:55:18:20:a0:4b:eb:53:c9
+	b9:1f:0a:a8:98:9e:10:5a:35:68:a1:41:43:4e:a3:5f
+	e3:8c:22:94:55:2f:80:98:b4:a6:a9:9b:b2:d8:72:e1
+	55:5e:1c:06:d3:39:ec:c9:11:c0:6e:30:51:66:c4:47
+	f2:ad:e1:30:83:0e:6e:c3:15:6b:26:97:b2:d4:2c:6a
+	7b:c7:d9:33:5c:ca:24:ab:a8:dc:3b:1b:46:25:35:3d
+	fa:21:fe:ad:e7:a4:c4:58:eb:d8:48:c4:6a:e6:d3:ae
+	b2:f1:c6:b1:ed:7b:ca:23:fc:51:bc:9f:3a:3e:56:9e
+	6d:23:b0:e5:9a:46:ae:f9:ee:8f:1a:5e:cc:42:37:22
+	6e:4b:52:37:0d:36:59:72:1a:19:c1:17:f9:45:55:bd
+	33:ce:15:5b:b5:ee:a3:88:a2:b8:46:fe:b8:e2:93:54
+	0a:68:81:a3:b8:63:95:c6:b2:96:d0:f8:ac:d6:5d:df
+	97:58:85:6f:eb:2d:66:3b:27:7a:db:2c:7d:8d:04:01
+	44:af:4a:91:2e:e8:f7:6c:e8:52:7a:70:a4:31:9a:f0
+	b7:d3:bc:dd:f4:46:d0:61:f9:5f:57:98:c0:79:b9:e1
+	0f:6e:76:33:66:46:82:7a:31:61:a4:88:19:48:15:86
+	0e:b1:40:6a:af:1a:3f:75:db:12:bc:79:c7:f2:fe:41
+	49:02:88:3b:66:33:44:12:9d:43:f4:e6:cf:0d:4d:c5
+	44:d4:a9:4e:0d:fe:dd:00:87:bf:5e:f2:aa:5f:71:cf
+	f8:4a:24:4c:2c:bf:ee:88:3d:f5:78:e1:5c:95:a7:4c
+	82:c8:65:7d:e7:b3:d7:98:b2:f2:4b:66:5c:1c:f7:d5
+	6a:6e:af:a7:e9:98:31:e8:92:99:1d:64:85:fb:8a:f6
+	6c:3b:a1:dc:22:be:fc:f8:8c:3b:51:c4:c0:dc:44:71
+	
 
 prime1:
-	00:ef:41:4d:b4:15:5c:33:91:3d:66:f5:26:e8:42:0a
-	4e:9d:28:a1:22:d2:31:82:ba:18:91:1d:9c:8e:68:26
-	e5:94:70:8a:fd:b3:f3:bb:be:e8:57:a6:07:dd:59:c1
-	d4:ad:63:bc:24:de:91:66:0d:42:0c:16:2e:bd:c2:25
-	51:a2:e7:1a:97:61:12:2b:58:20:8d:1e:12:d1:42:90
-	6f:46:5b:56:ad:fa:4a:96:55:cd:17:d0:f7:26:f1:f9
-	77:8a:4a:62:13:b9:aa:8d:a2:c2:24:69:09:18:98:fc
-	bf:2e:e4:0d:00:c7:74:13:a0:d8:8c:0c:97:7a:d1:f5
-	3e:cf:68:bf:38:2d:64:19:89:17:b9:48:eb:f8:57:f7
-	a2:75:57:05:47:42:6a:b8:32:cf:af:da:22:2b:05:eb
-	05:e5:7c:1e:a6:d4:d5:29:73:02:58:c5:8a:3d:cd:cc
-	70:b4:f4:5f:c7:7d:31:9a:6c:59:b5:54:b5:97:d0:b2
-	2c:07:7e:1d:0c:4c:05:f7:e8:b1:9f:29:04:08:1e:a9
-	35:21:2e:c5:7e:ba:4d:d9:28:63:66:ab:1a:58:83:e4
-	d4:bc:fa:9b:2d:23:68:b8:93:3b:c6:10:e9:6a:34:a8
-	4b:de:98:6b:fb:ad:c3:09:6a:f1:4a:85:66:dc:e1:54
-	bb:
+	00:cb:37:46:9c:11:91:72:90:0e:18:7a:ad:d9:c4:cb
+	3d:64:2c:47:9a:2f:04:69:05:d5:22:b4:f0:af:3e:30
+	26:2e:32:35:83:ba:e1:80:3b:5a:5d:1c:c9:ac:c5:85
+	f2:87:93:8e:f3:dd:7c:f5:cd:a5:77:8b:c2:bf:47:67
+	4d:c7:df:49:cd:41:bf:6c:14:f8:95:0e:db:00:70:d7
+	3a:43:b8:ae:43:be:a3:ce:48:5d:1b:c5:30:14:34:91
+	2c:6e:c5:00:81:ab:86:4b:9f:f0:ab:45:27:62:e0:ea
+	2d:89:61:a2:bd:06:4d:2e:c7:2c:9d:bd:fd:f5:39:b8
+	29:2a:f4:2e:bf:1f:13:9d:c8:d0:bb:56:67:d3:de:2d
+	31:63:22:61:5c:30:14:ea:b7:72:a8:f4:ea:d6:db:0b
+	35:86:a6:e4:8d:c7:c2:9f:2b:33:85:d7:05:45:f7:05
+	d4:5a:74:8f:26:4a:91:b3:7a:cc:8d:57:1b:c2:a8:b8
+	e8:b5:ef:b0:24:4d:1d:8d:03:a1:79:0b:d4:0b:06:1a
+	62:ca:5c:b8:aa:f9:ff:f4:cb:54:e1:6e:a5:d7:41:46
+	7c:2d:36:4b:15:01:c9:17:45:3c:33:44:79:4c:99:b0
+	43:0d:f7:c0:05:13:e5:82:3d:53:a3:2b:88:d9:ee:3b
+	83:
 
 prime2:
-	00:f2:de:e1:32:46:15:09:eb:5d:d8:a5:e9:93:5a:3e
-	b0:b6:8e:b8:4e:70:ba:9b:55:b4:ae:31:83:48:4f:32
-	e0:42:66:92:a5:f1:36:4e:4e:ac:32:84:6d:d0:eb:82
-	3a:22:ad:5a:32:5b:76:7e:5d:c5:1e:b3:1e:37:08:6f
-	7e:10:8e:5e:14:d2:71:c7:75:c1:33:49:de:c4:fa:33
-	a8:7f:cd:88:87:41:37:4a:c5:80:bb:92:93:2b:de:37
-	cf:b8:5e:a3:be:a9:23:ab:91:d0:04:72:08:cf:95:77
-	75:e0:37:86:ab:9a:b5:06:df:7f:8c:b1:7e:74:6f:c8
-	8b:53:0f:93:2e:ee:ad:a6:24:a7:4e:a3:59:bb:4d:3d
-	7f:5d:8d:e5:c4:54:01:cc:c9:d4:4a:63:ef:be:c6:0a
-	c9:32:5d:39:d5:80:2e:a9:46:22:70:e5:07:1d:af:f0
-	23:d9:38:d4:82:9a:da:d6:5f:89:5c:46:b4:15:a4:14
-	e9:7e:e5:1a:cc:6c:28:4f:6e:7e:c6:4b:d7:fb:15:36
-	ae:f8:df:68:82:93:1f:cd:7c:f0:65:8b:27:07:c5:23
-	ea:98:f0:c2:65:d8:4a:4a:85:ba:48:6d:de:5a:ca:a6
-	f0:ac:11:24:4b:52:03:26:40:06:0c:23:10:df:db:2f
-	15:
+	00:cf:c3:9b:a6:b3:b2:65:0b:88:8c:64:db:1e:00:21
+	42:a5:bd:47:75:0d:a4:29:e5:e9:9b:b7:1a:cf:df:9f
+	a3:44:9c:67:a4:a9:0c:87:97:94:94:40:54:44:3b:bf
+	1a:f3:71:97:05:d6:a5:ad:28:f5:a9:94:92:f5:7f:f8
+	cd:82:40:6e:ca:ff:d8:3f:18:84:42:83:dd:9e:87:bf
+	fa:2e:96:5e:fc:1d:db:d4:d5:dd:2d:c3:71:f4:bf:54
+	6d:06:21:95:8f:0a:89:b8:14:62:7c:a7:9b:10:fc:ae
+	4b:0c:51:ac:46:5a:ee:04:cc:e2:ad:fc:97:50:32:b9
+	c7:1e:40:6f:07:de:45:7f:2e:ac:12:39:30:b8:7b:6d
+	0f:07:75:bd:58:c2:e2:e7:52:2a:6f:7e:8a:2f:07:c5
+	eb:10:db:8d:10:2e:d4:a2:1c:28:ca:f5:c4:de:56:6a
+	20:f3:47:21:b7:4c:b6:04:93:86:e6:78:b5:89:64:cb
+	9e:f2:cd:78:e7:43:e6:a0:94:41:b4:c5:a8:c7:43:2b
+	20:17:50:7a:a9:c0:ee:db:9a:f0:48:85:1f:1f:64:11
+	4e:4d:dd:99:6f:49:7a:f2:65:2a:83:98:96:5b:a3:7e
+	64:da:77:00:7e:4b:7a:55:d9:cf:d7:73:fb:63:1a:f8
+	2b:
 
 coefficient:
-	00:b2:63:81:56:1d:9b:fc:9d:13:1a:11:87:70:ea:80
-	dd:98:bf:51:06:a5:96:29:ac:4d:a4:94:5c:ce:42:a0
-	d7:3f:b3:af:78:6d:24:f0:08:67:a1:89:ce:83:a9:43
-	49:af:03:3e:a2:82:85:f4:48:e2:0b:cb:03:d6:b1:da
-	92:b5:a9:27:d1:da:92:75:bd:5f:3c:03:80:b2:b4:57
-	57:35:b6:d8:3b:0e:3d:ea:5c:fd:bb:77:ab:bc:07:03
-	ac:37:42:b5:93:24:d9:a7:08:6c:0d:49:dd:df:66:44
-	ec:ba:a7:ec:81:58:27:fc:9e:cc:ec:22:f0:aa:4c:66
-	e9:a2:c9:20:b3:0a:9d:44:ac:bc:c7:5f:50:bb:54:22
-	ee:54:f1:a5:64:5c:0c:7b:0f:45:1e:c7:8a:56:1b:cf
-	9f:19:7a:89:9a:83:5a:6c:00:df:c4:f8:3b:07:10:f2
-	d9:ff:89:47:6a:ff:9c:48:fb:e1:72:13:9e:12:53:c9
-	b8:d4:e2:b8:72:4e:4f:0e:cc:3b:1e:7f:7b:db:3e:b2
-	54:47:84:54:39:3e:56:a1:b1:22:d8:e5:87:6b:db:77
-	da:82:00:0b:13:ca:d6:f5:3b:fe:ba:4e:c2:90:51:fc
-	d0:0f:78:7a:1c:37:18:6e:af:41:d6:b3:b8:eb:8d:25
-	a8:
+	69:74:f7:c6:34:ec:d8:f9:08:c2:d8:5b:6a:61:4e:33
+	b3:9b:dd:f1:30:8d:2e:bf:12:2d:74:de:53:6c:d2:88
+	e5:9f:5d:5f:f1:e3:59:00:c4:1d:e3:5a:1d:07:6a:53
+	ea:c8:46:0e:b1:61:5d:03:27:d9:1a:67:54:8d:bb:85
+	53:07:39:19:56:8a:dd:9f:f4:30:13:fa:2e:ce:1c:8e
+	1c:cb:d6:54:b7:a9:92:26:87:f6:60:c1:04:41:fc:7c
+	f7:fd:fb:a7:fc:f2:d0:2c:4a:65:ef:62:5b:f9:b4:d6
+	e8:f6:68:57:1f:b2:d1:d6:c4:78:0e:d4:66:39:cd:4c
+	42:d7:5b:d1:ce:ae:5a:b6:25:12:7f:d1:2c:ae:95:4c
+	14:cb:0a:31:7c:a8:0a:71:b8:98:c8:2b:03:19:92:d0
+	e1:4c:a8:c4:0b:8c:b9:8b:d0:9a:b3:8f:27:b3:a4:09
+	8b:6d:95:e3:12:a0:60:e6:e7:b9:8f:53:fa:b4:56:f1
+	cd:fe:11:31:20:01:fd:82:73:f1:51:ba:13:71:f1:0f
+	8b:78:3f:36:71:7e:15:93:35:01:06:8b:40:a3:b5:23
+	22:9d:c7:c7:88:c8:25:07:dd:0d:1d:70:43:37:3e:ea
+	25:b0:54:f0:5d:83:29:ca:5a:ec:4e:f5:a7:66:f0:fa
+	
 
 exp1:
-	26:6a:8a:ea:7e:7f:86:7c:2c:aa:ca:74:4b:d8:c6:c4
-	e6:b1:2e:66:63:ef:b5:38:e2:56:f2:b5:3f:9c:73:9a
-	6b:62:42:bf:07:d4:fb:f1:64:67:26:6e:9e:d9:19:a9
-	67:89:db:1c:e4:6b:de:42:04:b7:e2:1b:f1:36:2a:3d
-	d8:75:59:2c:b3:56:72:85:3c:fc:cb:b6:63:c9:57:5d
-	b6:a3:55:e0:ab:8e:ac:62:ec:82:85:78:19:d5:c2:a3
-	b2:1d:cd:6f:b3:61:32:4a:ce:f7:7f:b2:09:34:0f:69
-	37:43:40:df:3e:27:62:3b:72:69:d2:5f:c4:45:d0:26
-	1c:b1:89:fa:a0:37:31:6e:74:d3:b8:64:c3:44:84:ab
-	9e:41:b1:c4:46:62:d2:5e:be:40:53:3b:27:43:55:00
-	66:5f:ae:a0:45:0e:51:10:79:70:fd:8e:fb:eb:7e:87
-	1e:57:1a:c5:f2:51:33:a5:70:26:10:8a:f3:ec:7b:9f
-	5c:38:a0:bb:67:bd:91:97:d8:65:60:f5:97:c4:2c:91
-	2e:59:cf:36:50:fd:cc:ff:92:2e:5b:0c:e8:e7:8c:a7
-	a8:0c:69:3c:2f:32:52:68:b9:b1:4c:e7:dd:b8:c4:c9
-	21:dd:c1:80:f0:de:9f:35:7f:b6:e2:82:a8:b6:b9:9f
+	4a:04:cd:3c:45:8d:e3:db:a2:b6:b9:e0:9f:04:76:3e
+	db:40:e1:a7:c0:5e:6b:de:8a:fe:84:47:72:9d:45:2e
+	72:ff:28:cc:dd:82:0b:92:12:dc:fd:82:5b:e2:ea:62
+	27:8d:d0:b0:f4:c8:f2:43:40:74:e5:bc:3e:ad:c4:6b
+	e9:54:64:6e:55:f7:62:67:d5:0f:7e:04:b9:09:60:eb
+	c1:05:00:bc:7e:30:ee:0f:1f:92:e0:e5:1d:46:f4:65
+	e9:c6:e9:e3:51:55:ae:30:08:9a:69:aa:e9:f2:20:7a
+	0b:a3:3b:82:7c:4c:1a:b0:c3:88:85:4e:7e:46:d2:d4
+	73:e7:d3:2b:1c:27:a9:fe:1e:41:4e:3c:ad:48:2c:cf
+	e3:5a:ff:79:73:ad:fa:bc:6d:10:2b:7d:6a:5b:08:9f
+	2b:77:98:a2:27:d3:b4:e4:28:75:24:97:b0:1f:44:c9
+	4f:55:4b:5a:d8:28:6f:e6:57:a1:57:cc:2d:c0:04:f2
+	06:6a:d2:8e:b6:64:00:1c:05:71:b0:a4:40:8b:ad:8a
+	b4:48:c7:9e:c7:46:ba:a4:61:3b:67:71:12:91:9d:19
+	d7:e2:01:c1:1a:10:63:e0:7d:07:f3:75:f7:37:b7:a3
+	04:f0:6b:c9:ad:b0:98:1a:bc:5f:1f:99:4e:3f:de:ff
 	
 
 exp2:
-	7b:c9:63:a8:57:16:04:0f:45:ae:d5:a9:7e:64:21:cd
-	b9:ce:76:5b:ec:92:ff:f7:27:f7:1c:df:57:ec:9d:f6
-	b5:81:48:3f:71:f9:06:e2:8c:5b:d7:29:8d:b1:6b:97
-	ab:f3:05:24:e3:7f:3a:9b:1a:8c:32:29:35:4d:84:5e
-	11:9c:2e:91:98:4d:4b:a7:56:08:89:1f:14:f0:9d:81
-	c5:5a:01:bb:46:5f:23:2a:15:1a:05:74:23:88:c8:93
-	83:da:20:c5:5d:ba:03:89:77:27:bc:e3:86:c2:1c:b8
-	24:c6:c8:4a:10:b9:31:be:9a:69:20:52:5e:90:56:fb
-	c4:23:0d:16:7f:aa:5c:23:14:6f:3d:4c:cf:ed:67:69
-	d2:4a:2f:90:e8:6c:5e:6f:84:57:42:26:80:ea:b9:b6
-	a0:87:e9:a1:4b:0a:fd:55:f4:d9:eb:b1:bb:cc:df:ad
-	b5:da:84:5d:e9:05:9e:fb:e4:ab:f6:91:74:f2:43:82
-	5b:1d:f4:91:ba:92:b5:21:91:56:0a:74:13:d2:55:23
-	cb:4f:3b:1a:4a:58:8c:48:a0:d2:70:a1:3d:11:9a:e3
-	c8:7d:f5:e7:28:dd:7c:ac:3a:2d:0e:6a:a5:85:e2:9e
-	8a:64:d6:45:d9:90:27:5f:bc:75:55:2e:15:9a:c6:9d
+	0d:a2:8b:bb:83:fd:88:2e:1a:97:04:23:71:33:96:fb
+	35:bf:57:4a:32:4b:fc:c7:ee:ed:de:35:6f:41:00:cc
+	09:3b:ae:7d:9a:ee:8c:93:81:17:bd:a5:0a:19:55:b0
+	62:1b:a9:4a:a3:cc:99:b1:9f:75:b2:9f:76:67:20:9f
+	f4:15:60:70:08:1c:5b:ff:b2:e6:5e:9b:13:c5:5a:ef
+	03:51:b1:08:20:b9:85:9d:47:77:b2:64:ef:28:03:55
+	68:5a:99:e3:1a:50:f1:78:bd:01:eb:49:fc:f2:68:49
+	da:94:1d:97:3c:6e:74:78:31:c4:33:58:86:d5:dd:65
+	58:f1:e7:97:7f:99:d5:ff:ed:21:01:09:d6:81:9b:25
+	aa:5a:aa:c3:81:7e:bc:a9:a2:c9:50:67:a7:30:7e:67
+	af:e2:88:be:70:24:5a:43:38:d6:21:0c:fb:7e:76:56
+	95:40:ac:d0:c7:c3:06:47:dc:49:91:d0:70:24:e2:4c
+	1b:29:2a:ef:1a:80:af:37:2b:9c:be:80:16:1b:ad:5f
+	dc:c7:d6:54:ff:a9:6d:56:1c:c0:d5:a3:b6:3e:ad:f8
+	12:9a:21:70:b1:44:d5:55:98:55:ac:94:e9:8c:b0:45
+	d4:24:8d:2e:bc:ab:59:a9:02:bf:e4:07:b2:78:59:a3
 	
 
 
-Public Key ID: 65:B4:5E:E2:75:29:7B:5B:8A:2B:3F:74:FC:F9:95:89:6C:51:97:BA
+Public Key ID:
+	sha256:99:0C:C5:EF:0C:3C:DC:71:32:9D:02:23:F8:28:E8:3B:55:D8:00:3D:D0:12:F3:56:33:03:B1:FD:30:3B:71:F1
+	sha1:37:0D:50:BB:93:90:C0:E5:78:D6:E1:D0:FE:99:64:6D:84:5E:3C:36
 Public key's random art:
 +--[ RSA 4096]----+
-|          .      |
-|         . .   ..|
-|          = + oo.|
-|         = + +o .|
-|        S o .+. .|
-|            oo*+o|
-|           ..Eo+o|
-|          . o. .o|
-|           oo.  o|
+|     ...+oo  o   |
+|      .+ *.o. E  |
+|      . *.=. = o |
+|       o ..=+ o  |
+|        S *+.+   |
+|         . o+    |
+|                 |
+|                 |
+|                 |
 +-----------------+
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIJJwIBAAKCAgEApOz4wcdTiEdjO192j39Q1EhzLq9qqZghpWUxQHSV0/Fpm7kU
+j/wtK1xky130+H2ab+k/Sp8jjda0TVV7es7yXYQM2iYEDIc1i3oCtygFkISFpzNG
+5SGLV2GANovwYfgPhvpnGo9inAVJlXv2DJouLBxsL3c86dA3auMjcJ8FNgfvSJ7S
+o7vEdoZQo1QGKpToUUVPD9e+K/y+j4WI8swP8lJaZ/EIDK74ESAyyk7R+jYjItF4
+GrwR7RM7CxWHOENwO/3pxbiJF+oWXOt+2jsTTKyL1FZJHI2beBcPvQql9baBY/q0
+koT7cS8PJiGI/D6TqXQ25XkbTG/ldmzJ7K5toLJ+7iUcdt+q8sF0owS4hR/3VUXM
+24DgBduzvmihD9G0k0wDNmjHu3te8tGQogvMJRTUtiw1AEO2DiUUZqd6p/pFGrJf
+RyxU6nHBvr1ADeClBwcQB0hH2mVD59affexzBsUwhouk3v0fTgNQpX2/qfeKwVbn
+V4bEN1fd+xSwzdmSelLa6rE+pYERJOl+zdLSq0AtZE2GTp2A60jk+AurALcQqhdN
+U9YV8tCVhFTidO49GXqTmuAJAzvuSAoIqCFuU1TWeiNQCHI3clzxUAZcqDBxTZUv
+bkP3QK7v0Ib5c7HiRp5kmO4CQuUgy8mT1RZhaMp9qIy3HKUNEBdYwhj45wECAwEA
+AQKCAgBEuKl+tTvNUVG7769LY9WeXwH/tgBP4qBCdsPrA6lawwEqbhhvVrjLlJg7
+VU86K7wqXZqN0XnTJF/EyZXGOm0rIlbon2aYgc6B67kt8HNBILdAUFF+MFgLdQkj
+sXPcnqx5peVIX+7K7DkZHKoN3kDXCJDbxmePVb+BvluKFfjp5qyCKgvDRf47FQSM
+yfo3zAxxsNuc0lzfn1UYIKBL61PJuR8KqJieEFo1aKFBQ06jX+OMIpRVL4CYtKap
+m7LYcuFVXhwG0znsyRHAbjBRZsRH8q3hMIMObsMVayaXstQsanvH2TNcyiSrqNw7
+G0YlNT36If6t56TEWOvYSMRq5tOusvHGse17yiP8UbyfOj5Wnm0jsOWaRq757o8a
+XsxCNyJuS1I3DTZZchoZwRf5RVW9M84VW7Xuo4iiuEb+uOKTVApogaO4Y5XGspbQ
++KzWXd+XWIVv6y1mOyd62yx9jQQBRK9KkS7o92zoUnpwpDGa8LfTvN30RtBh+V9X
+mMB5ueEPbnYzZkaCejFhpIgZSBWGDrFAaq8aP3XbErx5x/L+QUkCiDtmM0QSnUP0
+5s8NTcVE1KlODf7dAIe/XvKqX3HP+EokTCy/7og99XjhXJWnTILIZX3ns9eYsvJL
+Zlwc99Vqbq+n6Zgx6JKZHWSF+4r2bDuh3CK+/PiMO1HEwNxEcQKCAQEAyzdGnBGR
+cpAOGHqt2cTLPWQsR5ovBGkF1SK08K8+MCYuMjWDuuGAO1pdHMmsxYXyh5OO8918
+9c2ld4vCv0dnTcffSc1Bv2wU+JUO2wBw1zpDuK5DvqPOSF0bxTAUNJEsbsUAgauG
+S5/wq0UnYuDqLYlhor0GTS7HLJ29/fU5uCkq9C6/HxOdyNC7VmfT3i0xYyJhXDAU
+6rdyqPTq1tsLNYam5I3Hwp8rM4XXBUX3BdRadI8mSpGzesyNVxvCqLjote+wJE0d
+jQOheQvUCwYaYspcuKr5//TLVOFupddBRnwtNksVAckXRTwzRHlMmbBDDffABRPl
+gj1ToyuI2e47gwKCAQEAz8ObprOyZQuIjGTbHgAhQqW9R3UNpCnl6Zu3Gs/fn6NE
+nGekqQyHl5SUQFREO78a83GXBdalrSj1qZSS9X/4zYJAbsr/2D8YhEKD3Z6Hv/ou
+ll78HdvU1d0tw3H0v1RtBiGVjwqJuBRifKebEPyuSwxRrEZa7gTM4q38l1Ayucce
+QG8H3kV/LqwSOTC4e20PB3W9WMLi51Iqb36KLwfF6xDbjRAu1KIcKMr1xN5WaiDz
+RyG3TLYEk4bmeLWJZMue8s1450PmoJRBtMWox0MrIBdQeqnA7tua8EiFHx9kEU5N
+3ZlvSXryZSqDmJZbo35k2ncAfkt6VdnP13P7Yxr4KwKCAQBKBM08RY3j26K2ueCf
+BHY+20Dhp8Bea96K/oRHcp1FLnL/KMzdgguSEtz9glvi6mInjdCw9MjyQ0B05bw+
+rcRr6VRkblX3YmfVD34EuQlg68EFALx+MO4PH5Lg5R1G9GXpxunjUVWuMAiaaarp
+8iB6C6M7gnxMGrDDiIVOfkbS1HPn0yscJ6n+HkFOPK1ILM/jWv95c636vG0QK31q
+WwifK3eYoifTtOQodSSXsB9EyU9VS1rYKG/mV6FXzC3ABPIGatKOtmQAHAVxsKRA
+i62KtEjHnsdGuqRhO2dxEpGdGdfiAcEaEGPgfQfzdfc3t6ME8GvJrbCYGrxfH5lO
+P97/AoIBAA2ii7uD/YguGpcEI3Ezlvs1v1dKMkv8x+7t3jVvQQDMCTuufZrujJOB
+F72lChlVsGIbqUqjzJmxn3Wyn3ZnIJ/0FWBwCBxb/7LmXpsTxVrvA1GxCCC5hZ1H
+d7Jk7ygDVWhameMaUPF4vQHrSfzyaEnalB2XPG50eDHEM1iG1d1lWPHnl3+Z1f/t
+IQEJ1oGbJapaqsOBfryposlQZ6cwfmev4oi+cCRaQzjWIQz7fnZWlUCs0MfDBkfc
+SZHQcCTiTBspKu8agK83K5y+gBYbrV/cx9ZU/6ltVhzA1aO2Pq34EpohcLFE1VWY
+VayU6YywRdQkjS68q1mpAr/kB7J4WaMCggEAaXT3xjTs2PkIwthbamFOM7Ob3fEw
+jS6/Ei103lNs0ojln11f8eNZAMQd41odB2pT6shGDrFhXQMn2RpnVI27hVMHORlW
+it2f9DAT+i7OHI4cy9ZUt6mSJof2YMEEQfx89/37p/zy0CxKZe9iW/m01uj2aFcf
+stHWxHgO1GY5zUxC11vRzq5atiUSf9EsrpVMFMsKMXyoCnG4mMgrAxmS0OFMqMQL
+jLmL0JqzjyezpAmLbZXjEqBg5ue5j1P6tFbxzf4RMSAB/YJz8VG6E3HxD4t4PzZx
+fhWTNQEGi0CjtSMincfHiMglB90NHXBDNz7qJbBU8F2DKcpa7E71p2bw+g==
 -----END RSA PRIVATE KEY-----

From b0c60f1c08b0ad18f495cee8c0c66fd4afd3e337 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 16:10:57 -0500
Subject: [PATCH 310/879] Variant: Relocate strings

---
 src/Variant.cpp    | 51 ++++++++++++++++++++++++++++++++++++++++++++
 src/l10n/deu-DEU.h | 53 ----------------------------------------------
 src/l10n/eng-USA.h | 53 ----------------------------------------------
 src/l10n/epo-RUS.h | 53 ----------------------------------------------
 src/l10n/esp-ESP.h | 53 ----------------------------------------------
 src/l10n/fra-FRA.h | 53 ----------------------------------------------
 src/l10n/ita-ITA.h | 53 ----------------------------------------------
 src/l10n/jpn-JPN.h | 53 ----------------------------------------------
 src/l10n/pol-POL.h | 53 ----------------------------------------------
 src/l10n/por-PRT.h | 53 ----------------------------------------------
 10 files changed, 51 insertions(+), 477 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index a4ae7182a..912cd0f62 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -39,6 +39,57 @@
 #include <shared.h>
 #include <i18n.h>
 
+// These are all error messages generated by the expression evaluator, and are
+// mostly concerned with how various operators interact with the different
+// data types.
+#define STRING_VARIANT_TIME_T        "Cannot instantiate this type with a time_t value."
+#define STRING_VARIANT_EXP_BOOL      "Cannot exponentiate Booleans"
+#define STRING_VARIANT_EXP_NON_INT   "Cannot exponentiate to a non-integer power"
+#define STRING_VARIANT_EXP_STRING    "Cannot exponentiate strings"
+#define STRING_VARIANT_EXP_DATE      "Cannot exponentiate dates"
+#define STRING_VARIANT_EXP_DURATION  "Cannot exponentiate durations"
+#define STRING_VARIANT_SUB_BOOL      "Cannot subtract from a Boolean value"
+#define STRING_VARIANT_SUB_STRING    "Cannot subtract strings"
+#define STRING_VARIANT_SUB_DATE      "Cannot subtract a date"
+#define STRING_VARIANT_ADD_BOOL      "Cannot add two Boolean values"
+#define STRING_VARIANT_ADD_DATE      "Cannot add two date values"
+#define STRING_VARIANT_MUL_BOOL      "Cannot multiply Boolean values"
+#define STRING_VARIANT_MUL_DATE      "Cannot multiply date values"
+#define STRING_VARIANT_MUL_REAL_STR  "Cannot multiply real numbers by strings"
+#define STRING_VARIANT_MUL_STR_REAL  "Cannot multiply strings by real numbers"
+#define STRING_VARIANT_MUL_STR_STR   "Cannot multiply strings by strings"
+#define STRING_VARIANT_MUL_STR_DATE  "Cannot multiply strings by dates"
+#define STRING_VARIANT_MUL_STR_DUR   "Cannot multiply strings by durations"
+#define STRING_VARIANT_MUL_DUR_STR   "Cannot multiply durations by strings"
+#define STRING_VARIANT_MUL_DUR_DATE  "Cannot multiply durations by dates"
+#define STRING_VARIANT_MUL_DUR_DUR   "Cannot multiply durations by durations"
+#define STRING_VARIANT_DIV_BOOL      "Cannot divide Boolean values"
+#define STRING_VARIANT_DIV_INT_BOOL  "Cannot divide integers by Boolean values"
+#define STRING_VARIANT_DIV_ZERO      "Cannot divide by zero"
+#define STRING_VARIANT_DIV_INT_STR   "Cannot divide integer by string"
+#define STRING_VARIANT_DIV_INT_DATE  "Cannot divide integer by date values"
+#define STRING_VARIANT_DIV_REAL_BOOL "Cannot divide real by Boolean"
+#define STRING_VARIANT_DIV_REAL_STR  "Cannot divide real numbers by strings"
+#define STRING_VARIANT_DIV_REAL_DATE "Cannot divide real numbers by dates"
+#define STRING_VARIANT_DIV_DUR_BOOL  "Cannot divide duration by Boolean"
+#define STRING_VARIANT_DIV_DUR_STR   "Cannot divide durations by strings"
+#define STRING_VARIANT_DIV_DUR_DATE  "Cannot divide durations by dates"
+#define STRING_VARIANT_DIV_DUR_DUR   "Cannot divide durations by durations"
+#define STRING_VARIANT_MOD_BOOL      "Cannot modulo Booleans"
+#define STRING_VARIANT_MOD_DATE      "Cannot modulo date values"
+#define STRING_VARIANT_MOD_DUR       "Cannot modulo duration values"
+#define STRING_VARIANT_MOD_INT_BOOL  "Cannot modulo integer by Boolean"
+#define STRING_VARIANT_MOD_INT_DATE  "Cannot modulo integer by date values"
+#define STRING_VARIANT_MOD_INT_DUR   "Cannot modulo integer by duration values"
+#define STRING_VARIANT_MOD_INT_STR   "Cannot modulo integer by string"
+#define STRING_VARIANT_MOD_REAL_BOOL "Cannot modulo real by Boolean"
+#define STRING_VARIANT_MOD_REAL_DUR  "Cannot modulo real by duration values"
+#define STRING_VARIANT_MOD_REAL_DATE "Cannot modulo real numbers by dates"
+#define STRING_VARIANT_MOD_REAL_STR  "Cannot modulo real numbers by strings"
+#define STRING_VARIANT_MOD_STR       "Cannot modulo string values"
+#define STRING_VARIANT_MOD_ZERO      "Cannot modulo zero"
+#define STRING_VARIANT_SQRT_NEG      "Cannot take the square root of a negative number."
+
 std::string Variant::dateFormat = "";
 bool Variant::searchCaseSensitive = true;
 bool Variant::searchUsingRegex = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 69bb1271b..399c0555f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Verwende alternative data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Dieser Typ kann nicht mit einem time_t-Wert initialisiert werden."
-#define STRING_VARIANT_EXP_BOOL      "Boolesche Werte können nicht potenziert werden"
-#define STRING_VARIANT_EXP_NON_INT   "Potenzieren ist nur mit Ganzzahlen möglich"
-#define STRING_VARIANT_EXP_STRING    "Zeichenketten können nicht potenziert werden"
-#define STRING_VARIANT_EXP_DATE      "Datumsangaben können nicht potenziert werden"
-#define STRING_VARIANT_EXP_DURATION  "Zeitspannen können nicht potenziert werden"
-#define STRING_VARIANT_SUB_BOOL      "Kann nicht von booleschem Wert abziehen"
-#define STRING_VARIANT_SUB_STRING    "Zeichenketten können nicht abgezogen werden"
-#define STRING_VARIANT_SUB_DATE      "Datumsangaben können nicht abgezogen werden"
-#define STRING_VARIANT_ADD_BOOL      "Boolesche Werte können nicht addiert werden"
-#define STRING_VARIANT_ADD_DATE      "Datumsangaben können nicht addiert werden"
-#define STRING_VARIANT_MUL_BOOL      "Boolesche Werte können nicht multipliziert werden"
-#define STRING_VARIANT_MUL_DATE      "Datumsangaben können nicht multipliziert werden"
-#define STRING_VARIANT_MUL_REAL_STR  "Reelle Zahlen können nicht mit Zeichenketten multipliziert werden"
-#define STRING_VARIANT_MUL_STR_REAL  "Zeichenketten können nicht mit reellen Zahlen multipliziert werdeen"
-#define STRING_VARIANT_MUL_STR_STR   "Zeichenketten können nicht mit Zeichenketten multipliziert werden"
-#define STRING_VARIANT_MUL_STR_DATE  "Zeichenketten können nicht mit Datumsangaben multipliziert werden"
-#define STRING_VARIANT_MUL_STR_DUR   "Zeichenketten können nicht mit Zeitangaben multipliziert werden"
-#define STRING_VARIANT_MUL_DUR_STR   "Zeitangaben können nicht mit Zeichenketten multipliziert werden"
-#define STRING_VARIANT_MUL_DUR_DATE  "Zeitangaben können nicht mit Datumsangaben multipliziert werden"
-#define STRING_VARIANT_MUL_DUR_DUR   "Zeitangaben können nicht mit Zeitangaben multipliziert werden"
-#define STRING_VARIANT_DIV_BOOL      "Boolesche Werte können nicht geteilt werden"
-#define STRING_VARIANT_DIV_INT_BOOL  "Ganzzahlen können nicht durch boolesche Werte geteilt werden"
-#define STRING_VARIANT_DIV_ZERO      "Kann nicht durch null teilen"
-#define STRING_VARIANT_DIV_INT_STR   "Ganzzahlen können nicht durch Zeichenketten geteilt werden"
-#define STRING_VARIANT_DIV_INT_DATE  "Ganzzahlen können nicht durch Datumsangaben geteilt werden"
-#define STRING_VARIANT_DIV_REAL_BOOL "Reelle Zahlen können nicht durch Boolesche Werte geteilt werden"
-#define STRING_VARIANT_DIV_REAL_STR  "Reelle Zahlen können nicht durch Zeichenketten geteilt werden"
-#define STRING_VARIANT_DIV_REAL_DATE "Reelle Zahlen können nicht durch Datumsangaben geteilt werden"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Zeitangaben können nicht durch boolesche Werte geteilt werden"
-#define STRING_VARIANT_DIV_DUR_STR   "Zeitangaben können nicht durch Zeichenketten geteilt werden"
-#define STRING_VARIANT_DIV_DUR_DATE  "Zeitangaben können nicht durch Datumsangaben geteilt werden"
-#define STRING_VARIANT_DIV_DUR_DUR   "Zeitangaben können nicht durch Zeitangaben geteilt werden"
-#define STRING_VARIANT_MOD_BOOL      "Divisionsrest von booleschen Werten kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_DATE      "Divisionsrest von Datumsangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_DUR       "Divisionsrest von Zeitangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_INT_BOOL  "Divisionsrest von Ganzzahlen durch boolesche Werte kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_INT_DATE  "Divisionsrest von Ganzzahlen durch Datumsangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_INT_DUR   "Divisionsrest von Ganzzahlen durch Zeitangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_INT_STR   "Divisionsrest von Ganzzahlen durch Zeichenketten kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_REAL_BOOL "Divisionsrest von reellen Zahlen durch Zeitangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_REAL_DUR  "Divisionsrest von reellen Zahlen durch Zeitangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_REAL_DATE "Divisionsrest von reellen Zahlen durch Datumsangaben kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_REAL_STR  "Divisionsrest von reellen Zahlen durch Zeichenketten kann nicht berechnet werden"
-#define STRING_VARIANT_MOD_STR       "Divisionsrest von Zeichenketten kan nicht berechnet werden"
-#define STRING_VARIANT_MOD_ZERO      "Divisionsrest von null kann nicht berechnet werden"
-#define STRING_VARIANT_SQRT_NEG      "Quadratwurzel einer negativen Zahl kann nicht berechnet werden."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Farbe '{1}' nicht erkannt."
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index cfcdd6eb7..90b9f217b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Using alternate data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Cannot instantiate this type with a time_t value."
-#define STRING_VARIANT_EXP_BOOL      "Cannot exponentiate Booleans"
-#define STRING_VARIANT_EXP_NON_INT   "Cannot exponentiate to a non-integer power"
-#define STRING_VARIANT_EXP_STRING    "Cannot exponentiate strings"
-#define STRING_VARIANT_EXP_DATE      "Cannot exponentiate dates"
-#define STRING_VARIANT_EXP_DURATION  "Cannot exponentiate durations"
-#define STRING_VARIANT_SUB_BOOL      "Cannot subtract from a Boolean value"
-#define STRING_VARIANT_SUB_STRING    "Cannot subtract strings"
-#define STRING_VARIANT_SUB_DATE      "Cannot subtract a date"
-#define STRING_VARIANT_ADD_BOOL      "Cannot add two Boolean values"
-#define STRING_VARIANT_ADD_DATE      "Cannot add two date values"
-#define STRING_VARIANT_MUL_BOOL      "Cannot multiply Boolean values"
-#define STRING_VARIANT_MUL_DATE      "Cannot multiply date values"
-#define STRING_VARIANT_MUL_REAL_STR  "Cannot multiply real numbers by strings"
-#define STRING_VARIANT_MUL_STR_REAL  "Cannot multiply strings by real numbers"
-#define STRING_VARIANT_MUL_STR_STR   "Cannot multiply strings by strings"
-#define STRING_VARIANT_MUL_STR_DATE  "Cannot multiply strings by dates"
-#define STRING_VARIANT_MUL_STR_DUR   "Cannot multiply strings by durations"
-#define STRING_VARIANT_MUL_DUR_STR   "Cannot multiply durations by strings"
-#define STRING_VARIANT_MUL_DUR_DATE  "Cannot multiply durations by dates"
-#define STRING_VARIANT_MUL_DUR_DUR   "Cannot multiply durations by durations"
-#define STRING_VARIANT_DIV_BOOL      "Cannot divide Boolean values"
-#define STRING_VARIANT_DIV_INT_BOOL  "Cannot divide integers by Boolean values"
-#define STRING_VARIANT_DIV_ZERO      "Cannot divide by zero"
-#define STRING_VARIANT_DIV_INT_STR   "Cannot divide integer by string"
-#define STRING_VARIANT_DIV_INT_DATE  "Cannot divide integer by date values"
-#define STRING_VARIANT_DIV_REAL_BOOL "Cannot divide real by Boolean"
-#define STRING_VARIANT_DIV_REAL_STR  "Cannot divide real numbers by strings"
-#define STRING_VARIANT_DIV_REAL_DATE "Cannot divide real numbers by dates"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Cannot divide duration by Boolean"
-#define STRING_VARIANT_DIV_DUR_STR   "Cannot divide durations by strings"
-#define STRING_VARIANT_DIV_DUR_DATE  "Cannot divide durations by dates"
-#define STRING_VARIANT_DIV_DUR_DUR   "Cannot divide durations by durations"
-#define STRING_VARIANT_MOD_BOOL      "Cannot modulo Booleans"
-#define STRING_VARIANT_MOD_DATE      "Cannot modulo date values"
-#define STRING_VARIANT_MOD_DUR       "Cannot modulo duration values"
-#define STRING_VARIANT_MOD_INT_BOOL  "Cannot modulo integer by Boolean"
-#define STRING_VARIANT_MOD_INT_DATE  "Cannot modulo integer by date values"
-#define STRING_VARIANT_MOD_INT_DUR   "Cannot modulo integer by duration values"
-#define STRING_VARIANT_MOD_INT_STR   "Cannot modulo integer by string"
-#define STRING_VARIANT_MOD_REAL_BOOL "Cannot modulo real by Boolean"
-#define STRING_VARIANT_MOD_REAL_DUR  "Cannot modulo real by duration values"
-#define STRING_VARIANT_MOD_REAL_DATE "Cannot modulo real numbers by dates"
-#define STRING_VARIANT_MOD_REAL_STR  "Cannot modulo real numbers by strings"
-#define STRING_VARIANT_MOD_STR       "Cannot modulo string values"
-#define STRING_VARIANT_MOD_ZERO      "Cannot modulo zero"
-#define STRING_VARIANT_SQRT_NEG      "Cannot take the square root of a negative number."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1d0d8c322..94af293e3 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Uzanta alterna data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Ne povas aperaĵigi tiun tipon kun valoro de tipo 'time_t'."
-#define STRING_VARIANT_EXP_BOOL      "Ne povas potencigi buleon"
-#define STRING_VARIANT_EXP_NON_INT   "Ne povas potencigi kun malentjera eksponento"
-#define STRING_VARIANT_EXP_STRING    "Ne povas potencigi ĉenon"
-#define STRING_VARIANT_EXP_DATE      "Ne povas potencigi daton"
-#define STRING_VARIANT_EXP_DURATION  "Ne povas potencigi daŭron"
-#define STRING_VARIANT_SUB_BOOL      "Ne povas subtrahi el buleo"
-#define STRING_VARIANT_SUB_STRING    "Ne povas subtrahi ĉenon"
-#define STRING_VARIANT_SUB_DATE      "Ne povas subtrahi daton"
-#define STRING_VARIANT_ADD_BOOL      "Ne povas adicii du buleojn"
-#define STRING_VARIANT_ADD_DATE      "Ne povas adicii du datojn"
-#define STRING_VARIANT_MUL_BOOL      "Ne povas multipliki buleon"
-#define STRING_VARIANT_MUL_DATE      "Ne povas multipliki daton"
-#define STRING_VARIANT_MUL_REAL_STR  "Ne povas multipliki reelon per ĉeno"
-#define STRING_VARIANT_MUL_STR_REAL  "Ne povas multipliki ĉenon per reelo"
-#define STRING_VARIANT_MUL_STR_STR   "Ne povas multipliki ĉenon per ĉeno"
-#define STRING_VARIANT_MUL_STR_DATE  "Ne povas multipliki ĉenon per dato"
-#define STRING_VARIANT_MUL_STR_DUR   "Ne povas multipliki ĉenon per daŭro"
-#define STRING_VARIANT_MUL_DUR_STR   "Ne povas multipliki daŭron per ĉeno"
-#define STRING_VARIANT_MUL_DUR_DATE  "Ne povas multipliki daŭron per dato"
-#define STRING_VARIANT_MUL_DUR_DUR   "Ne povas multipliki daŭron per daŭro"
-#define STRING_VARIANT_DIV_BOOL      "Ne povas dividi buleon"
-#define STRING_VARIANT_DIV_INT_BOOL  "Ne povas dividi entjeron per buleo"
-#define STRING_VARIANT_DIV_ZERO      "Ne povas dividi per nulo"
-#define STRING_VARIANT_DIV_INT_STR   "Ne povas dividi entjeron per ĉeno"
-#define STRING_VARIANT_DIV_INT_DATE  "Ne povas dividi entjeron per dato"
-#define STRING_VARIANT_DIV_REAL_BOOL "Ne povas dividi reelon per buleo"
-#define STRING_VARIANT_DIV_REAL_STR  "Ne povas dividi reelon per ĉeno"
-#define STRING_VARIANT_DIV_REAL_DATE "Ne povas dividi reelon per dato"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Ne povas dividi daŭron per buleo"
-#define STRING_VARIANT_DIV_DUR_STR   "Ne povas dividi daŭron per ĉeno"
-#define STRING_VARIANT_DIV_DUR_DATE  "Ne povas dividi daŭron per dato"
-#define STRING_VARIANT_DIV_DUR_DUR   "Ne povas dividi daŭron per dato"
-#define STRING_VARIANT_MOD_BOOL      "Ne povas moduli buleon"
-#define STRING_VARIANT_MOD_DATE      "Ne povas moduli daton"
-#define STRING_VARIANT_MOD_DUR       "Ne povas moduli daŭron"
-#define STRING_VARIANT_MOD_INT_BOOL  "Ne povas moduli entjeron per buleo"
-#define STRING_VARIANT_MOD_INT_DATE  "Ne povas moduli entjeron per dato"
-#define STRING_VARIANT_MOD_INT_DUR   "Ne povas moduli entjeron per daŭro"
-#define STRING_VARIANT_MOD_INT_STR   "Ne povas moduli entjeron per ĉeno"
-#define STRING_VARIANT_MOD_REAL_BOOL "Ne povas moduli reelon per buleo"
-#define STRING_VARIANT_MOD_REAL_DUR  "Ne povas moduli reelon per daŭro"
-#define STRING_VARIANT_MOD_REAL_DATE "Ne povas moduli reelon per dato"
-#define STRING_VARIANT_MOD_REAL_STR  "Ne povas moduli reelon per ĉeno"
-#define STRING_VARIANT_MOD_STR       "Ne povas moduli ĉenon"
-#define STRING_VARIANT_MOD_ZERO      "Ne povas moduli nulon"
-#define STRING_VARIANT_SQRT_NEG      "Ne povas kalkuli kvadratan radikon de negativa nombro."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Koloro '{1}' ne rekonata."
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ea19eb8e4..a6c848a89 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "El comando '{1}' no permite '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "No se puede instanciar este tipo con un valor de naturaleza time_t."
-#define STRING_VARIANT_EXP_BOOL      "No se puede exponenciar un booleano"
-#define STRING_VARIANT_EXP_NON_INT   "No se puede exponenciar a una potencia no entera"
-#define STRING_VARIANT_EXP_STRING    "No se puede exponenciar una cadena de caracteres"
-#define STRING_VARIANT_EXP_DATE      "No se puede exponenciar una fecha"
-#define STRING_VARIANT_EXP_DURATION  "No se puede exponenciar una duración"
-#define STRING_VARIANT_SUB_BOOL      "No se puede sustraer de un booleano"
-#define STRING_VARIANT_SUB_STRING    "No se puede sustraer una cadenas de caracteres"
-#define STRING_VARIANT_SUB_DATE      "No se puede sustraer una fecha"
-#define STRING_VARIANT_ADD_BOOL      "No se puede sumar dos booleanos"
-#define STRING_VARIANT_ADD_DATE      "No se puede sumar dos fechas"
-#define STRING_VARIANT_MUL_BOOL      "No se puede multiplicar un booleano"
-#define STRING_VARIANT_MUL_DATE      "No se puede multiplicar una fecha"
-#define STRING_VARIANT_MUL_REAL_STR  "No se puede multiplicar un número real por una cadena de caracteres"
-#define STRING_VARIANT_MUL_STR_REAL  "No se puede multiplicar una cadena de caracteres por un número real"
-#define STRING_VARIANT_MUL_STR_STR   "No se puede multiplicar una cadena de caracteres por otra"
-#define STRING_VARIANT_MUL_STR_DATE  "No se puede multiplicar una cadena de caracteres por una fecha"
-#define STRING_VARIANT_MUL_STR_DUR   "No se puede multiplicar una cadena de caracteres por una duración"
-#define STRING_VARIANT_MUL_DUR_STR   "No se puede multiplicar una duración por una cadena de caracteres"
-#define STRING_VARIANT_MUL_DUR_DATE  "No se puede multiplicar una duración por una fecha"
-#define STRING_VARIANT_MUL_DUR_DUR   "No se puede multiplicar una duración por otra"
-#define STRING_VARIANT_DIV_BOOL      "No se puede dividir un booleano"
-#define STRING_VARIANT_DIV_INT_BOOL  "No se puede dividir un entero por un booleano"
-#define STRING_VARIANT_DIV_ZERO      "No se puede dividir por cero"
-#define STRING_VARIANT_DIV_INT_STR   "No se puede dividir un entero por una cadena de caracteres"
-#define STRING_VARIANT_DIV_INT_DATE  "No se puede dividir un entero por una fecha"
-#define STRING_VARIANT_DIV_REAL_BOOL "No se puede dividir un número real por un booleano"
-#define STRING_VARIANT_DIV_REAL_STR  "No se puede dividir un número real por una cadena de caracteres"
-#define STRING_VARIANT_DIV_REAL_DATE "No se puede dividir un número real por una fecha"
-#define STRING_VARIANT_DIV_DUR_BOOL  "No se puede dividir una duración por un booleano"
-#define STRING_VARIANT_DIV_DUR_STR   "No se puede dividir una duración por una cadena de caracteres"
-#define STRING_VARIANT_DIV_DUR_DATE  "No se puede dividir una duración por una fecha"
-#define STRING_VARIANT_DIV_DUR_DUR   "No se puede dividir una duración por otra"
-#define STRING_VARIANT_MOD_BOOL      "No se puede modular un booleano"
-#define STRING_VARIANT_MOD_DATE      "No se puede modular una fecha"
-#define STRING_VARIANT_MOD_DUR       "No se puede modular una duración"
-#define STRING_VARIANT_MOD_INT_BOOL  "No se puede modular un entero por un booleano"
-#define STRING_VARIANT_MOD_INT_DATE  "No se puede modular un entero por una fecha"
-#define STRING_VARIANT_MOD_INT_DUR   "No se puede modular un entero por una duración"
-#define STRING_VARIANT_MOD_INT_STR   "No se puede modular un entero por una cadena de caracteres"
-#define STRING_VARIANT_MOD_REAL_BOOL "No se puede modular un real por un booleano"
-#define STRING_VARIANT_MOD_REAL_DUR  "No se puede modular un real por una duración"
-#define STRING_VARIANT_MOD_REAL_DATE "No se puede modular un real por una fecha"
-#define STRING_VARIANT_MOD_REAL_STR  "No se puede modular un real por una cadena de caracteres"
-#define STRING_VARIANT_MOD_STR       "No se puede modular una cadena de caracteres"
-#define STRING_VARIANT_MOD_ZERO      "No se puede modular cero"
-#define STRING_VARIANT_SQRT_NEG      "No se puede calcular la raíz cuadrada de un tipo desconocido"
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "El color '{1}' no se reconoce."
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 24310a516..6e080a267 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Utilise une data.location alternative : {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Ne peut pas initier ce type avec un valeur time_t."
-#define STRING_VARIANT_EXP_BOOL      "Cannot exponentiate Booleans"
-#define STRING_VARIANT_EXP_NON_INT   "Cannot exponentiate to a non-integer power"
-#define STRING_VARIANT_EXP_STRING    "Cannot exponentiate strings"
-#define STRING_VARIANT_EXP_DATE      "Cannot exponentiate dates"
-#define STRING_VARIANT_EXP_DURATION  "Cannot exponentiate durations"
-#define STRING_VARIANT_SUB_BOOL      "Ne peut pas soustraire d'un booléen"
-#define STRING_VARIANT_SUB_STRING    "Ne peut pas soustraire une chaine"
-#define STRING_VARIANT_SUB_DATE      "Ne peut pas soustraire une date"
-#define STRING_VARIANT_ADD_BOOL      "Ne peut pas ajouter deux booléens"
-#define STRING_VARIANT_ADD_DATE      "Ne peut pas ajouter deux dates"
-#define STRING_VARIANT_MUL_BOOL      "Ne peut pas multiplier un booléen"
-#define STRING_VARIANT_MUL_DATE      "Ne peut pas multiplier une date"
-#define STRING_VARIANT_MUL_REAL_STR  "Ne peut pas multiplier un nombre réel par une chaine"
-#define STRING_VARIANT_MUL_STR_REAL  "Ne peut pas multiplier une chaine par un nombre réel"
-#define STRING_VARIANT_MUL_STR_STR   "Ne peut pas multiplier une chaine par une chaine"
-#define STRING_VARIANT_MUL_STR_DATE  "Ne peut pas multiplier une chaine par une date"
-#define STRING_VARIANT_MUL_STR_DUR   "Ne peut pas multiplier une chaine par une durée"
-#define STRING_VARIANT_MUL_DUR_STR   "Ne peut pas multiplier une durée par une chaine"
-#define STRING_VARIANT_MUL_DUR_DATE  "Ne peut pas multiplier une durée par une date"
-#define STRING_VARIANT_MUL_DUR_DUR   "Ne peut pas multiplier une durée par une durée"
-#define STRING_VARIANT_DIV_BOOL      "Ne peut pas diviser un booléen"
-#define STRING_VARIANT_DIV_INT_BOOL  "Ne peut pas diviser un nombre entier par un booléen"
-#define STRING_VARIANT_DIV_ZERO      "Ne peut pas diviser par zéro"
-#define STRING_VARIANT_DIV_INT_STR   "Ne peut pas diviser un nombre entier par une chaine"
-#define STRING_VARIANT_DIV_INT_DATE  "Ne peut pas diviser un nombre entier par une date"
-#define STRING_VARIANT_DIV_REAL_BOOL "Ne peut pas diviser un nombre réel par un booléen"
-#define STRING_VARIANT_DIV_REAL_STR  "Ne peut pas diviser un nombre réel par une chaine"
-#define STRING_VARIANT_DIV_REAL_DATE "Ne peut pas diviser un nombre réel par une date"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Ne peut pas diviser une durée par un booléen"
-#define STRING_VARIANT_DIV_DUR_STR   "Ne peut pas diviser une durée par une chaine"
-#define STRING_VARIANT_DIV_DUR_DATE  "Ne peut pas diviser une durée par une date"
-#define STRING_VARIANT_DIV_DUR_DUR   "Ne peut pas diviser une durée par une durée"
-#define STRING_VARIANT_MOD_BOOL      "Ne peut pas moduler un booléen"
-#define STRING_VARIANT_MOD_DATE      "Ne peut pas moduler une date"
-#define STRING_VARIANT_MOD_DUR       "Ne peut pas moduler une durée"
-#define STRING_VARIANT_MOD_INT_BOOL  "Ne peut pas moduler un nombre entier par un booléen"
-#define STRING_VARIANT_MOD_INT_DATE  "Ne peut pas moduler un nombre entier par une date"
-#define STRING_VARIANT_MOD_INT_DUR   "Ne peut pas moduler un nombre entier par une durée"
-#define STRING_VARIANT_MOD_INT_STR   "Ne peut pas moduler un nombre entier par une chaine"
-#define STRING_VARIANT_MOD_REAL_BOOL "Ne peut pas moduler un nombre réel par un booléen"
-#define STRING_VARIANT_MOD_REAL_DUR  "Ne peut pas moduler un nombre réel par une durée"
-#define STRING_VARIANT_MOD_REAL_DATE "Ne peut pas moduler un nombre réel par une date"
-#define STRING_VARIANT_MOD_REAL_STR  "Ne peut pas moduler un nombre réel par une chaine"
-#define STRING_VARIANT_MOD_STR       "Ne peut pas moduler une chaine"
-#define STRING_VARIANT_MOD_ZERO      "Ne peut pas moduler zéro"
-#define STRING_VARIANT_SQRT_NEG      "Ne peut pas calculer la racine carrée d'un nombre négatif."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "La couleur '{1}' n'est pas reconnue."
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 87a67bdfc..a345dbfe6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Uso di data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Cannot instantiate this type with a time_t value."
-#define STRING_VARIANT_EXP_BOOL      "Cannot exponentiate Booleans"
-#define STRING_VARIANT_EXP_NON_INT   "Cannot exponentiate to a non-integer power"
-#define STRING_VARIANT_EXP_STRING    "Cannot exponentiate strings"
-#define STRING_VARIANT_EXP_DATE      "Cannot exponentiate dates"
-#define STRING_VARIANT_EXP_DURATION  "Cannot exponentiate durations"
-#define STRING_VARIANT_SUB_BOOL      "Cannot subtract from a Boolean value"
-#define STRING_VARIANT_SUB_STRING    "Cannot subtract strings"
-#define STRING_VARIANT_SUB_DATE      "Cannot subtract a date"
-#define STRING_VARIANT_ADD_BOOL      "Cannot add two Boolean values"
-#define STRING_VARIANT_ADD_DATE      "Cannot add two date values"
-#define STRING_VARIANT_MUL_BOOL      "Cannot multiply Boolean values"
-#define STRING_VARIANT_MUL_DATE      "Cannot multiply date values"
-#define STRING_VARIANT_MUL_REAL_STR  "Cannot multiply real numbers by strings"
-#define STRING_VARIANT_MUL_STR_REAL  "Cannot multiply strings by real numbers"
-#define STRING_VARIANT_MUL_STR_STR   "Cannot multiply strings by strings"
-#define STRING_VARIANT_MUL_STR_DATE  "Cannot multiply strings by dates"
-#define STRING_VARIANT_MUL_STR_DUR   "Cannot multiply strings by durations"
-#define STRING_VARIANT_MUL_DUR_STR   "Cannot multiply durations by strings"
-#define STRING_VARIANT_MUL_DUR_DATE  "Cannot multiply durations by dates"
-#define STRING_VARIANT_MUL_DUR_DUR   "Cannot multiply durations by durations"
-#define STRING_VARIANT_DIV_BOOL      "Cannot divide Boolean values"
-#define STRING_VARIANT_DIV_INT_BOOL  "Cannot divide integers by Boolean values"
-#define STRING_VARIANT_DIV_ZERO      "Cannot divide by zero"
-#define STRING_VARIANT_DIV_INT_STR   "Cannot divide integer by string"
-#define STRING_VARIANT_DIV_INT_DATE  "Cannot divide integer by date values"
-#define STRING_VARIANT_DIV_REAL_BOOL "Cannot divide real by Boolean"
-#define STRING_VARIANT_DIV_REAL_STR  "Cannot divide real numbers by strings"
-#define STRING_VARIANT_DIV_REAL_DATE "Cannot divide real numbers by dates"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Cannot divide duration by Boolean"
-#define STRING_VARIANT_DIV_DUR_STR   "Cannot divide durations by strings"
-#define STRING_VARIANT_DIV_DUR_DATE  "Cannot divide durations by dates"
-#define STRING_VARIANT_DIV_DUR_DUR   "Cannot divide durations by durations"
-#define STRING_VARIANT_MOD_BOOL      "Cannot modulo Booleans"
-#define STRING_VARIANT_MOD_DATE      "Cannot modulo date values"
-#define STRING_VARIANT_MOD_DUR       "Cannot modulo duration values"
-#define STRING_VARIANT_MOD_INT_BOOL  "Cannot modulo integer by Boolean"
-#define STRING_VARIANT_MOD_INT_DATE  "Cannot modulo integer by date values"
-#define STRING_VARIANT_MOD_INT_DUR   "Cannot modulo integer by duration values"
-#define STRING_VARIANT_MOD_INT_STR   "Cannot modulo integer by string"
-#define STRING_VARIANT_MOD_REAL_BOOL "Cannot modulo real by Boolean"
-#define STRING_VARIANT_MOD_REAL_DUR  "Cannot modulo real by duration values"
-#define STRING_VARIANT_MOD_REAL_DATE "Cannot modulo real numbers by dates"
-#define STRING_VARIANT_MOD_REAL_STR  "Cannot modulo real numbers by strings"
-#define STRING_VARIANT_MOD_STR       "Cannot modulo string values"
-#define STRING_VARIANT_MOD_ZERO      "Cannot modulo zero"
-#define STRING_VARIANT_SQRT_NEG      "Cannot take the square root of a negative number."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Il colore '{1}' non è riconosciuto."
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 609d8fa2e..803b7229c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "代替の data.location {1} を使用"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Cannot instantiate this type with a time_t value."
-#define STRING_VARIANT_EXP_BOOL      "論理型はべき乗出来ません"
-#define STRING_VARIANT_EXP_NON_INT   "Cannot exponentiate to a non-integer power"
-#define STRING_VARIANT_EXP_STRING    "文字列はべき乗できません"
-#define STRING_VARIANT_EXP_DATE      "日付はべき乗できません"
-#define STRING_VARIANT_EXP_DURATION  "期間はべき乗できません"
-#define STRING_VARIANT_SUB_BOOL      "論理型からは減算できません"
-#define STRING_VARIANT_SUB_STRING    "文字列は減算できません"
-#define STRING_VARIANT_SUB_DATE      "日付は減算できません"
-#define STRING_VARIANT_ADD_BOOL      "2つの論理値は加算できません"
-#define STRING_VARIANT_ADD_DATE      "2つの日付値は加算できません"
-#define STRING_VARIANT_MUL_BOOL      "論理値は乗算できません"
-#define STRING_VARIANT_MUL_DATE      "日付は乗算できません"
-#define STRING_VARIANT_MUL_REAL_STR  "実数を文字列では乗算できません"
-#define STRING_VARIANT_MUL_STR_REAL  "文字列を実数では乗算できません"
-#define STRING_VARIANT_MUL_STR_STR   "文字列を文字列では乗算できません"
-#define STRING_VARIANT_MUL_STR_DATE  "文字列を日付では乗算できません"
-#define STRING_VARIANT_MUL_STR_DUR   "文字列を期間では乗算できません"
-#define STRING_VARIANT_MUL_DUR_STR   "期間を文字列では乗算できません"
-#define STRING_VARIANT_MUL_DUR_DATE  "文字列を日付では乗算できません"
-#define STRING_VARIANT_MUL_DUR_DUR   "期間を期間では乗算できません"
-#define STRING_VARIANT_DIV_BOOL      "論理値は除算できません"
-#define STRING_VARIANT_DIV_INT_BOOL  "整数値を論理値では除算できません"
-#define STRING_VARIANT_DIV_ZERO      "零では除算できません"
-#define STRING_VARIANT_DIV_INT_STR   "整数値を文字列では除算できません"
-#define STRING_VARIANT_DIV_INT_DATE  "整数値を日付では除算できません"
-#define STRING_VARIANT_DIV_REAL_BOOL "実数値を論理値では除算できません"
-#define STRING_VARIANT_DIV_REAL_STR  "実数値を文字列では除算出来ません"
-#define STRING_VARIANT_DIV_REAL_DATE "実数値を日付では除算出来ません"
-#define STRING_VARIANT_DIV_DUR_BOOL  "期間を論理値では除算出来ません"
-#define STRING_VARIANT_DIV_DUR_STR   "期間を文字列では除算出来ません"
-#define STRING_VARIANT_DIV_DUR_DATE  "期間を日付では除算出来ません"
-#define STRING_VARIANT_DIV_DUR_DUR   "期間を期間では除算出来ません"
-#define STRING_VARIANT_MOD_BOOL      "Cannot modulo Booleans"
-#define STRING_VARIANT_MOD_DATE      "日付は剰余を計算できません。"
-#define STRING_VARIANT_MOD_DUR       "Cannot modulo duration values"
-#define STRING_VARIANT_MOD_INT_BOOL  "整数値を論理値で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_INT_DATE  "整数値を日付で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_INT_DUR   "Cannot modulo integer by duration values"
-#define STRING_VARIANT_MOD_INT_STR   "整数値を文字列で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_REAL_BOOL "実数値を論理値で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_REAL_DUR  "Cannot modulo real by duration values"
-#define STRING_VARIANT_MOD_REAL_DATE "実数値を日付で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_REAL_STR  "実数値を文字列で剰余を取ることは出来ません。"
-#define STRING_VARIANT_MOD_STR       "Cannot modulo string values"
-#define STRING_VARIANT_MOD_ZERO      "零で剰余を取ることは出来ません。"
-#define STRING_VARIANT_SQRT_NEG      "負の数は平方根を計算できません。"
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 6c8399b2e..b2002c9c7 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Alternatywne data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Nie można utworzyć tego typu z wartością time_t."
-#define STRING_VARIANT_EXP_BOOL      "Nie można potęgować wartości Boolowskich"
-#define STRING_VARIANT_EXP_NON_INT   "Nie można potęgować z wykłanikiem nie numerycznym"
-#define STRING_VARIANT_EXP_STRING    "Nie można potęgować ciągów znaków"
-#define STRING_VARIANT_EXP_DATE      "Nie można potęgować dat"
-#define STRING_VARIANT_EXP_DURATION  "Nie można potęgować okresów"
-#define STRING_VARIANT_SUB_BOOL      "Nie można odejmować od wartości Boolowskich"
-#define STRING_VARIANT_SUB_STRING    "Nie można odejmować ciągów znaków"
-#define STRING_VARIANT_SUB_DATE      "Nie można odejmować dat"
-#define STRING_VARIANT_ADD_BOOL      "Nie można sumować wartości Boolowskich"
-#define STRING_VARIANT_ADD_DATE      "Nie można sumować dat"
-#define STRING_VARIANT_MUL_BOOL      "Nie można mnożyć wartości Boolowskich"
-#define STRING_VARIANT_MUL_DATE      "Nie można mnożyć dat"
-#define STRING_VARIANT_MUL_REAL_STR  "Nie można mnożyć wartości rzeczywistych przez ciągi"
-#define STRING_VARIANT_MUL_STR_REAL  "Nie można mnożyć ciągów przez wartości rzeczywiste"
-#define STRING_VARIANT_MUL_STR_STR   "Nie można ciągu przez ciąg"
-#define STRING_VARIANT_MUL_STR_DATE  "Nie można mnożyć ciągów przez datę"
-#define STRING_VARIANT_MUL_STR_DUR   "Nie można mnożyć ciągów przez okres"
-#define STRING_VARIANT_MUL_DUR_STR   "Nie można mnożyć okresu przez ciąg"
-#define STRING_VARIANT_MUL_DUR_DATE  "Nie można mnożyć okresu przez datę"
-#define STRING_VARIANT_MUL_DUR_DUR   "Nie można mnożyć okresu przez okres"
-#define STRING_VARIANT_DIV_BOOL      "Nie można dzielić wartości Boolowskich"
-#define STRING_VARIANT_DIV_INT_BOOL  "Nie można dzielić liczb przez wartości Boolowskie"
-#define STRING_VARIANT_DIV_ZERO      "Nie można dzielić przez zero"
-#define STRING_VARIANT_DIV_INT_STR   "Nie można dzielić liczb przez ciągi"
-#define STRING_VARIANT_DIV_INT_DATE  "Nie można dzielić liczb przez datę"
-#define STRING_VARIANT_DIV_REAL_BOOL "Nie można dzielić wartości rzeczywistych przez wartości Boolowskie"
-#define STRING_VARIANT_DIV_REAL_STR  "Nie można dzielić wartości rzeczywistych przez ciągi"
-#define STRING_VARIANT_DIV_REAL_DATE "Nie można dzielić wartości rzeczywistych przez datę"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Nie można dzielić okresu przez wartości Boolowskie"
-#define STRING_VARIANT_DIV_DUR_STR   "Nie można dzielić okresu przez ciągi"
-#define STRING_VARIANT_DIV_DUR_DATE  "Nie można dzielić okresu przez datę"
-#define STRING_VARIANT_DIV_DUR_DUR   "Nie można dzielić okresu przez okres"
-#define STRING_VARIANT_MOD_BOOL      "Nie można uzyskać modulo z wartości Boolowskich"
-#define STRING_VARIANT_MOD_DATE      "Nie można uzyskać modulo z daty"
-#define STRING_VARIANT_MOD_DUR       "Nie można uzyskać modulo z okresu"
-#define STRING_VARIANT_MOD_INT_BOOL  "Nie można uzyskać modulo z liczby przez wartość Boolowską"
-#define STRING_VARIANT_MOD_INT_DATE  "Nie można uzyskać modulo z liczby przez datę"
-#define STRING_VARIANT_MOD_INT_DUR   "Nie można uzyskać modulo z liczby przez okres"
-#define STRING_VARIANT_MOD_INT_STR   "Nie można uzyskać modulo z liczby przez ciąg"
-#define STRING_VARIANT_MOD_REAL_BOOL "Nie można uzyskać modulo z wartości rzeczywistych przez wartości Boolowskie"
-#define STRING_VARIANT_MOD_REAL_DUR  "Nie można uzyskać modulo z wartości rzeczywistych przez okres"
-#define STRING_VARIANT_MOD_REAL_DATE "Nie można uzyskać modulo z wartości rzeczywistych przez datę"
-#define STRING_VARIANT_MOD_REAL_STR  "Nie można uzyskać modulo z wartości rzeczywistych przez ciąg"
-#define STRING_VARIANT_MOD_STR       "Nie można uzyskać modulo z ciągów"
-#define STRING_VARIANT_MOD_ZERO      "Nie można uzyskać modulo z zera"
-#define STRING_VARIANT_SQRT_NEG      "Nie można wyciągnąć pierwiastka kwadratowego z wartości ujemnej."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "Kolor '{1}' nie został rozpoznany."
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 2accecc39..5464a868a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -109,59 +109,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Variant
-//
-// These are all error messages generated by the expression evaluator, and are
-// mostly concerned with how various operators interact with the different
-// data types.
-#define STRING_VARIANT_TIME_T        "Impossível inicializar este tipo com um valor time_t."
-#define STRING_VARIANT_EXP_BOOL      "Impossível exponenciar booleanos"
-#define STRING_VARIANT_EXP_NON_INT   "Impossível exponenciar a uma potencia não inteira"
-#define STRING_VARIANT_EXP_STRING    "Impossível exponenciar texto"
-#define STRING_VARIANT_EXP_DATE      "Impossível exponenciar datas"
-#define STRING_VARIANT_EXP_DURATION  "Impossível exponenciar durações"
-#define STRING_VARIANT_SUB_BOOL      "Impossível subtrair de um valor booleano"
-#define STRING_VARIANT_SUB_STRING    "Impossível subtrair texto"
-#define STRING_VARIANT_SUB_DATE      "Impossível subtrair uma data"
-#define STRING_VARIANT_ADD_BOOL      "Impossível somar dois valores booleanos"
-#define STRING_VARIANT_ADD_DATE      "Impossível somar duas datas"
-#define STRING_VARIANT_MUL_BOOL      "Impossível multiplicar valores booleanos"
-#define STRING_VARIANT_MUL_DATE      "Impossível multiplicar datas"
-#define STRING_VARIANT_MUL_REAL_STR  "Impossível multiplicar números reais por texto"
-#define STRING_VARIANT_MUL_STR_REAL  "Impossível multiplicar texto por números reais"
-#define STRING_VARIANT_MUL_STR_STR   "Impossível multiplicar texto por texto"
-#define STRING_VARIANT_MUL_STR_DATE  "Impossível multiplicar texto por datas"
-#define STRING_VARIANT_MUL_STR_DUR   "Impossível multiplicar texto por durações"
-#define STRING_VARIANT_MUL_DUR_STR   "Impossível multiplicar durações por texto"
-#define STRING_VARIANT_MUL_DUR_DATE  "Impossível multiplicar durações por datas"
-#define STRING_VARIANT_MUL_DUR_DUR   "Impossível multiplicar durações por durações"
-#define STRING_VARIANT_DIV_BOOL      "Impossível dividir booleano"
-#define STRING_VARIANT_DIV_INT_BOOL  "Impossível dividir inteiros por booleanos"
-#define STRING_VARIANT_DIV_ZERO      "Impossível dividir por zero"
-#define STRING_VARIANT_DIV_INT_STR   "Impossível dividir inteiros por texto"
-#define STRING_VARIANT_DIV_INT_DATE  "Impossível dividir inteiros por datas"
-#define STRING_VARIANT_DIV_REAL_BOOL "Impossível dividir reais por booleanos"
-#define STRING_VARIANT_DIV_REAL_STR  "Impossível dividir reais por texto"
-#define STRING_VARIANT_DIV_REAL_DATE "Impossível dividir reais por datas"
-#define STRING_VARIANT_DIV_DUR_BOOL  "Impossível dividir duration by Boolean"
-#define STRING_VARIANT_DIV_DUR_STR   "Impossível dividir durations by strings"
-#define STRING_VARIANT_DIV_DUR_DATE  "Impossível dividir durations by dates"
-#define STRING_VARIANT_DIV_DUR_DUR   "Impossível dividir durations by durations"
-#define STRING_VARIANT_MOD_BOOL      "Impossível calcular módulo de booleanos"
-#define STRING_VARIANT_MOD_DATE      "Impossível calcular módulo de datas"
-#define STRING_VARIANT_MOD_DUR       "Impossível calcular módulo de durações"
-#define STRING_VARIANT_MOD_INT_BOOL  "Impossível calcular módulo de inteiros por booleanos"
-#define STRING_VARIANT_MOD_INT_DATE  "Impossível calcular módulo de inteiros por datas"
-#define STRING_VARIANT_MOD_INT_DUR   "Impossível calcular módulo de inteiros por durações"
-#define STRING_VARIANT_MOD_INT_STR   "Impossível calcular módulo de inteiros por texto"
-#define STRING_VARIANT_MOD_REAL_BOOL "Impossível calcular módulo de reais por booleanos"
-#define STRING_VARIANT_MOD_REAL_DUR  "Impossível calcular módulo de reais por duração"
-#define STRING_VARIANT_MOD_REAL_DATE "Impossível calcular módulo de reais por datas"
-#define STRING_VARIANT_MOD_REAL_STR  "Impossível calcular módulo de reais por texto"
-#define STRING_VARIANT_MOD_STR       "Impossível calcular módulo de texto"
-#define STRING_VARIANT_MOD_ZERO      "Impossível calcular módulo de zero"
-#define STRING_VARIANT_SQRT_NEG      "Impossível calcular a raiz quadrada de um número negativo."
-
 // Color
 #define STRING_COLOR_UNRECOGNIZED    "A cor '{1}' não é reconhecida."
 

From 02fde10c12656b1aa30607d6e0b12a176d54999a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 16:54:20 -0500
Subject: [PATCH 311/879] Variant: Removed uneeded header

---
 src/Variant.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index 912cd0f62..69b9aadb3 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -37,7 +37,6 @@
 #include <Lexer.h>
 #include <RX.h>
 #include <shared.h>
-#include <i18n.h>
 
 // These are all error messages generated by the expression evaluator, and are
 // mostly concerned with how various operators interact with the different

From e8517e748deaafc9a35c921e1d4eaefeba7a3d1e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 17:30:32 -0500
Subject: [PATCH 312/879] Docs: Removed untested platform

---
 NEWS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NEWS b/NEWS
index f77276b28..7686f2207 100644
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,6 @@ Taskwarrior has been built and tested on the following configurations:
   * Debian
   * Arch
   * FreeBSD
-  * Cygwin
 
 ---
 

From ffb7f94e2ab12152b6763cd4792cdca093ce288a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 17:45:03 -0500
Subject: [PATCH 313/879] Docs: Updated compiler version

---
 DEVELOPER | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index 0c43c8225..e9e655bea 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -1,8 +1,8 @@
 How to Build Taskwarrior
 
   Satisfy the Requirements:
-    - gcc 4.7 or later, clang 3.3 or later or equivalent. This is because C++11
-      is now used.
+    - gcc 4.9 or later, clang 3.3 or later or equivalent. This is because C++11
+      is now used throughout the source.
     - libuuid
     - gnutls (optional)
     - python 2.7 or 3 (optional, for running the test suite)
@@ -31,6 +31,7 @@ How to Build Taskwarrior
   against git HEAD on the development branch. We cannot apply patches made
   against the tarball source, or master.
 
+
 General Statement
   This file is intended to convey the current efforts, priorities and needs of
   the codebase. It is for anyone looking for a way to start contributing.
@@ -103,6 +104,7 @@ General Statement
 
   Next are some specific areas that need attention.
 
+
 New Code Needs
   This is code that needs to be written.
 
@@ -118,6 +120,7 @@ New Code Needs
     lie outside of the core product, and will be implemented as external scripts
     by anyone who wishes to participate.
 
+
 Unit Tests Needed
   There are always more unit tests needed. More specifically, better unit tests
   are always needed. The convention is that there are four types of unit test:

From 728390b6e5743e32a3375dfc1b8404f075e272b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 22:26:33 -0500
Subject: [PATCH 314/879] Color: Now uses libshared

---
 src/CMakeLists.txt  |   4 +-
 src/Color.cpp       | 603 --------------------------------------------
 src/Color.h         |  75 ------
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/color.t.cpp    | 195 --------------
 6 files changed, 3 insertions(+), 877 deletions(-)
 delete mode 100644 src/Color.cpp
 delete mode 100644 src/Color.h
 delete mode 100644 test/color.t.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd7bfb672..b95a5e49f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 add_library (task CLI2.cpp CLI2.h
-                  Color.cpp Color.h
                   Config.cpp Config.h
                   Context.cpp Context.h
                   DOM.cpp DOM.h
@@ -32,7 +31,8 @@ add_library (task CLI2.cpp CLI2.h
                   sort.cpp
                   util.cpp util.h)
 
-add_library (libshared libshared/src/Datetime.cpp      libshared/src/Datetime.h
+add_library (libshared libshared/src/Color.cpp         libshared/src/Color.h
+                       libshared/src/Datetime.cpp      libshared/src/Datetime.h
                        libshared/src/Duration.cpp      libshared/src/Duration.h
                        libshared/src/FS.cpp            libshared/src/FS.h
                        libshared/src/JSON.cpp          libshared/src/JSON.h
diff --git a/src/Color.cpp b/src/Color.cpp
deleted file mode 100644
index 7a2ce0449..000000000
--- a/src/Color.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Color.h>
-#include <sstream>
-#include <vector>
-#include <algorithm>
-#include <main.h>
-#include <Lexer.h>
-#include <shared.h>
-#include <format.h>
-#include <i18n.h>
-#include <string>
-
-// uint to string lookup table for Color::_colorize()
-// _colorize() gets called _a lot_, having this lookup table is a cheap
-// performance optimization.
-const char *colorstring[] = {
-    "0",   "1",   "2",   "3",   "4",   "5",   "6",   "7",   "8",   "9",
-   "10",  "11",  "12",  "13",  "14",  "15",  "16",  "17",  "18",  "19",
-   "20",  "21",  "22",  "23",  "24",  "25",  "26",  "27",  "28",  "29",
-   "30",  "31",  "32",  "33",  "34",  "35",  "36",  "37",  "38",  "39",
-   "40",  "41",  "42",  "43",  "44",  "45",  "46",  "47",  "48",  "49",
-   "50",  "51",  "52",  "53",  "54",  "55",  "56",  "57",  "58",  "59",
-   "60",  "61",  "62",  "63",  "64",  "65",  "66",  "67",  "68",  "69",
-   "70",  "71",  "72",  "73",  "74",  "75",  "76",  "77",  "78",  "79",
-   "80",  "81",  "82",  "83",  "84",  "85",  "86",  "87",  "88",  "89",
-   "90",  "91",  "92",  "93",  "94",  "95",  "96",  "97",  "98",  "99",
-  "100", "101", "102", "103", "104", "105", "106", "107", "108", "109",
-  "110", "111", "112", "113", "114", "115", "116", "117", "118", "119",
-  "120", "121", "122", "123", "124", "125", "126", "127", "128", "129",
-  "130", "131", "132", "133", "134", "135", "136", "137", "138", "139",
-  "140", "141", "142", "143", "144", "145", "146", "147", "148", "149",
-  "150", "151", "152", "153", "154", "155", "156", "157", "158", "159",
-  "160", "161", "162", "163", "164", "165", "166", "167", "168", "169",
-  "170", "171", "172", "173", "174", "175", "176", "177", "178", "179",
-  "180", "181", "182", "183", "184", "185", "186", "187", "188", "189",
-  "190", "191", "192", "193", "194", "195", "196", "197", "198", "199",
-  "200", "201", "202", "203", "204", "205", "206", "207", "208", "209",
-  "210", "211", "212", "213", "214", "215", "216", "217", "218", "219",
-  "220", "221", "222", "223", "224", "225", "226", "227", "228", "229",
-  "230", "231", "232", "233", "234", "235", "236", "237", "238", "239",
-  "240", "241", "242", "243", "244", "245", "246", "247", "248", "249",
-  "250", "251", "252", "253", "254", "255"
-};
-
-////////////////////////////////////////////////////////////////////////////////
-static struct
-{
-  Color::color_id id;
-  std::string english_name;
-  int index;                    // offset red=3 (therefore fg=33, bg=43)
-} allColors[] =
-{
-  // Color.h enum    English     Index
-  { Color::nocolor,  "none",     0},
-  { Color::black,    "black",    1}, // fg 29+0  bg 39+0
-  { Color::red,      "red",      2},
-  { Color::green,    "green",    3},
-  { Color::yellow,   "yellow",   4},
-  { Color::blue,     "blue",     5},
-  { Color::magenta,  "magenta",  6},
-  { Color::cyan,     "cyan",     7},
-  { Color::white,    "white",    8},
-
-};
-
-#define NUM_COLORS (sizeof (allColors) / sizeof (allColors[0]))
-
-////////////////////////////////////////////////////////////////////////////////
-Color::Color ()
-: _value (0)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::Color (const Color& other)
-{
-  _value = other._value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::Color (unsigned int c)
-: _value (0)
-{
-  if (!(c & _COLOR_HASFG)) _value &= ~_COLOR_FG;
-  if (!(c & _COLOR_HASBG)) _value &= ~_COLOR_BG;
-
-  _value = c & (_COLOR_256 | _COLOR_HASBG | _COLOR_HASFG |_COLOR_UNDERLINE |
-                _COLOR_INVERSE | _COLOR_BOLD | _COLOR_BRIGHT | _COLOR_BG |
-                _COLOR_FG);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Supports the following constructs:
-//   [bright] [color] [on color] [bright] [underline]
-//
-// Where [color] is one of:
-//   black
-//   red
-//   ...
-//   grayN  0 <= N <= 23       fg 38;5;232 + N              bg 48;5;232 + N
-//   greyN  0 <= N <= 23       fg 38;5;232 + N              bg 48;5;232 + N
-//   colorN 0 <= N <= 255      fg 38;5;N                    bg 48;5;N
-//   rgbRGB 0 <= R,G,B <= 5    fg 38;5;16 + R*36 + G*6 + B  bg 48;5;16 + R*36 + G*6 + B
-Color::Color (const std::string& spec)
-: _value (0)
-{
-  // Split spec into words.
-  auto words = split (spec, ' ');
-
-  // Construct the color as two separate colors, then blend them later.  This
-  // make it possible to declare a color such as "color1 on black", and have
-  // the upgrade work properly.
-  unsigned int fg_value = 0;
-  unsigned int bg_value = 0;
-
-  bool bg = false;
-  int index;
-  for (auto& word : words)
-  {
-    word = Lexer::lowerCase (Lexer::trim (word));
-
-         if (word == "bold")      fg_value |= _COLOR_BOLD;
-    else if (word == "bright")    bg_value |= _COLOR_BRIGHT;
-    else if (word == "underline") fg_value |= _COLOR_UNDERLINE;
-    else if (word == "inverse")   fg_value |= _COLOR_INVERSE;
-    else if (word == "on")        bg = true;
-
-    // X where X is one of black, red, blue ...
-    else if ((index = find (word)) != -1)
-    {
-      if (index)
-      {
-        if (bg)
-        {
-          bg_value |= _COLOR_HASBG;
-          bg_value |= index << 8;
-        }
-        else
-        {
-          fg_value |= _COLOR_HASFG;
-          fg_value |= index;
-        }
-      }
-    }
-
-    // greyN/grayN, where 0 <= N <= 23.
-    else if (! word.compare (0, 4, "grey", 4) ||
-             ! word.compare (0, 4, "gray", 4))
-    {
-      index = strtol (word.substr (4).c_str (), nullptr, 10);
-      if (index < 0 || index > 23)
-        throw format (STRING_COLOR_UNRECOGNIZED, word);
-
-      if (bg)
-      {
-        bg_value |= _COLOR_HASBG;
-        bg_value |= (index + 232) << 8;
-        bg_value |= _COLOR_256;
-      }
-      else
-      {
-        fg_value |= _COLOR_HASFG;
-        fg_value |= index + 232;
-        fg_value |= _COLOR_256;
-      }
-    }
-
-    // rgbRGB, where 0 <= R,G,B <= 5.
-    else if (! word.compare (0, 3, "rgb", 3))
-    {
-      index = strtol (word.substr (3).c_str (), nullptr, 10);
-      if (word.length () != 6 ||
-          index < 0 || index > 555)
-        throw format (STRING_COLOR_UNRECOGNIZED, word);
-
-      int r = strtol (word.substr (3, 1).c_str (), nullptr, 10);
-      int g = strtol (word.substr (4, 1).c_str (), nullptr, 10);
-      int b = strtol (word.substr (5, 1).c_str (), nullptr, 10);
-      if (r < 0 || r > 5 ||
-          g < 0 || g > 5 ||
-          b < 0 || b > 5)
-        throw format (STRING_COLOR_UNRECOGNIZED, word);
-
-      index = 16 + r*36 + g*6 + b;
-
-      if (bg)
-      {
-        bg_value |= _COLOR_HASBG;
-        bg_value |= index << 8;
-        bg_value |= _COLOR_256;
-      }
-      else
-      {
-        fg_value |= _COLOR_HASFG;
-        fg_value |= index;
-        fg_value |= _COLOR_256;
-      }
-    }
-
-    // colorN, where 0 <= N <= 255.
-    else if (! word.compare (0, 5, "color", 5))
-    {
-      index = strtol (word.substr (5).c_str (), nullptr, 10);
-      if (index < 0 || index > 255)
-        throw format (STRING_COLOR_UNRECOGNIZED, word);
-
-      upgrade ();
-
-      if (bg)
-      {
-        bg_value |= _COLOR_HASBG;
-        bg_value |= index << 8;
-        bg_value |= _COLOR_256;
-      }
-      else
-      {
-        fg_value |= _COLOR_HASFG;
-        fg_value |= index;
-        fg_value |= _COLOR_256;
-      }
-    }
-    else if (word != "")
-      throw format (STRING_COLOR_UNRECOGNIZED, word);
-  }
-
-  // Now combine the fg and bg into a single color.
-  _value = fg_value;
-  blend (Color (bg_value));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::Color (color_id fg)
-: _value (0)
-{
-  if (fg != Color::nocolor)
-  {
-    _value |= _COLOR_HASFG;
-    _value |= fg;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::Color (color_id fg, color_id bg, bool underline, bool bold, bool bright)
-: _value (0)
-{
-  _value |= ((underline ? 1 : 0) << 18)
-         |  ((bold      ? 1 : 0) << 17)
-         |  ((bright    ? 1 : 0) << 16);
-
-  if (bg != Color::nocolor)
-  {
-    _value |= _COLOR_HASBG;
-    _value |= (bg << 8);
-  }
-
-  if (fg != Color::nocolor)
-  {
-    _value |= _COLOR_HASFG;
-    _value |= fg;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::operator std::string () const
-{
-  std::string description;
-  if (_value & _COLOR_BOLD) description += "bold";
-
-  if (_value & _COLOR_UNDERLINE)
-    description += std::string (description.length () ? " " : "") + "underline";
-
-  if (_value & _COLOR_INVERSE)
-    description += std::string (description.length () ? " " : "") + "inverse";
-
-  if (_value & _COLOR_HASFG)
-    description += std::string (description.length () ? " " : "") + fg ();
-
-  if (_value & _COLOR_HASBG)
-  {
-    description += std::string (description.length () ? " " : "") + "on";
-
-    if (_value & _COLOR_BRIGHT)
-      description += std::string (description.length () ? " " : "") + "bright";
-
-    description += ' ' + bg ();
-  }
-
-  return description;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Color::operator int () const
-{
-  return (int) _value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// If 'other' has styles that are compatible, merge them into this.  Colors in
-// other take precedence.
-void Color::blend (const Color& other)
-{
-  if (!other.nontrivial ())
-    return;
-
-  Color c (other);
-  _value |= (c._value & _COLOR_UNDERLINE);    // Always inherit underline.
-  _value |= (c._value & _COLOR_INVERSE);      // Always inherit inverse.
-
-  // 16 <-- 16.
-  if (!(_value   & _COLOR_256) &&
-      !(c._value & _COLOR_256))
-  {
-    _value |= (c._value & _COLOR_BOLD);       // Inherit bold.
-    _value |= (c._value & _COLOR_BRIGHT);     // Inherit bright.
-
-    if (c._value & _COLOR_HASFG)
-    {
-      _value |= _COLOR_HASFG;                 // There is now a color.
-      _value &= ~_COLOR_FG;                   // Remove previous color.
-      _value |= (c._value & _COLOR_FG);       // Apply other color.
-    }
-
-    if (c._value & _COLOR_HASBG)
-    {
-      _value |= _COLOR_HASBG;                 // There is now a color.
-      _value &= ~_COLOR_BG;                   // Remove previous color.
-      _value |= (c._value & _COLOR_BG);       // Apply other color.
-    }
-
-    return;
-  }
-  else
-  {
-    // Upgrade either color, if necessary.
-    if (!(_value   & _COLOR_256)) upgrade ();
-    if (!(c._value & _COLOR_256)) c.upgrade ();
-
-    // 256 <-- 256.
-    if (c._value & _COLOR_HASFG)
-    {
-      _value |= _COLOR_HASFG;                  // There is now a color.
-      _value &= ~_COLOR_FG;                    // Remove previous color.
-      _value |= (c._value & _COLOR_FG);        // Apply other color.
-    }
-
-    if (c._value & _COLOR_HASBG)
-    {
-      _value |= _COLOR_HASBG;                  // There is now a color.
-      _value &= ~_COLOR_BG;                    // Remove previous color.
-      _value |= (c._value & _COLOR_BG);        // Apply other color.
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Color::upgrade ()
-{
-  if (!(_value & _COLOR_256))
-  {
-    if (_value & _COLOR_HASFG)
-    {
-      bool bold = _value & _COLOR_BOLD;
-      unsigned int fg = _value & _COLOR_FG;
-      _value &= ~_COLOR_FG;
-      _value &= ~_COLOR_BOLD;
-      _value |= (bold ? fg + 7 : fg - 1);
-    }
-
-    if (_value & _COLOR_HASBG)
-    {
-      bool bright = _value & _COLOR_BRIGHT;
-      unsigned int bg = (_value & _COLOR_BG) >> 8;
-      _value &= ~_COLOR_BG;
-      _value &= ~_COLOR_BRIGHT;
-      _value |= (bright ? bg + 7 : bg - 1) << 8;
-    }
-
-    _value |= _COLOR_256;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Color::colorize (const std::string& input) const
-{
-  std::string result;
-  _colorize (result, input);
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Sample color codes:
-//   red                  \033[31m
-//   bold red             \033[91m
-//   underline red        \033[4;31m
-//   bold underline red   \033[1;4;31m
-//
-//   on red               \033[41m
-//   on bright red        \033[101m
-//
-//   256 fg               \033[38;5;Nm
-//   256 bg               \033[48;5;Nm
-void Color::_colorize (std::string &result, const std::string& input) const
-{
-  if (!nontrivial ())
-  {
-    result += input;
-    return;
-  }
-
-  int count = 0;
-
-  // 256 color
-  if (_value & _COLOR_256)
-  {
-    if (_value & _COLOR_UNDERLINE)
-      result += "\033[4m";
-
-    if (_value & _COLOR_INVERSE)
-      result += "\033[7m";
-
-    if (_value & _COLOR_HASFG)
-    {
-      result += "\033[38;5;";
-      result += colorstring[(_value & _COLOR_FG)];
-      result += "m";
-    }
-
-    if (_value & _COLOR_HASBG)
-    {
-      result += "\033[48;5;";
-      result += colorstring[((_value & _COLOR_BG) >> 8)];
-      result += "m";
-    }
-
-    result += input;
-    result += "\033[0m";
-  }
-
-  // 16 color
-  else
-  {
-    result += "\033[";
-
-    if (_value & _COLOR_BOLD)
-    {
-      if (count++) result += ";";
-      result += "1";
-    }
-
-    if (_value & _COLOR_UNDERLINE)
-    {
-      if (count++) result += ";";
-      result += "4";
-    }
-
-    if (_value & _COLOR_INVERSE)
-    {
-      if (count++) result += ";";
-      result += "7";
-    }
-
-    if (_value & _COLOR_HASFG)
-    {
-      if (count++) result += ";";
-      result += colorstring[(29 + (_value & _COLOR_FG))];
-    }
-
-    if (_value & _COLOR_HASBG)
-    {
-      if (count++) result += ";";
-      result += colorstring[((_value & _COLOR_BRIGHT ? 99 : 39) + ((_value & _COLOR_BG) >> 8))];
-    }
-
-    result += "m";
-    result += input;
-    result += "\033[0m";
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Remove color codes from a string.
-std::string Color::strip (const std::string& input)
-{
-  int length = input.length ();
-  bool inside = false;
-  std::string output;
-  for (int i = 0; i < length; ++i)
-  {
-    if (inside)
-    {
-      if (input[i] == 'm')
-        inside = false;
-    }
-    else
-    {
-      if (input[i] == 033)
-        inside = true;
-      else
-        output += input[i];
-    }
-  }
-
-  return output;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Color::colorize (const std::string& input, const std::string& spec)
-{
-  Color c (spec);
-  return c.colorize (input);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Color::nontrivial () const
-{
-  return _value != 0 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Color::find (const std::string& input)
-{
-  for (unsigned int i = 0; i < NUM_COLORS; ++i)
-    if (allColors[i].english_name == input)
-      return (int) i;
-
-  return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Color::fg () const
-{
-  int index = _value & _COLOR_FG;
-
-  if (_value & _COLOR_256)
-  {
-    if (_value & _COLOR_HASFG)
-    {
-      std::stringstream s;
-      s << "color" << (_value & _COLOR_FG);
-      return s.str ();
-    }
-  }
-  else
-  {
-    for (unsigned int i = 0; i < NUM_COLORS; ++i)
-      if (allColors[i].index == index)
-        return allColors[i].english_name;
-  }
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Color::bg () const
-{
-  int index = (_value & _COLOR_BG) >> 8;
-
-  if (_value & _COLOR_256)
-  {
-    if (_value & _COLOR_HASBG)
-    {
-      std::stringstream s;
-      s << "color" << ((_value & _COLOR_BG) >> 8);
-      return s.str ();
-    }
-  }
-  else
-  {
-    for (unsigned int i = 0; i < NUM_COLORS; ++i)
-      if (allColors[i].index == index)
-        return allColors[i].english_name;
-  }
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Color.h b/src/Color.h
deleted file mode 100644
index 5e39bb00e..000000000
--- a/src/Color.h
+++ /dev/null
@@ -1,75 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_COLOR
-#define INCLUDED_COLOR
-
-#include <string>
-
-#define _COLOR_INVERSE   0x00400000  // Inverse attribute.
-#define _COLOR_256       0x00200000  // 256-color mode.
-#define _COLOR_HASBG     0x00100000  // Has background color (all values taken).
-#define _COLOR_HASFG     0x00080000  // Has foreground color (all values taken).
-#define _COLOR_UNDERLINE 0x00040000  // General underline attribute.
-#define _COLOR_BOLD      0x00020000  // 16-color bold attribute.
-#define _COLOR_BRIGHT    0x00010000  // 16-color bright background attribute.
-#define _COLOR_BG        0x0000FF00  // 8-bit background color index.
-#define _COLOR_FG        0x000000FF  // 8-bit foreground color index.
-
-class Color
-{
-public:
-  enum color_id {nocolor = 0, black, red, green, yellow, blue, magenta, cyan, white};
-
-  Color ();
-  Color (const Color&);
-  Color (unsigned int);                         // 256 | INVERSE | UNDERLINE | BOLD | BRIGHT | (BG << 8) | FG
-  Color (const std::string&);                   // "red on bright black"
-  Color (color_id);                             // fg.
-  Color (color_id, color_id, bool, bool, bool); // fg, bg, underline, bold, bright
-  operator std::string () const;
-  operator int () const;
-
-  void upgrade ();
-  void blend (const Color&);
-
-  std::string colorize (const std::string&) const;
-  static std::string colorize (const std::string&, const std::string&);
-  void _colorize (std::string&, const std::string&) const;
-  static std::string strip (const std::string&);
-
-  bool nontrivial () const;
-
-private:
-  int find (const std::string&);
-  std::string fg () const;
-  std::string bg () const;
-
-private:
-  unsigned int _value;
-};
-
-#endif
diff --git a/test/.gitignore b/test/.gitignore
index 0d38f628a..b4d38ccdd 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,7 +4,6 @@
 *.log
 *.runlog
 col.t
-color.t
 config.t
 dates.t
 eval.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 20a3c0512..e9bd0b7cd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t color.t config.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t config.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/color.t.cpp b/test/color.t.cpp
deleted file mode 100644
index b77841a84..000000000
--- a/test/color.t.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <Context.h>
-#include <Color.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (40 + 256 + 256 + 6*6*6 + 6*6*6 + 1 + 24 + 24 + 3);
-
-  // Names matched to values.
-  t.is ((int) Color (""),        (int) Color (Color::nocolor), "''        == Color::nocolor");
-  t.is ((int) Color ("black"),   (int) Color (Color::black),   "'black'   == Color::black");
-  t.is ((int) Color ("red"),     (int) Color (Color::red),     "'red'     == Color::red");
-  t.is ((int) Color ("green"),   (int) Color (Color::green),   "'green'   == Color::green");
-  t.is ((int) Color ("yellow"),  (int) Color (Color::yellow),  "'yellow'  == Color::yellow");
-  t.is ((int) Color ("blue"),    (int) Color (Color::blue),    "'blue'    == Color::blue");
-  t.is ((int) Color ("magenta"), (int) Color (Color::magenta), "'magenta' == Color::magenta");
-  t.is ((int) Color ("cyan"),    (int) Color (Color::cyan),    "'cyan'    == Color::cyan");
-  t.is ((int) Color ("white"),   (int) Color (Color::white),   "'white'   == Color::white");
-
-  // Auto upgrades.
-  Color c ("red on color0");
-  t.is ((std::string) c, "color1 on color0", "upgrade red on color0 -> color1 on color0");
-
-  c = Color ("color1 on black");
-  t.is ((std::string) c, "color1 on color0", "upgrade color1 on black -> color1 on color0");
-
-  c = Color ("bold red on color0");
-  t.is ((std::string) c, "color9 on color0", "upgrade bold red on color0 -> color9 on color0");
-
-  c = Color ("color1 on bright black");
-  t.is ((std::string) c, "color1 on color8", "upgrade color1 on bright black -> color1 on color8");
-
-  // Simple blending.
-  c = Color ("red");
-  c.blend (Color ("on white"));
-  t.is ((std::string) c, "red on white", "red + on white -> red on white");
-
-  c = Color ("bold underline red");
-  c.blend (Color ("on bright white"));
-  t.is ((std::string) c, "bold underline red on bright white", "bold underline red + on bright white -> bold underline red on bright white");
-
-  // Blending with conflicts.
-  c = Color ("red on white");
-  c.blend (Color ("on blue"));
-  t.is ((std::string) c, "red on blue", "red on white + on blue -> red on blue");
-
-  c = Color ("red on white");
-  c.blend (Color ("blue on magenta"));
-  t.is ((std::string) c, "blue on magenta", "red on white + blue on magenta -> blue on magenta");
-
-  // Blending with upgrades.
-  c = Color ("color1 on color0");
-  c.blend (Color ("blue"));
-  t.is ((std::string) c, "color4 on color0", "color1 on color0 + blue -> color4 on color0");
-
-  // Now the dumb show of every color and its code.
-  t.is (Color::colorize ("foo", "red"),                std::string ("\033[31mfoo\033[0m"),       "red                -> ^[[31m");
-  t.is (Color::colorize ("foo", "bold red"),           std::string ("\033[1;31mfoo\033[0m"),     "bold red           -> ^[[1;31m");
-  t.is (Color::colorize ("foo", "underline red"),      std::string ("\033[4;31mfoo\033[0m"),     "underline red      -> ^[[4;31m");
-  t.is (Color::colorize ("foo", "underline bold red"), std::string ("\033[1;4;31mfoo\033[0m"),   "underline bold red -> ^[[1;4;31m");
-
-  // 16-color foregrounds.
-  t.is (Color::colorize ("foo", ""),                   std::string ("foo"),                      "''                 -> ''");
-
-  t.is (Color::colorize ("foo", "black"),              std::string ("\033[30mfoo\033[0m"),       "black              -> ^[[30m");
-  t.is (Color::colorize ("foo", "red"),                std::string ("\033[31mfoo\033[0m"),       "red                -> ^[[31m");
-  t.is (Color::colorize ("foo", "green"),              std::string ("\033[32mfoo\033[0m"),       "green              -> ^[[32m");
-  t.is (Color::colorize ("foo", "yellow"),             std::string ("\033[33mfoo\033[0m"),       "yellow             -> ^[[33m");
-  t.is (Color::colorize ("foo", "blue"),               std::string ("\033[34mfoo\033[0m"),       "blue               -> ^[[34m");
-  t.is (Color::colorize ("foo", "magenta"),            std::string ("\033[35mfoo\033[0m"),       "magenta            -> ^[[35m");
-  t.is (Color::colorize ("foo", "cyan"),               std::string ("\033[36mfoo\033[0m"),       "cyan               -> ^[[36m");
-  t.is (Color::colorize ("foo", "white"),              std::string ("\033[37mfoo\033[0m"),       "white              -> ^[[37m");
-
-  // 16-color backgrounds.
-  t.is (Color::colorize ("foo", "on bright black"),    std::string ("\033[100mfoo\033[0m"),      "on bright black    -> ^[[100m");
-
-  t.is (Color::colorize ("foo", "on black"),           std::string ("\033[40mfoo\033[0m"),       "on black           -> ^[[40m");
-  t.is (Color::colorize ("foo", "on red"),             std::string ("\033[41mfoo\033[0m"),       "on red             -> ^[[41m");
-  t.is (Color::colorize ("foo", "on green"),           std::string ("\033[42mfoo\033[0m"),       "on green           -> ^[[42m");
-  t.is (Color::colorize ("foo", "on yellow"),          std::string ("\033[43mfoo\033[0m"),       "on yellow          -> ^[[43m");
-  t.is (Color::colorize ("foo", "on blue"),            std::string ("\033[44mfoo\033[0m"),       "on blue            -> ^[[44m");
-  t.is (Color::colorize ("foo", "on magenta"),         std::string ("\033[45mfoo\033[0m"),       "on magenta         -> ^[[45m");
-  t.is (Color::colorize ("foo", "on cyan"),            std::string ("\033[46mfoo\033[0m"),       "on cyan            -> ^[[46m");
-  t.is (Color::colorize ("foo", "on white"),           std::string ("\033[47mfoo\033[0m"),       "on white           -> ^[[47m");
-
-  // 256-color, basic colors.
-  char color [24];
-  char codes [64];
-  char description [64];
-  for (int i = 0; i < 256; ++i)
-  {
-    sprintf (color,       "color%d", i);
-    sprintf (codes,       "\033[38;5;%dmfoo\033[0m", i);
-    sprintf (description, "color%d -> ^[[38;5;%dm", i, i);
-
-    t.is (Color::colorize ("foo", color), std::string (codes), description);
-  }
-
-  for (int i = 0; i < 256; ++i)
-  {
-    sprintf (color,       "on color%d", i);
-    sprintf (codes,       "\033[48;5;%dmfoo\033[0m", i);
-    sprintf (description, "on color%d -> ^[[48;5;%dm", i, i);
-
-    t.is (Color::colorize ("foo", color), std::string (codes), description);
-  }
-
-  // RGB Color Cube.
-  for (int r = 0; r < 6; ++r)
-    for (int g = 0; g < 6; ++g)
-      for (int b = 0; b < 6; ++b)
-      {
-        int code = 16 + (r*36 + g*6 + b);
-        sprintf (color,       "rgb%d%d%d", r, g, b);
-        sprintf (codes,       "\033[38;5;%dmfoo\033[0m", code);
-        sprintf (description, "rgb%d%d%d -> ^[[38;5;%dm", r, g, b, code);
-
-        t.is (Color::colorize ("foo", color), std::string (codes), description);
-      }
-
-  for (int r = 0; r < 6; ++r)
-    for (int g = 0; g < 6; ++g)
-      for (int b = 0; b < 6; ++b)
-      {
-        int code = 16 + (r*36 + g*6 + b);
-        sprintf (color,       "on rgb%d%d%d", r, g, b);
-        sprintf (codes,       "\033[48;5;%dmfoo\033[0m", code);
-        sprintf (description, "on rgb%d%d%d -> ^[[48;5;%dm", r, g, b, code);
-
-        t.is (Color::colorize ("foo", color), std::string (codes), description);
-      }
-
-  // 256-color, grays.
-  // grey == gray.
-  t.is (Color::colorize ("foo", "grey0"), std::string ("\033[38;5;232mfoo\033[0m"), "grey0 -> ^[[38;5;232m");
-
-  for (int i = 0; i < 24; ++i)
-  {
-    sprintf (color,       "gray%d", i);
-    sprintf (codes,       "\033[38;5;%dmfoo\033[0m", i + 232);
-    sprintf (description, "gray%d -> ^[[38;5;%dm", i + 232, i + 232);
-
-    t.is (Color::colorize ("foo", color), std::string (codes), description);
-  }
-
-  for (int i = 0; i < 24; ++i)
-  {
-    sprintf (color,       "on gray%d", i);
-    sprintf (codes,       "\033[48;5;%dmfoo\033[0m", i + 232);
-    sprintf (description, "on gray%d -> ^[[48;5;%dm", i + 232, i + 232);
-
-    t.is (Color::colorize ("foo", color), std::string (codes), description);
-  }
-
-  // std::string Color::strip (const std::string&);
-  t.is (Color::strip (""),                  "",    "Color::strip '' -> ''");
-  t.is (Color::strip ("foo"),               "foo", "Color::strip 'foo' -> 'foo'");
-  t.is (Color::strip ("f\033[1mo\033[0mo"), "foo", "Color::strip 'f<b>o</b>o' -> 'foo'");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 899547dcc8f0ae9d21b802cd28dccf32ec3c898a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 25 Jan 2017 22:49:22 -0500
Subject: [PATCH 315/879] Docs: Updated exposition

---
 EXPOSITION | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/EXPOSITION b/EXPOSITION
index d51f56502..68609d5c4 100644
--- a/EXPOSITION
+++ b/EXPOSITION
@@ -19,8 +19,8 @@ Startup
 
 
 Command Line Parsing
-  Command line parsing is difficult because of all the ambiguity. The solution
-  is to make multiple passes over the command line. For example, the command
+  Command line parsing is difficult because of lots ambiguity. The solution is
+  to make multiple passes over the command line. For example, the command
   determines whether subsequent arguments are interpreted as part of a filter or
   set of modifications.
 
@@ -43,6 +43,8 @@ Command Line Parsing
   tagged to indicate what part of the command line іt represents, such as a
   filter, operator, or command.
 
+  The CLI2 object will be replaced by a generalized parser and grammar.
+
 
 Dispatch
   Dispatch is simple: once the command line is parsed, the command is used to
@@ -73,7 +75,7 @@ TDB2
   isolate code from file I/O, locking and parsing details. It is also
   responsible for minimizing reads, writes and parsing of data files.
 
-  All input is assumed to be UTF8. All stored data is UTF8.
+  All input is assumed to be UTF8. All stored data is treated as UTF8.
 
 
 GC
@@ -107,10 +109,15 @@ Files
   The completed.data file accumulates data over time, and grows unbounded.
 
   The undo.data file accumulates changes over time, and grows unbounded. It
-  provides all the necessary metadata to support the 'undo' command.
+  provides all the necessary metadata to support the 'undo' command. Deleting
+  this file has two effects which are to remove the undo capability, and remove
+  the ability for the 'info' command to show a change history. The undo file
+  can grow quite large, and it can be argued that only the last N transactions
+  are worth keeping, where N is about 10.
 
   The backlog.data file contains an accumulated set of changes that have not
   been transmitted to Taskserver. It grows unbounded between 'sync' commands.
+  If you do not use sync, it is fine to just delete this file to sae space.
 
 
 Filter

From dc7efab0ab9ab3a4040c7310a101bf3dee4e5888 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 00:12:55 -0500
Subject: [PATCH 316/879] Docs: Updated man page

---
 doc/man/task-sync.5.in | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 001185084..fb662472a 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -5,8 +5,8 @@ task-sync \- A discussion and tutorial for the various task(1) data
 synchronization capabilities.
 
 .SH INTRODUCTION
-Taskwarrior has several sync options, external and internal.  If you wish to
-sync your data, choose one method only; mixing methods is only going to lead to
+Taskwarrior has several sync options, both external and built in.  If you wish
+to sync your data, choose one method only; mixing methods is going to lead to
 problems.  Each of the methods discussed have their own strengths.
 
 .SH ALTERNATIVES
@@ -14,14 +14,15 @@ There are three alternatives for syncing data, which are:
 
 1) Version control systems, such as git, hg, svn
 .br
-2) File hosting systems, such as DropBox
+2) File sharing systems, such as DropBox, Google Drive
 .br
 3) Using the Taskserver and the 'sync' command
 
 
 .SH OPTION 1: VERSION CONTROL SYSTEMS
 There are several good, distributed VCS systems (git, hg, ...) and centralized
-VCS systems (svn ...), and they function in a similar fashion for our purposes.
+VCS systems (svn, cvs ...), and they all function in a similar fashion for our
+purposes.
 
 Setup is straightforward.  You place your .task directory under revision
 control.  You then need to perform a regular commit/push/pull/update to make
@@ -44,8 +45,8 @@ Weaknesses:
   - You need to provide the mechanism for making sure copies are up to date
 
 
-.SH OPTION 2: FILE HOSTING SERVICES
-There are many file hosting services, such as DropBox, Amazon S3, Google Drive,
+.SH OPTION 2: FILE SHARING SERVICES
+There are many file sharing services, such as DropBox, Amazon S3, Google Drive,
 SkyDrive and more.  This technique involves storing your .task directory in a
 shared directory under the control of the file hosting services.
 
@@ -76,7 +77,7 @@ Weaknesses:
 
 
 .SH OPTION 3: TASKSERVER
-The Taskserver was designed for this purpose to be secure, fast and conflict
+The Taskserver was designed for this purpose to be secure, fast and conflict-
 free, allowing data interchange between assorted Taskwarrior clients, and
 tolerant of network connectivity problems.
 
@@ -116,7 +117,7 @@ Taskwarrior to trust any certificate.
 
 After setup, you run a one-time sync initialization, like this:
 
-    $ task sync initialize
+    $ task sync init
 
 This will make sure your client and the server are properly in sync to begin
 with.  From this point on, you never run the 'initialize' command again, just
@@ -130,6 +131,17 @@ nothing happens.  If you do not have connectivity, your task changes accumulate
 so that when you next run 'sync' with proper connectivity, the changes are
 properly handled, in the right order.
 
+If you run multiple clients that sync to the same server, you will need to run
+this command on your primary client (the one you use most often):
+
+    $ task config recurrence on
+
+And on the other clients, run:
+
+    $ task config recurrence off
+
+This protects you against the effects of a sync/duplication bug.
+
 Strengths:
 .br
   - Always secure

From 792a4e144553d3b2613f79282b9ecc0bec30ecb4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 00:18:08 -0500
Subject: [PATCH 317/879] Themes: Updated readme

---
 doc/misc/themes/README | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/misc/themes/README b/doc/misc/themes/README
index aaf1af97b..37a373e58 100644
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -1,5 +1,8 @@
 Themes
 
+These scripts are a way to generate a little sample data, and show the color
+themes.  It is not intended for general use.
+
 To generate samples of themes, first execute the 'setup' script to generate the
 sample data.  Note that this data may need to be tweaked to include qualities
 that need to be illustrated in theme sample.

From 28948fc7b203bed9c334a7455c21d06e4e0e5f41 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:01:12 -0500
Subject: [PATCH 318/879] Dependency: Code cleanup

---
 src/dependency.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index 0323d1d75..62108169a 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -40,7 +40,7 @@ extern Context context;
 ////////////////////////////////////////////////////////////////////////////////
 std::vector <Task> dependencyGetBlocked (const Task& task)
 {
-  std::string uuid = task.get ("uuid");
+  auto uuid = task.get ("uuid");
 
   std::vector <Task> blocked;
   for (auto& it : context.tdb2.pending.get_tasks ())

From fa3abfad2e6496a6cf90a256db4211928b8ce361 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:14:14 -0500
Subject: [PATCH 319/879] Dependency: Code cleanup

---
 src/dependency.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index 62108169a..6c91a470f 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -56,7 +56,7 @@ std::vector <Task> dependencyGetBlocked (const Task& task)
 ////////////////////////////////////////////////////////////////////////////////
 std::vector <Task> dependencyGetBlocking (const Task& task)
 {
-  std::string depends = task.get ("depends");
+  auto depends = task.get ("depends");
   std::vector <Task> blocking;
 
   if (depends != "")

From dd54c26f9a4d3443f965851146515e23c6b9559d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:24:11 -0500
Subject: [PATCH 320/879] Context: Code cleanup

---
 src/Context.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 5808d6ea6..883dd5b4e 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -201,8 +201,8 @@ int Context::initialize (int argc, const char** argv)
     cli2.analyze ();
 
     // Extract a recomposed command line.
-    bool foundDefault = false;
-    bool foundAssumed = false;
+    auto foundDefault = false;
+    auto foundAssumed = false;
     std::string combined;
     for (auto& a : cli2._args)
     {

From 04453f5f24f4f8b8fdd50a67788a550d00d3438a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:25:05 -0500
Subject: [PATCH 321/879] Context: Code cleanup

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 883dd5b4e..39936e8ee 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -467,7 +467,7 @@ int Context::dispatch (std::string &out)
 int Context::getWidth ()
 {
   // Determine window size.
-  int width = config.getInteger ("defaultwidth");
+  auto width = config.getInteger ("defaultwidth");
 
   // A zero width value means 'infinity', which is approximated here by 2^16.
   if (width == 0)

From 5ecb00fe0e89401768431550e41ba6f58cdfd5b5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:25:24 -0500
Subject: [PATCH 322/879] Context: Code cleanup

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 39936e8ee..8731af5de 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -502,7 +502,7 @@ int Context::getWidth ()
 int Context::getHeight ()
 {
   // Determine window size.
-  int height = config.getInteger ("defaultheight");
+  auto height = config.getInteger ("defaultheight");
 
   // A zero height value means 'infinity', which is approximated here by 2^16.
   if (height == 0)

From 8b766894b78d2e1a201ba9b56aa6d3bd26568ce9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:25:57 -0500
Subject: [PATCH 323/879] Context: Code cleanup

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 8731af5de..539894191 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -659,7 +659,7 @@ void Context::getLimits (int& rows, int& lines)
   lines = 0;
 
   // This is an integer specified as a filter (limit:10).
-  std::string limit = config.get ("limit");
+  auto limit = config.get ("limit");
   if (limit != "")
   {
     if (limit == "page")

From 8ace57bbeff244bade16e8c8bbab7bb5d4501d24 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:30:28 -0500
Subject: [PATCH 324/879] Context: Code cleanup

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 539894191..27a1ec42f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -809,7 +809,7 @@ void Context::updateXtermTitle ()
 {
   if (config.getBoolean ("xterm.title") && isatty (STDOUT_FILENO))
   {
-    std::string command = cli2.getCommand ();
+    auto command = cli2.getCommand ();
     std::string title;
 
     for (auto a = cli2._args.begin (); a != cli2._args.end (); ++a)

From b2188abb5d2fb35a8f93cd532e22a43bcdfcabaf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 17:30:39 -0500
Subject: [PATCH 325/879] Context: Code cleanup

---
 src/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 27a1ec42f..949195d34 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -828,7 +828,7 @@ void Context::updateXtermTitle ()
 // This function allows a clean output if the command is a helper subcommand.
 void Context::updateVerbosity ()
 {
-  std::string command = cli2.getCommand ();
+  auto command = cli2.getCommand ();
   if (command != "" &&
       command[0] == '_')
   {

From 0c19c3cde1eee4b7b3fb56b5450ae7b5272308a0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 18:28:26 -0500
Subject: [PATCH 326/879] Calc: Code cleanup

---
 src/calc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index 2bc291c3a..c21ec82cf 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -58,7 +58,7 @@ int main (int argc, char** argv)
 
   try
   {
-    bool infix {true};
+    auto infix {true};
 
     // Add a source for constants.
     Eval e;

From 7894e16e4318a8e6faac25b6df3491885045ac72 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 18:28:51 -0500
Subject: [PATCH 327/879] Calc: Code cleanup

---
 src/calc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calc.cpp b/src/calc.cpp
index c21ec82cf..42712eeb1 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -68,6 +68,7 @@ int main (int argc, char** argv)
     // Combine all the arguments into one expression string.
     std::string expression;
     for (int i = 1; i < argc; i++)
+    {
       if (!strcmp (argv[i], "-h") || ! strcmp (argv[i], "--help"))
       {
         std::cout << '\n'
@@ -104,6 +105,7 @@ int main (int argc, char** argv)
         infix = false;
       else
         expression += std::string (argv[i]) + ' ';
+    }
 
     Variant result;
     if (infix)

From 95bac8b612ad131cb2f4ecceea56d012c60818c5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 18:29:02 -0500
Subject: [PATCH 328/879] Calc: Code cleanup

---
 src/calc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index 42712eeb1..d85c361ff 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -114,7 +114,7 @@ int main (int argc, char** argv)
       e.evaluatePostfixExpression (expression, result);
 
     // Show any debug output.
-    for (auto& i : context.debugMessages)
+    for (const auto& i : context.debugMessages)
       std::cout << i << '\n';
 
     // Show the result in string form.

From 9a88084edc03b82a600bea30f96765b1659c6327 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:45:31 -0500
Subject: [PATCH 329/879] legacy: Code cleanup

---
 src/legacy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/legacy.cpp b/src/legacy.cpp
index 26ff4deb0..b52cb0d39 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -122,7 +122,7 @@ std::string legacyCheckForDeprecatedVariables ()
     out << STRING_CONFIG_DEPRECATED_VAR
         << "\n";
 
-    for (auto& dep : deprecated)
+    for (const auto& dep : deprecated)
       out << "  " << dep << "\n";
 
     out << "\n";
@@ -156,7 +156,7 @@ std::string legacyCheckForDeprecatedColumns ()
     out << STRING_CONFIG_DEPRECATED_COL
         << "\n";
 
-    for (auto& dep : deprecated)
+    for (const auto& dep : deprecated)
       out << "  " << dep << "=" << context.config.get (dep) << "\n";
 
     out << "\n";

From 67af4137af53416dfaa0405d5f70e42ee3066a5f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:54:51 -0500
Subject: [PATCH 330/879] main: Code cleanup

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9468730ea..c96e31261 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int argc, const char** argv)
 {
-  int status = 0;
+  int status {0};
 
   // Lightweight version checking that doesn't require initialization or any I/O.
   if (argc == 2 && !strcmp (argv[1], "--version"))

From 952a29991417c3e5d55189951e3f218a68b3770e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:55:34 -0500
Subject: [PATCH 331/879] recur: Code cleanup

---
 src/recur.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index a949eacda..1a445374f 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -171,7 +171,7 @@ bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
     specificEnd = true;
   }
 
-  int recurrence_limit = context.config.getInteger ("recurrence.limit");
+  auto recurrence_limit = context.config.getInteger ("recurrence.limit");
   int recurrence_counter = 0;
   Datetime now;
   for (Datetime i = due; ; i = getNextRecurrence (i, recur))

From 809a1ff3579eb3259a063c9235195ac093e3bab6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:55:43 -0500
Subject: [PATCH 332/879] recur: Code cleanup

---
 src/recur.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 1a445374f..3ae64d77b 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -183,7 +183,7 @@ bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
       // If i > until, it means there are no more tasks to generate, and if the
       // parent mask contains all + or X, then there never will be another task
       // to generate, and this parent task may be safely reaped.
-      std::string mask = parent.get ("mask");
+      auto mask = parent.get ("mask");
       if (mask.length () == allDue.size () &&
           mask.find ('-') == std::string::npos)
         return false;

From 02efddca757574aace30cf4a2b5f6e3c2d8944d8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:55:51 -0500
Subject: [PATCH 333/879] recur: Code cleanup

---
 src/recur.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 3ae64d77b..9c9907c37 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -204,12 +204,12 @@ bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
 ////////////////////////////////////////////////////////////////////////////////
 Datetime getNextRecurrence (Datetime& current, std::string& period)
 {
-  int m = current.month ();
-  int d = current.day ();
-  int y = current.year ();
-  int ho = current.hour ();
-  int mi = current.minute ();
-  int se = current.second ();
+  auto m = current.month ();
+  auto d = current.day ();
+  auto y = current.year ();
+  auto ho = current.hour ();
+  auto mi = current.minute ();
+  auto se = current.second ();
 
   // Some periods are difficult, because they can be vague.
   if (period == "monthly" ||

From 819dbc5285aa00e350d80bc9018bca819f4afb84 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:55:59 -0500
Subject: [PATCH 334/879] recur: Code cleanup

---
 src/recur.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 9c9907c37..7e49d26aa 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -229,7 +229,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
 
   else if (period == "weekdays")
   {
-    int dow = current.dayOfWeek ();
+    auto dow = current.dayOfWeek ();
     int days;
 
          if (dow == 5) days = 3;

From e99786e726689a082c6c052892c66cdb7f840731 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:56:07 -0500
Subject: [PATCH 335/879] recur: Code cleanup

---
 src/recur.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 7e49d26aa..c07ce7eaa 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -378,14 +378,14 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
 // update it's mask.
 void updateRecurrenceMask (Task& task)
 {
-  std::string uuid = task.get ("parent");
+  auto uuid = task.get ("parent");
   Task parent;
 
   if (uuid != "" &&
       context.tdb2.get (uuid, parent))
   {
     unsigned int index = strtol (task.get ("imask").c_str (), NULL, 10);
-    std::string mask = parent.get ("mask");
+    auto mask = parent.get ("mask");
     if (mask.length () > index)
     {
       mask[index] = (task.getStatus () == Task::pending)   ? '-'

From f337bb645889bd6d1094657e7a540b3562f3f6c8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 26 Jan 2017 19:56:13 -0500
Subject: [PATCH 336/879] recur: Code cleanup

---
 src/recur.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index c07ce7eaa..989cd1467 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -425,7 +425,7 @@ bool nag (Task& task)
   if (task.hasTag ("nonag"))
     return false;
 
-  std::string nagMessage = context.config.get ("nag");
+  auto nagMessage = context.config.get ("nag");
   if (nagMessage != "")
   {
     // Scan all pending, non-recurring tasks.

From 4f6c3afa3e785498ef82520866bde8697d399e86 Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Thu, 26 Jan 2017 19:37:48 +0100
Subject: [PATCH 337/879] Refactor history.monthly and history.annual

---
 src/commands/CmdHistory.cpp | 234 ++++++------------------------------
 src/commands/CmdHistory.h   |  82 ++++++++++++-
 2 files changed, 112 insertions(+), 204 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 0e3044e04..c0f8fdf8c 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -39,11 +39,13 @@
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
-CmdHistoryMonthly::CmdHistoryMonthly ()
+template<class HistoryStrategy>
+CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 {
-  _keyword               = "history.monthly";
-  _usage                 = "task <filter> history.monthly";
-  _description           = STRING_CMD_HISTORY_USAGE_M;
+  _keyword               = HistoryStrategy::keyword;
+  _usage                 = HistoryStrategy::usage;
+  _description           = HistoryStrategy::description;
+
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -54,15 +56,16 @@ CmdHistoryMonthly::CmdHistoryMonthly ()
   _category              = Command::Category::graphs;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-int CmdHistoryMonthly::execute (std::string& output)
+template<class HistoryStrategy>
+int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
 {
   int rc = 0;
 
-  std::map <time_t, int> groups;          // Represents any month with data
-  std::map <time_t, int> addedGroup;      // Additions by month
-  std::map <time_t, int> completedGroup;  // Completions by month
-  std::map <time_t, int> deletedGroup;    // Deletions by month
+  // TODO 'groups' should probably be std::set
+  std::map <time_t, int> groups;          // Represents any timeinterval with data
+  std::map <time_t, int> addedGroup;      // Additions by timeinterval
+  std::map <time_t, int> completedGroup;  // Completions by timeinterval
+  std::map <time_t, int> deletedGroup;    // Deletions by timeinterval
 
   // Apply filter.
   handleRecurrence ();
@@ -78,7 +81,7 @@ int CmdHistoryMonthly::execute (std::string& output)
     if (task.has ("end"))
       end = Datetime (task.get_date ("end"));
 
-    time_t epoch = entry.startOfMonth ().toEpoch ();
+    time_t epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
     groups[epoch] = 0;
 
     // Every task has an entry date, but exclude templates.
@@ -88,7 +91,7 @@ int CmdHistoryMonthly::execute (std::string& output)
     // All deleted tasks have an end date.
     if (task.getStatus () == Task::deleted)
     {
-      epoch = end.startOfMonth ().toEpoch ();
+      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
       groups[epoch] = 0;
       ++deletedGroup[epoch];
     }
@@ -96,7 +99,7 @@ int CmdHistoryMonthly::execute (std::string& output)
     // All completed tasks have an end date.
     else if (task.getStatus () == Task::completed)
     {
-      epoch = end.startOfMonth ().toEpoch ();
+      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
       groups[epoch] = 0;
       ++completedGroup[epoch];
     }
@@ -107,8 +110,9 @@ int CmdHistoryMonthly::execute (std::string& output)
   if (context.config.getBoolean ("color"))
     view.forceColor ();
   view.width (context.getWidth ());
-  view.add (STRING_CMD_HISTORY_YEAR);
-  view.add (STRING_CMD_HISTORY_MONTH);
+
+  HistoryStrategy::setupTableDates (view);
+
   view.add (STRING_CMD_HISTORY_ADDED, false);
   view.add (STRING_CMD_HISTORY_COMP,  false);
   view.add (STRING_CMD_HISTORY_DEL,   false);
@@ -124,8 +128,8 @@ int CmdHistoryMonthly::execute (std::string& output)
   int totalCompleted = 0;
   int totalDeleted   = 0;
 
-  int priorYear = 0;
   int row = 0;
+  time_t lastTime = 0;
   for (auto& i : groups)
   {
     row = view.addRow ();
@@ -134,34 +138,26 @@ int CmdHistoryMonthly::execute (std::string& output)
     totalCompleted += completedGroup [i.first];
     totalDeleted   += deletedGroup   [i.first];
 
-    Datetime dt (i.first);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    if (y != priorYear)
-    {
-      view.set (row, 0, y);
-      priorYear = y;
-    }
-    view.set (row, 1, Datetime::monthName(m));
+    HistoryStrategy::insertRowDate (view, row, i.first, lastTime);
+    lastTime = i.first;
 
     int net = 0;
 
     if (addedGroup.find (i.first) != addedGroup.end ())
     {
-      view.set (row, 2, addedGroup[i.first]);
+      view.set (row, HistoryStrategy::dateFieldCount + 0, addedGroup[i.first]);
       net +=addedGroup[i.first];
     }
 
     if (completedGroup.find (i.first) != completedGroup.end ())
     {
-      view.set (row, 3, completedGroup[i.first]);
+      view.set (row, HistoryStrategy::dateFieldCount + 1, completedGroup[i.first]);
       net -= completedGroup[i.first];
     }
 
     if (deletedGroup.find (i.first) != deletedGroup.end ())
     {
-      view.set (row, 4, deletedGroup[i.first]);
+      view.set (row, HistoryStrategy::dateFieldCount + 2, deletedGroup[i.first]);
       net -= deletedGroup[i.first];
     }
 
@@ -171,24 +167,24 @@ int CmdHistoryMonthly::execute (std::string& output)
                     ? Color (Color::red)
                     : Color (Color::green);
 
-    view.set (row, 5, net, net_color);
+    view.set (row, HistoryStrategy::dateFieldCount + 3, net, net_color);
   }
 
   if (view.rows ())
   {
-    row = view.addRow ();
-    view.set (row, 0, ' ');
+    row = view.addRow();
+    view.set (row, 1, " ");
     row = view.addRow ();
 
     Color row_color;
     if (context.color ())
       row_color = Color (Color::nocolor, Color::nocolor, false, true, false);
 
-    view.set (row, 1, STRING_CMD_HISTORY_AVERAGE, row_color);
-    view.set (row, 2, totalAdded     / (view.rows () - 2), row_color);
-    view.set (row, 3, totalCompleted / (view.rows () - 2), row_color);
-    view.set (row, 4, totalDeleted   / (view.rows () - 2), row_color);
-    view.set (row, 5, (totalAdded - totalCompleted - totalDeleted) / (view.rows () - 2), row_color);
+    view.set (row, HistoryStrategy::dateFieldCount - 1, STRING_CMD_HISTORY_AVERAGE, row_color);
+    view.set (row, HistoryStrategy::dateFieldCount + 0, totalAdded     / (view.rows () - 2), row_color);
+    view.set (row, HistoryStrategy::dateFieldCount + 1, totalCompleted / (view.rows () - 2), row_color);
+    view.set (row, HistoryStrategy::dateFieldCount + 2, totalDeleted   / (view.rows () - 2), row_color);
+    view.set (row, HistoryStrategy::dateFieldCount + 3, (totalAdded - totalCompleted - totalDeleted) / (view.rows () - 2), row_color);
   }
 
   std::stringstream out;
@@ -206,169 +202,11 @@ int CmdHistoryMonthly::execute (std::string& output)
   return rc;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-CmdHistoryAnnual::CmdHistoryAnnual ()
-{
-  _keyword               = "history.annual";
-  _usage                 = "task <filter> history.annual";
-  _description           = STRING_CMD_HISTORY_USAGE_A;
-  _read_only             = true;
-  _displays_id           = false;
-  _needs_gc              = false;
-  _uses_context          = true;
-  _accepts_filter        = true;
-  _accepts_modifications = false;
-  _accepts_miscellaneous = false;
-  _category              = Command::Category::graphs;
-}
+// Explicit instantiations, avoiding cpp-inclusion or implementation in header
+template class CmdHistoryBase<MonthlyHistoryStrategy>;
+template class CmdHistoryBase<AnnualHistoryStrategy>;
 
-////////////////////////////////////////////////////////////////////////////////
-int CmdHistoryAnnual::execute (std::string& output)
-{
-  int rc = 0;
-  std::map <time_t, int> groups;          // Represents any month with data
-  std::map <time_t, int> addedGroup;      // Additions by month
-  std::map <time_t, int> completedGroup;  // Completions by month
-  std::map <time_t, int> deletedGroup;    // Deletions by month
 
-  // Apply filter.
-  handleRecurrence ();
-  Filter filter;
-  std::vector <Task> filtered;
-  filter.subset (filtered);
-
-  for (auto& task : filtered)
-  {
-    Datetime entry (task.get_date ("entry"));
-
-    Datetime end;
-    if (task.has ("end"))
-      end = Datetime (task.get_date ("end"));
-
-    time_t epoch = entry.startOfYear ().toEpoch ();
-    groups[epoch] = 0;
-
-    // Every task has an entry date, but exclude templates.
-    if (task.getStatus () != Task::recurring)
-      ++addedGroup[epoch];
-
-    // All deleted tasks have an end date.
-    if (task.getStatus () == Task::deleted)
-    {
-      epoch = end.startOfYear ().toEpoch ();
-      groups[epoch] = 0;
-      ++deletedGroup[epoch];
-    }
-
-    // All completed tasks have an end date.
-    else if (task.getStatus () == Task::completed)
-    {
-      epoch = end.startOfYear ().toEpoch ();
-      groups[epoch] = 0;
-      ++completedGroup[epoch];
-    }
-  }
-
-  // Now build the view.
-  Table view;
-  if (context.config.getBoolean ("color"))
-    view.forceColor ();
-  view.width (context.getWidth ());
-  view.add (STRING_CMD_HISTORY_YEAR);
-  view.add (STRING_CMD_HISTORY_ADDED, false);
-  view.add (STRING_CMD_HISTORY_COMP,  false);
-  view.add (STRING_CMD_HISTORY_DEL,   false);
-  view.add (STRING_CMD_HISTORY_NET,   false);
-
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
-  }
-
-  int totalAdded     = 0;
-  int totalCompleted = 0;
-  int totalDeleted   = 0;
-
-  int priorYear = 0;
-  int row = 0;
-  for (auto& i : groups)
-  {
-    row = view.addRow ();
-
-    totalAdded     += addedGroup     [i.first];
-    totalCompleted += completedGroup [i.first];
-    totalDeleted   += deletedGroup   [i.first];
-
-    Datetime dt (i.first);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    if (y != priorYear)
-    {
-      view.set (row, 0, y);
-      priorYear = y;
-    }
-
-    int net = 0;
-
-    if (addedGroup.find (i.first) != addedGroup.end ())
-    {
-      view.set (row, 1, addedGroup[i.first]);
-      net +=addedGroup[i.first];
-    }
-
-    if (completedGroup.find (i.first) != completedGroup.end ())
-    {
-      view.set (row, 2, completedGroup[i.first]);
-      net -= completedGroup[i.first];
-    }
-
-    if (deletedGroup.find (i.first) != deletedGroup.end ())
-    {
-      view.set (row, 3, deletedGroup[i.first]);
-      net -= deletedGroup[i.first];
-    }
-
-    Color net_color;
-    if (context.color () && net)
-      net_color = net > 0
-                    ? Color (Color::red)
-                    : Color (Color::green);
-
-    view.set (row, 4, net, net_color);
-  }
-
-  if (view.rows ())
-  {
-    view.addRow ();
-    row = view.addRow ();
-
-    Color row_color;
-    if (context.color ())
-      row_color = Color (Color::nocolor, Color::nocolor, false, true, false);
-
-    view.set (row, 0, STRING_CMD_HISTORY_AVERAGE, row_color);
-    view.set (row, 1, totalAdded     / (view.rows () - 2), row_color);
-    view.set (row, 2, totalCompleted / (view.rows () - 2), row_color);
-    view.set (row, 3, totalDeleted   / (view.rows () - 2), row_color);
-    view.set (row, 4, (totalAdded - totalCompleted - totalDeleted) / (view.rows () - 2), row_color);
-  }
-
-  std::stringstream out;
-  if (view.rows ())
-    out << optionalBlankLine ()
-        << view.render ()
-        << '\n';
-  else
-  {
-    context.footnote (STRING_FEEDBACK_NO_TASKS);
-    rc = 1;
-  }
-
-  output = out.str ();
-  return rc;
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 CmdGHistoryMonthly::CmdGHistoryMonthly ()
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index b40006d8f..d66f320c2 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -29,21 +29,91 @@
 
 #include <string>
 #include <Command.h>
+#include <Table.h>
+#include <Datetime.h>
+#include <i18n.h>
 
-class CmdHistoryMonthly : public Command
+template<class HistoryStrategy>
+class CmdHistoryBase : public Command
 {
 public:
-  CmdHistoryMonthly ();
+  CmdHistoryBase ();
   int execute (std::string&);
 };
 
-class CmdHistoryAnnual : public Command
-{
+////////////////////////////////////////////////////////////////////////////i
+class MonthlyHistoryStrategy {
 public:
-  CmdHistoryAnnual ();
-  int execute (std::string&);
+  static Datetime getRelevantDate (const Datetime & dt) {
+    return dt.startOfMonth ();
+  }
+
+  static void setupTableDates (Table & view) {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+  }
+
+  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+    view.set (row, 1, Datetime::monthName(m));
+  }
+
+  static constexpr const char * keyword = "history.monthly";
+  static constexpr const char * usage = "task <filter> history.monthly";
+  static constexpr const char * description = STRING_CMD_HISTORY_USAGE_M;
+  static constexpr unsigned int dateFieldCount = 2;
 };
 
+typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
+////////////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////////i
+class AnnualHistoryStrategy {
+public:
+  static Datetime getRelevantDate (const Datetime & dt) {
+    return dt.startOfYear ();
+  }
+
+  static void setupTableDates (Table & view) {
+    view.add (STRING_CMD_HISTORY_YEAR);
+  }
+
+  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+  }
+
+  static constexpr const char * keyword = "history.annual";
+  static constexpr const char * usage = "task <filter> history.annual";
+  static constexpr const char * description = STRING_CMD_HISTORY_USAGE_A;
+  static constexpr unsigned int dateFieldCount = 1;
+};
+
+typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
+////////////////////////////////////////////////////////////////////////////
+
 class CmdGHistoryMonthly : public Command
 {
 public:

From 9bf0bf7a3903e799d70652e206b175902f91acce Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Fri, 27 Jan 2017 09:43:17 +0100
Subject: [PATCH 338/879] Also refactor ghistory

---
 src/commands/CmdHistory.cpp | 623 +++++++++++-------------------------
 src/commands/CmdHistory.h   |  95 +++++-
 2 files changed, 267 insertions(+), 451 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index c0f8fdf8c..41aa3efe5 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -57,55 +57,142 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 }
 
 template<class HistoryStrategy>
-int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
+void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 {
-  int rc = 0;
+  int widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
 
-  // TODO 'groups' should probably be std::set
-  std::map <time_t, int> groups;          // Represents any timeinterval with data
-  std::map <time_t, int> addedGroup;      // Additions by timeinterval
-  std::map <time_t, int> completedGroup;  // Completions by timeinterval
-  std::map <time_t, int> deletedGroup;    // Deletions by timeinterval
+  // Now build the view.
+  Table view;
+  if (context.config.getBoolean ("color"))
+    view.forceColor ();
+  view.width (context.getWidth ());
 
-  // Apply filter.
-  handleRecurrence ();
-  Filter filter;
-  std::vector <Task> filtered;
-  filter.subset (filtered);
+  HistoryStrategy::setupTableDates (view);
 
-  for (auto& task : filtered)
+  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
+
+  Color color_add    (context.config.get ("color.history.add"));
+  Color color_done   (context.config.get ("color.history.done"));
+  Color color_delete (context.config.get ("color.history.delete"));
+  Color label        (context.config.get ("color.label"));
+
+  view.colorHeader (label);
+
+  // Determine the longest line, and the longest "added" line.
+  int maxAddedLine = 0;
+  int maxRemovedLine = 0;
+  for (auto& i : groups)
   {
-    Datetime entry (task.get_date ("entry"));
+    if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine)
+      maxRemovedLine = completedGroup[i.first] + deletedGroup[i.first];
 
-    Datetime end;
-    if (task.has ("end"))
-      end = Datetime (task.get_date ("end"));
+    if (addedGroup[i.first] > maxAddedLine)
+      maxAddedLine = addedGroup[i.first];
+  }
 
-    time_t epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
-    groups[epoch] = 0;
+  int maxLine = maxAddedLine + maxRemovedLine;
+  if (maxLine > 0)
+  {
+    unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine;
 
-    // Every task has an entry date, but exclude templates.
-    if (task.getStatus () != Task::recurring)
-      ++addedGroup[epoch];
+    int totalAdded     = 0;
+    int totalCompleted = 0;
+    int totalDeleted   = 0;
 
-    // All deleted tasks have an end date.
-    if (task.getStatus () == Task::deleted)
+    time_t priorTime = 0;
+    int row = 0;
+    for (auto& i : groups)
     {
-      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
-      groups[epoch] = 0;
-      ++deletedGroup[epoch];
-    }
+      row = view.addRow ();
 
-    // All completed tasks have an end date.
-    else if (task.getStatus () == Task::completed)
-    {
-      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
-      groups[epoch] = 0;
-      ++completedGroup[epoch];
+      totalAdded     += addedGroup[i.first];
+      totalCompleted += completedGroup[i.first];
+      totalDeleted   += deletedGroup[i.first];
+
+      HistoryStrategy::insertRowDate (view, row, i.first, priorTime);
+      priorTime = i.first;
+
+      unsigned int addedBar     = (widthOfBar *     addedGroup[i.first]) / maxLine;
+      unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;
+      unsigned int deletedBar   = (widthOfBar *   deletedGroup[i.first]) / maxLine;
+
+      std::string bar = "";
+      if (context.color ())
+      {
+        std::string aBar = "";
+        if (addedGroup[i.first])
+        {
+          aBar = format (addedGroup[i.first]);
+          while (aBar.length () < addedBar)
+            aBar = ' ' + aBar;
+        }
+
+        std::string cBar = "";
+        if (completedGroup[i.first])
+        {
+          cBar = format (completedGroup[i.first]);
+          while (cBar.length () < completedBar)
+            cBar = ' ' + cBar;
+        }
+
+        std::string dBar = "";
+        if (deletedGroup[i.first])
+        {
+          dBar = format (deletedGroup[i.first]);
+          while (dBar.length () < deletedBar)
+            dBar = ' ' + dBar;
+        }
+
+        bar += std::string (leftOffset - aBar.length (), ' ');
+
+        bar += color_add.colorize    (aBar);
+        bar += color_done.colorize   (cBar);
+        bar += color_delete.colorize (dBar);
+      }
+      else
+      {
+        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
+        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
+        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
+
+        bar += std::string (leftOffset - aBar.length (), ' ');
+        bar += aBar + cBar + dBar;
+      }
+
+      view.set (row, HistoryStrategy::dateFieldCount + 0, bar);
     }
   }
 
-  // Now build the view.
+  std::stringstream out;
+  if (view.rows ())
+  {
+    out << optionalBlankLine ()
+        << view.render ()
+        << '\n';
+
+    if (context.color ())
+      out << format (STRING_CMD_HISTORY_LEGEND,
+                     color_add.colorize (STRING_CMD_HISTORY_ADDED),
+                     color_done.colorize (STRING_CMD_HISTORY_COMP),
+                     color_delete.colorize (STRING_CMD_HISTORY_DEL))
+          << optionalBlankLine ()
+          << '\n';
+    else
+      out << STRING_CMD_HISTORY_LEGEND_A
+          << '\n';
+  }
+  else
+  {
+    context.footnote (STRING_FEEDBACK_NO_TASKS);
+    rc = 1;
+  }
+
+  output = out.str ();
+}
+
+template<class HistoryStrategy>
+void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
+{
   Table view;
   if (context.config.getBoolean ("color"))
     view.forceColor ();
@@ -199,414 +286,70 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
   }
 
   output = out.str ();
+}
+
+template<class HistoryStrategy>
+int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
+{
+  rc = 0;
+
+  // TODO is this necessary?
+  groups.clear ();
+  addedGroup.clear ();
+  deletedGroup.clear ();
+  completedGroup.clear ();
+
+  // Apply filter.
+  handleRecurrence ();
+  Filter filter;
+  std::vector <Task> filtered;
+  filter.subset (filtered);
+
+  for (auto& task : filtered)
+  {
+    Datetime entry (task.get_date ("entry"));
+
+    Datetime end;
+    if (task.has ("end"))
+      end = Datetime (task.get_date ("end"));
+
+    time_t epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
+    groups[epoch] = 0;
+
+    // Every task has an entry date, but exclude templates.
+    if (task.getStatus () != Task::recurring)
+      ++addedGroup[epoch];
+
+    // All deleted tasks have an end date.
+    if (task.getStatus () == Task::deleted)
+    {
+      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
+      groups[epoch] = 0;
+      ++deletedGroup[epoch];
+    }
+
+    // All completed tasks have an end date.
+    else if (task.getStatus () == Task::completed)
+    {
+      epoch = HistoryStrategy::getRelevantDate (end).toEpoch ();
+      groups[epoch] = 0;
+      ++completedGroup[epoch];
+    }
+  }
+
+  // Now build the view.
+
+  if (HistoryStrategy::graphical) {
+    this->outputGraphical (output);
+  } else {
+    this->outputTabular (output);
+  }
+
   return rc;
 }
 
 // Explicit instantiations, avoiding cpp-inclusion or implementation in header
 template class CmdHistoryBase<MonthlyHistoryStrategy>;
 template class CmdHistoryBase<AnnualHistoryStrategy>;
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-CmdGHistoryMonthly::CmdGHistoryMonthly ()
-{
-  _keyword               = "ghistory.monthly";
-  _usage                 = "task <filter> ghistory.monthly";
-  _description           = STRING_CMD_GHISTORY_USAGE_M;
-  _read_only             = true;
-  _displays_id           = false;
-  _needs_gc              = false;
-  _uses_context          = true;
-  _accepts_filter        = true;
-  _accepts_modifications = false;
-  _accepts_miscellaneous = false;
-  _category              = Command::Category::graphs;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int CmdGHistoryMonthly::execute (std::string& output)
-{
-  int rc = 0;
-  std::map <time_t, int> groups;          // Represents any month with data
-  std::map <time_t, int> addedGroup;      // Additions by month
-  std::map <time_t, int> completedGroup;  // Completions by month
-  std::map <time_t, int> deletedGroup;    // Deletions by month
-
-  // Apply filter.
-  handleRecurrence ();
-  Filter filter;
-  std::vector <Task> filtered;
-  filter.subset (filtered);
-
-  for (auto& task : filtered)
-  {
-    Datetime entry (task.get_date ("entry"));
-
-    Datetime end;
-    if (task.has ("end"))
-      end = Datetime (task.get_date ("end"));
-
-    time_t epoch = entry.startOfMonth ().toEpoch ();
-    groups[epoch] = 0;
-
-    // Every task has an entry date, but exclude templates.
-    if (task.getStatus () != Task::recurring)
-      ++addedGroup[epoch];
-
-    // All deleted tasks have an end date.
-    if (task.getStatus () == Task::deleted)
-    {
-      epoch = end.startOfMonth ().toEpoch ();
-      groups[epoch] = 0;
-      ++deletedGroup[epoch];
-    }
-
-    // All completed tasks have an end date.
-    else if (task.getStatus () == Task::completed)
-    {
-      epoch = end.startOfMonth ().toEpoch ();
-      groups[epoch] = 0;
-      ++completedGroup[epoch];
-    }
-  }
-
-  int widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
-
-  // Now build the view.
-  Table view;
-  if (context.config.getBoolean ("color"))
-    view.forceColor ();
-  view.width (context.getWidth ());
-  view.add (STRING_CMD_GHISTORY_YEAR);
-  view.add (STRING_CMD_GHISTORY_MONTH);
-  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
-
-  Color color_add    (context.config.get ("color.history.add"));
-  Color color_done   (context.config.get ("color.history.done"));
-  Color color_delete (context.config.get ("color.history.delete"));
-  Color label        (context.config.get ("color.label"));
-
-  view.colorHeader (label);
-
-  // Determine the longest line, and the longest "added" line.
-  int maxAddedLine = 0;
-  int maxRemovedLine = 0;
-  for (auto& i : groups)
-  {
-    if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine)
-      maxRemovedLine = completedGroup[i.first] + deletedGroup[i.first];
-
-    if (addedGroup[i.first] > maxAddedLine)
-      maxAddedLine = addedGroup[i.first];
-  }
-
-  int maxLine = maxAddedLine + maxRemovedLine;
-  if (maxLine > 0)
-  {
-    unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine;
-
-    int totalAdded     = 0;
-    int totalCompleted = 0;
-    int totalDeleted   = 0;
-
-    int priorYear = 0;
-    int row = 0;
-    for (auto& i : groups)
-    {
-      row = view.addRow ();
-
-      totalAdded     += addedGroup[i.first];
-      totalCompleted += completedGroup[i.first];
-      totalDeleted   += deletedGroup[i.first];
-
-      Datetime dt (i.first);
-      int m, d, y;
-      dt.toYMD (y, m, d);
-
-      if (y != priorYear)
-      {
-        view.set (row, 0, y);
-        priorYear = y;
-      }
-      view.set (row, 1, Datetime::monthName(m));
-
-      unsigned int addedBar     = (widthOfBar *     addedGroup[i.first]) / maxLine;
-      unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;
-      unsigned int deletedBar   = (widthOfBar *   deletedGroup[i.first]) / maxLine;
-
-      std::string bar = "";
-      if (context.color ())
-      {
-        std::string aBar = "";
-        if (addedGroup[i.first])
-        {
-          aBar = format (addedGroup[i.first]);
-          while (aBar.length () < addedBar)
-            aBar = ' ' + aBar;
-        }
-
-        std::string cBar = "";
-        if (completedGroup[i.first])
-        {
-          cBar = format (completedGroup[i.first]);
-          while (cBar.length () < completedBar)
-            cBar = ' ' + cBar;
-        }
-
-        std::string dBar = "";
-        if (deletedGroup[i.first])
-        {
-          dBar = format (deletedGroup[i.first]);
-          while (dBar.length () < deletedBar)
-            dBar = ' ' + dBar;
-        }
-
-        bar += std::string (leftOffset - aBar.length (), ' ');
-
-        bar += color_add.colorize    (aBar);
-        bar += color_done.colorize   (cBar);
-        bar += color_delete.colorize (dBar);
-      }
-      else
-      {
-        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
-        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
-        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
-
-        bar += std::string (leftOffset - aBar.length (), ' ');
-        bar += aBar + cBar + dBar;
-      }
-
-      view.set (row, 2, bar);
-    }
-  }
-
-  std::stringstream out;
-  if (view.rows ())
-  {
-    out << optionalBlankLine ()
-        << view.render ()
-        << '\n';
-
-    if (context.color ())
-      out << format (STRING_CMD_HISTORY_LEGEND,
-                     color_add.colorize (STRING_CMD_HISTORY_ADDED),
-                     color_done.colorize (STRING_CMD_HISTORY_COMP),
-                     color_delete.colorize (STRING_CMD_HISTORY_DEL))
-          << optionalBlankLine ()
-          << '\n';
-    else
-      out << STRING_CMD_HISTORY_LEGEND_A
-          << '\n';
-  }
-  else
-  {
-    context.footnote (STRING_FEEDBACK_NO_TASKS);
-    rc = 1;
-  }
-
-  output = out.str ();
-  return rc;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-CmdGHistoryAnnual::CmdGHistoryAnnual ()
-{
-  _keyword               = "ghistory.annual";
-  _usage                 = "task <filter> ghistory.annual";
-  _description           = STRING_CMD_GHISTORY_USAGE_A;
-  _read_only             = true;
-  _displays_id           = false;
-  _needs_gc              = false;
-  _uses_context          = true;
-  _accepts_filter        = true;
-  _accepts_modifications = false;
-  _accepts_miscellaneous = false;
-  _category              = Command::Category::graphs;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int CmdGHistoryAnnual::execute (std::string& output)
-{
-  int rc = 0;
-  std::map <time_t, int> groups;          // Represents any month with data
-  std::map <time_t, int> addedGroup;      // Additions by month
-  std::map <time_t, int> completedGroup;  // Completions by month
-  std::map <time_t, int> deletedGroup;    // Deletions by month
-
-  // Apply filter.
-  handleRecurrence ();
-  Filter filter;
-  std::vector <Task> filtered;
-  filter.subset (filtered);
-
-  for (auto& task : filtered)
-  {
-    Datetime entry (task.get_date ("entry"));
-
-    Datetime end;
-    if (task.has ("end"))
-      end = Datetime (task.get_date ("end"));
-
-    time_t epoch = entry.startOfYear ().toEpoch ();
-    groups[epoch] = 0;
-
-    // Every task has an entry date, but exclude templates.
-    if (task.getStatus () != Task::recurring)
-      ++addedGroup[epoch];
-
-    // All deleted tasks have an end date.
-    if (task.getStatus () == Task::deleted)
-    {
-      epoch = end.startOfYear ().toEpoch ();
-      groups[epoch] = 0;
-      ++deletedGroup[epoch];
-    }
-
-    // All completed tasks have an end date.
-    else if (task.getStatus () == Task::completed)
-    {
-      epoch = end.startOfYear ().toEpoch ();
-      groups[epoch] = 0;
-      ++completedGroup[epoch];
-    }
-  }
-
-  int widthOfBar = context.getWidth () - 5;   // 5 == strlen ("YYYY ")
-
-  // Now build the view.
-  Table view;
-  if (context.config.getBoolean ("color"))
-    view.forceColor ();
-  view.width (context.getWidth ());
-  view.add (STRING_CMD_GHISTORY_YEAR);
-  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
-
-  Color color_add    (context.config.get ("color.history.add"));
-  Color color_done   (context.config.get ("color.history.done"));
-  Color color_delete (context.config.get ("color.history.delete"));
-  Color label        (context.config.get ("color.label"));
-
-  view.colorHeader (label);
-
-  // Determine the longest line, and the longest "added" line.
-  int maxAddedLine = 0;
-  int maxRemovedLine = 0;
-  for (auto& i : groups)
-  {
-    if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine)
-      maxRemovedLine = completedGroup[i.first] + deletedGroup[i.first];
-
-    if (addedGroup[i.first] > maxAddedLine)
-      maxAddedLine = addedGroup[i.first];
-  }
-
-  int maxLine = maxAddedLine + maxRemovedLine;
-  if (maxLine > 0)
-  {
-    unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine;
-
-    int totalAdded     = 0;
-    int totalCompleted = 0;
-    int totalDeleted   = 0;
-
-    int priorYear = 0;
-    int row = 0;
-    for (auto& i : groups)
-    {
-      row = view.addRow ();
-
-      totalAdded     += addedGroup[i.first];
-      totalCompleted += completedGroup[i.first];
-      totalDeleted   += deletedGroup[i.first];
-
-      Datetime dt (i.first);
-      int m, d, y;
-      dt.toYMD (y, m, d);
-
-      if (y != priorYear)
-      {
-        view.set (row, 0, y);
-        priorYear = y;
-      }
-
-      unsigned int addedBar     = (widthOfBar *     addedGroup[i.first]) / maxLine;
-      unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;
-      unsigned int deletedBar   = (widthOfBar *   deletedGroup[i.first]) / maxLine;
-
-      std::string bar = "";
-      if (context.color ())
-      {
-        std::string aBar = "";
-        if (addedGroup[i.first])
-        {
-          aBar = format (addedGroup[i.first]);
-          while (aBar.length () < addedBar)
-            aBar = ' ' + aBar;
-        }
-
-        std::string cBar = "";
-        if (completedGroup[i.first])
-        {
-          cBar = format (completedGroup[i.first]);
-          while (cBar.length () < completedBar)
-            cBar = ' ' + cBar;
-        }
-
-        std::string dBar = "";
-        if (deletedGroup[i.first])
-        {
-          dBar = format (deletedGroup[i.first]);
-          while (dBar.length () < deletedBar)
-            dBar = ' ' + dBar;
-        }
-
-        bar += std::string (leftOffset - aBar.length (), ' ');
-        bar += color_add.colorize    (aBar);
-        bar += color_done.colorize   (cBar);
-        bar += color_delete.colorize (dBar);
-      }
-      else
-      {
-        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
-        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
-        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
-
-        bar += std::string (leftOffset - aBar.length (), ' ');
-        bar += aBar + cBar + dBar;
-      }
-
-      view.set (row, 1, bar);
-    }
-  }
-
-  std::stringstream out;
-  if (view.rows ())
-  {
-    out << optionalBlankLine ()
-        << view.render ()
-        << '\n';
-
-    if (context.color ())
-      out << format (STRING_CMD_HISTORY_LEGEND,
-                     color_add.colorize (STRING_CMD_HISTORY_ADDED),
-                     color_done.colorize (STRING_CMD_HISTORY_COMP),
-                     color_delete.colorize (STRING_CMD_HISTORY_DEL))
-          << optionalBlankLine ()
-          << '\n';
-    else
-      out << STRING_CMD_HISTORY_LEGEND_A
-          << '\n';
-  }
-  else
-  {
-    context.footnote (STRING_FEEDBACK_NO_TASKS);
-    rc = 1;
-  }
-
-  output = out.str ();
-  return rc;
-}
-
-////////////////////////////////////////////////////////////////////////////////
+template class CmdHistoryBase<MonthlyGHistoryStrategy>;
+template class CmdHistoryBase<AnnualGHistoryStrategy>;
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index d66f320c2..234a53c95 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -39,6 +39,16 @@ class CmdHistoryBase : public Command
 public:
   CmdHistoryBase ();
   int execute (std::string&);
+
+private:
+  std::map <time_t, int> groups;          // Represents any timeinterval with data
+  std::map <time_t, int> addedGroup;      // Additions by timeinterval
+  std::map <time_t, int> completedGroup;  // Completions by timeinterval
+  std::map <time_t, int> deletedGroup;    // Deletions by timeinterval
+  int rc;
+
+  void outputTabular(std::string&);
+  void outputGraphical(std::string&);
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -73,12 +83,52 @@ public:
   static constexpr const char * usage = "task <filter> history.monthly";
   static constexpr const char * description = STRING_CMD_HISTORY_USAGE_M;
   static constexpr unsigned int dateFieldCount = 2;
+  static constexpr bool graphical = false;
 };
 
 typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
 ////////////////////////////////////////////////////////////////////////////
 
 
+////////////////////////////////////////////////////////////////////////////i
+class MonthlyGHistoryStrategy {
+public:
+  static Datetime getRelevantDate (const Datetime & dt) {
+    return dt.startOfMonth ();
+  }
+
+  static void setupTableDates (Table & view) {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+  }
+
+  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+    view.set (row, 1, Datetime::monthName(m));
+  }
+
+  static constexpr const char * keyword = "ghistory.monthly";
+  static constexpr const char * usage = "task <filter> ghistory.monthly";
+  static constexpr const char * description = STRING_CMD_GHISTORY_USAGE_M;
+  static constexpr unsigned int dateFieldCount = 2;
+  static constexpr bool graphical = true;
+};
+
+typedef CmdHistoryBase<MonthlyGHistoryStrategy> CmdGHistoryMonthly;
+////////////////////////////////////////////////////////////////////////////
+
+
 ////////////////////////////////////////////////////////////////////////////i
 class AnnualHistoryStrategy {
 public:
@@ -109,24 +159,47 @@ public:
   static constexpr const char * usage = "task <filter> history.annual";
   static constexpr const char * description = STRING_CMD_HISTORY_USAGE_A;
   static constexpr unsigned int dateFieldCount = 1;
+  static constexpr bool graphical = false;
 };
 
 typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
 ////////////////////////////////////////////////////////////////////////////
 
-class CmdGHistoryMonthly : public Command
-{
+
+////////////////////////////////////////////////////////////////////////////i
+class AnnualGHistoryStrategy {
 public:
-  CmdGHistoryMonthly ();
-  int execute (std::string&);
+  static Datetime getRelevantDate (const Datetime & dt) {
+    return dt.startOfYear ();
+  }
+
+  static void setupTableDates (Table & view) {
+    view.add (STRING_CMD_HISTORY_YEAR);
+  }
+
+  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+  }
+
+  static constexpr const char * keyword = "ghistory.annual";
+  static constexpr const char * usage = "task <filter> ghistory.annual";
+  static constexpr const char * description = STRING_CMD_GHISTORY_USAGE_A;
+  static constexpr unsigned int dateFieldCount = 1;
+  static constexpr bool graphical = true;
 };
 
-class CmdGHistoryAnnual : public Command
-{
-public:
-  CmdGHistoryAnnual ();
-  int execute (std::string&);
-};
+typedef CmdHistoryBase<AnnualGHistoryStrategy> CmdGHistoryAnnual;
+////////////////////////////////////////////////////////////////////////////
 
 #endif
-////////////////////////////////////////////////////////////////////////////////

From 91132a42c8c537297d69126c48bbbfac0810f0a2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 27 Jan 2017 17:32:19 -0500
Subject: [PATCH 339/879] CmdHistory: Code Cleanup

- Fixed formatting inconsistencies.
- Added Lukas to AUTHORS.
---
 AUTHORS                     |   1 +
 src/commands/CmdHistory.cpp |  19 ++++---
 src/commands/CmdHistory.h   | 110 +++++++++++++++++++++++-------------
 3 files changed, 83 insertions(+), 47 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index cc6fb0a1d..af660ee4e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -137,6 +137,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Jelle van der Waa
   Flavio Poletti
   Antonio Huete Jimenez
+  Lukas Barth
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 41aa3efe5..6e5201343 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -56,6 +56,7 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
   _category              = Command::Category::graphs;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 {
@@ -116,10 +117,10 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
       unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;
       unsigned int deletedBar   = (widthOfBar *   deletedGroup[i.first]) / maxLine;
 
-      std::string bar = "";
+      std::string bar;
       if (context.color ())
       {
-        std::string aBar = "";
+        std::string aBar;
         if (addedGroup[i.first])
         {
           aBar = format (addedGroup[i.first]);
@@ -127,7 +128,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
             aBar = ' ' + aBar;
         }
 
-        std::string cBar = "";
+        std::string cBar;
         if (completedGroup[i.first])
         {
           cBar = format (completedGroup[i.first]);
@@ -135,7 +136,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
             cBar = ' ' + cBar;
         }
 
-        std::string dBar = "";
+        std::string dBar;
         if (deletedGroup[i.first])
         {
           dBar = format (deletedGroup[i.first]);
@@ -151,9 +152,9 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
       }
       else
       {
-        std::string aBar = ""; while (aBar.length () < addedBar)     aBar += '+';
-        std::string cBar = ""; while (cBar.length () < completedBar) cBar += 'X';
-        std::string dBar = ""; while (dBar.length () < deletedBar)   dBar += '-';
+        std::string aBar; while (aBar.length () < addedBar)     aBar += '+';
+        std::string cBar; while (cBar.length () < completedBar) cBar += 'X';
+        std::string dBar; while (dBar.length () < deletedBar)   dBar += '-';
 
         bar += std::string (leftOffset - aBar.length (), ' ');
         bar += aBar + cBar + dBar;
@@ -190,6 +191,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
   output = out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
 {
@@ -288,6 +290,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
   output = out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
 int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
 {
@@ -353,3 +356,5 @@ template class CmdHistoryBase<MonthlyHistoryStrategy>;
 template class CmdHistoryBase<AnnualHistoryStrategy>;
 template class CmdHistoryBase<MonthlyGHistoryStrategy>;
 template class CmdHistoryBase<AnnualGHistoryStrategy>;
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 234a53c95..5fd4e25b3 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -47,23 +47,31 @@ private:
   std::map <time_t, int> deletedGroup;    // Deletions by timeinterval
   int rc;
 
-  void outputTabular(std::string&);
-  void outputGraphical(std::string&);
+  void outputTabular (std::string&);
+  void outputGraphical (std::string&);
 };
 
 ////////////////////////////////////////////////////////////////////////////i
-class MonthlyHistoryStrategy {
+class MonthlyHistoryStrategy
+{
 public:
-  static Datetime getRelevantDate (const Datetime & dt) {
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
     return dt.startOfMonth ();
   }
 
-  static void setupTableDates (Table & view) {
+  static void setupTableDates (Table & view)
+  {
     view.add (STRING_CMD_HISTORY_YEAR);
     view.add (STRING_CMD_HISTORY_MONTH);
   }
 
-  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
     Datetime dt (rowTime);
     int m, d, y;
     dt.toYMD (y, m, d);
@@ -76,33 +84,41 @@ public:
     {
       view.set (row, 0, y);
     }
-    view.set (row, 1, Datetime::monthName(m));
+
+    view.set (row, 1, Datetime::monthName (m));
   }
 
-  static constexpr const char * keyword = "history.monthly";
-  static constexpr const char * usage = "task <filter> history.monthly";
-  static constexpr const char * description = STRING_CMD_HISTORY_USAGE_M;
+  static constexpr const char* keyword         = "history.monthly";
+  static constexpr const char* usage           = "task <filter> history.monthly";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_M;
   static constexpr unsigned int dateFieldCount = 2;
-  static constexpr bool graphical = false;
+  static constexpr bool graphical              = false;
 };
 
 typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
-////////////////////////////////////////////////////////////////////////////
 
 
 ////////////////////////////////////////////////////////////////////////////i
-class MonthlyGHistoryStrategy {
+class MonthlyGHistoryStrategy
+{
 public:
-  static Datetime getRelevantDate (const Datetime & dt) {
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
     return dt.startOfMonth ();
   }
 
-  static void setupTableDates (Table & view) {
+  static void setupTableDates (Table & view)
+  {
     view.add (STRING_CMD_HISTORY_YEAR);
     view.add (STRING_CMD_HISTORY_MONTH);
   }
 
-  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
     Datetime dt (rowTime);
     int m, d, y;
     dt.toYMD (y, m, d);
@@ -115,32 +131,40 @@ public:
     {
       view.set (row, 0, y);
     }
-    view.set (row, 1, Datetime::monthName(m));
+
+    view.set (row, 1, Datetime::monthName (m));
   }
 
-  static constexpr const char * keyword = "ghistory.monthly";
-  static constexpr const char * usage = "task <filter> ghistory.monthly";
-  static constexpr const char * description = STRING_CMD_GHISTORY_USAGE_M;
+  static constexpr const char* keyword         = "ghistory.monthly";
+  static constexpr const char* usage           = "task <filter> ghistory.monthly";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_M;
   static constexpr unsigned int dateFieldCount = 2;
-  static constexpr bool graphical = true;
+  static constexpr bool graphical              = true;
 };
 
 typedef CmdHistoryBase<MonthlyGHistoryStrategy> CmdGHistoryMonthly;
-////////////////////////////////////////////////////////////////////////////
 
 
 ////////////////////////////////////////////////////////////////////////////i
-class AnnualHistoryStrategy {
+class AnnualHistoryStrategy
+{
 public:
-  static Datetime getRelevantDate (const Datetime & dt) {
+  static Datetime getRelevantDate (const Datetime & dt) 
+  {
     return dt.startOfYear ();
   }
 
-  static void setupTableDates (Table & view) {
+  static void setupTableDates (Table & view)
+  {
     view.add (STRING_CMD_HISTORY_YEAR);
   }
 
-  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
     Datetime dt (rowTime);
     int m, d, y;
     dt.toYMD (y, m, d);
@@ -155,29 +179,36 @@ public:
     }
   }
 
-  static constexpr const char * keyword = "history.annual";
-  static constexpr const char * usage = "task <filter> history.annual";
-  static constexpr const char * description = STRING_CMD_HISTORY_USAGE_A;
+  static constexpr const char* keyword         = "history.annual";
+  static constexpr const char* usage           = "task <filter> history.annual";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_A;
   static constexpr unsigned int dateFieldCount = 1;
-  static constexpr bool graphical = false;
+  static constexpr bool graphical              = false;
 };
 
 typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
-////////////////////////////////////////////////////////////////////////////
 
 
 ////////////////////////////////////////////////////////////////////////////i
-class AnnualGHistoryStrategy {
+class AnnualGHistoryStrategy
+{
 public:
-  static Datetime getRelevantDate (const Datetime & dt) {
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
     return dt.startOfYear ();
   }
 
-  static void setupTableDates (Table & view) {
+  static void setupTableDates (Table & view)
+  {
     view.add (STRING_CMD_HISTORY_YEAR);
   }
 
-  static void insertRowDate (Table & view, int row, time_t rowTime, time_t lastTime) {
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
     Datetime dt (rowTime);
     int m, d, y;
     dt.toYMD (y, m, d);
@@ -192,14 +223,13 @@ public:
     }
   }
 
-  static constexpr const char * keyword = "ghistory.annual";
-  static constexpr const char * usage = "task <filter> ghistory.annual";
-  static constexpr const char * description = STRING_CMD_GHISTORY_USAGE_A;
+  static constexpr const char* keyword         = "ghistory.annual";
+  static constexpr const char* usage           = "task <filter> ghistory.annual";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_A;
   static constexpr unsigned int dateFieldCount = 1;
-  static constexpr bool graphical = true;
+  static constexpr bool graphical              = true;
 };
 
 typedef CmdHistoryBase<AnnualGHistoryStrategy> CmdGHistoryAnnual;
-////////////////////////////////////////////////////////////////////////////
 
 #endif

From 087cee5425e118469ac8573b735241ccaf9178a5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 16:22:43 -0500
Subject: [PATCH 340/879] CmdLogo: Code cleanup

---
 src/commands/CmdLogo.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 22ee271bc..801f5ea6f 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -49,11 +49,6 @@ CmdLogo::CmdLogo ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Algorithm:
-//   Copy file rc.data.location/extensions
-//   Generate UUID
-//   Call the "install" function once, store results in rc:
-//     extension.<uuid>=<JSON>
 int CmdLogo::execute (std::string& output)
 {
   static const char* data[] =
@@ -89,7 +84,7 @@ int CmdLogo::execute (std::string& output)
     ""
   };
 
-  if (!context.color ())
+  if (! context.color ())
     throw std::string (STRING_CMD_LOGO_COLOR_REQ);
 
   std::string indent (context.config.getInteger ("indent.report"), ' ');

From b2beb34e9a39cc647393f5598c90abe5c9b21b7f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 16:44:55 -0500
Subject: [PATCH 341/879] CmdAliases: Code cleanup

---
 src/commands/CmdAliases.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 5a93093e2..37b5f8993 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -51,7 +51,7 @@ CmdCompletionAliases::CmdCompletionAliases ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionAliases::execute (std::string& output)
 {
-  for (auto& alias : context.config)
+  for (const auto& alias : context.config)
     if (alias.first.substr (0, 6) == "alias.")
       output += alias.first.substr (6) + '\n';
 

From fe24e078a4d167f004b0225d1403f6be57c73f69 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:08:07 -0500
Subject: [PATCH 342/879] CmdUnique: Code cleanup

---
 src/commands/CmdUnique.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 9ebdae574..f215e3a58 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -63,7 +63,7 @@ int CmdUnique::execute (std::string& output)
   filter.subset (filtered);
 
   // Find <attribute>.
-  std::string attribute = "";
+  std::string attribute {};
 
   // Just the first arg.
   auto words = context.cli2.getWords ();
@@ -75,17 +75,23 @@ int CmdUnique::execute (std::string& output)
   if (! context.cli2.canonicalize (canonical, "attribute", attribute))
     throw std::string (STRING_CMD_UNIQUE_VALID);
 
-  // Find number of matching tasks.
+  // Find the unique set of matching tasks.
   std::set <std::string> values;
   for (auto& task : filtered)
+  {
     if (task.has (canonical))
+    {
       values.insert (task.get (canonical));
+    }
     else if (canonical == "id"                  &&
              task.getStatus () != Task::deleted &&
              task.getStatus () != Task::completed)
+    {
       values.insert (format (task.id));
+    }
+  }
 
-  // Generate list of unique values.
+  // Generate list of values.
   for (auto& value : values)
     output += value + '\n';
 

From cefc287986234a5a87b2c2759452184076de013e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:38:02 -0500
Subject: [PATCH 343/879] CmdAnnotate: Code cleanup

---
 src/commands/CmdAnnotate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 99ead948e..1de036853 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -99,7 +99,7 @@ int CmdAnnotate::execute (std::string&)
              && confirm (STRING_CMD_ANNO_CONFIRM_R)) ||
             context.config.getBoolean ("recurrence.confirmation"))
         {
-          std::vector <Task> siblings = context.tdb2.siblings (task);
+          auto siblings = context.tdb2.siblings (task);
           for (auto& sibling : siblings)
           {
             sibling.modify (Task::modAnnotate, true);
@@ -126,7 +126,7 @@ int CmdAnnotate::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From 396e923f22bcded5b29a1dfc5671afa3d0aceb97 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:49:16 -0500
Subject: [PATCH 344/879] CmdAppend: Code cleanup

---
 src/commands/CmdAppend.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 8769e8796..d564d4ea8 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -78,9 +78,9 @@ int CmdAppend::execute (std::string&)
     Task before (task);
 
     // Append to the specified task.
-    std::string question = format (STRING_CMD_APPEND_CONFIRM,
-                                   task.identifier (true),
-                                   task.get ("description"));
+    auto question = format (STRING_CMD_APPEND_CONFIRM,
+                            task.identifier (true),
+                            task.get ("description"));
 
     task.modify (Task::modAppend, true);
 
@@ -126,7 +126,7 @@ int CmdAppend::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From 4a0c6995ed35029557d5bec9e98019f0eb56952d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:49:28 -0500
Subject: [PATCH 345/879] CmdAttributes: Code cleanup

---
 src/commands/CmdAttributes.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 961308694..8c07eafce 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -55,11 +55,11 @@ CmdZshAttributes::CmdZshAttributes ()
 int CmdZshAttributes::execute (std::string& output)
 {
   // Get a list of all columns, sort them.
-  std::vector <std::string> columns = context.getColumns ();
+  auto columns = context.getColumns ();
   std::sort (columns.begin (), columns.end ());
 
   std::stringstream out;
-  for (auto& col : columns)
+  for (const auto& col : columns)
     out << col << ':' << col << '\n';
 
   output = out.str ();

From a206d9405b9397126f51ea4797b9399d18781d9e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:50:51 -0500
Subject: [PATCH 346/879] CmdBurndown: Code cleanup

---
 src/commands/CmdBurndown.cpp | 38 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index c54abad41..d1500fd68 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -50,35 +50,22 @@ extern Context context;
 class Bar
 {
 public:
-  Bar ();
+  Bar () = default;
   Bar (const Bar&);
   Bar& operator= (const Bar&);
-  ~Bar ();
+  ~Bar () = default;
 
 public:
-  int _offset;                   // from left of chart
-  std::string _major_label;      // x-axis label, major (year/-/month)
-  std::string _minor_label;      // x-axis label, minor (month/week/day)
-  int _pending;                  // Number of pending tasks in period
-  int _started;                  // Number of started tasks in period
-  int _done;                     // Number of done tasks in period
-  int _added;                    // Number added in period
-  int _removed;                  // Number removed in period
+  int _offset              {0};    // from left of chart
+  std::string _major_label {""};   // x-axis label, major (year/-/month)
+  std::string _minor_label {""};   // x-axis label, minor (month/week/day)
+  int _pending             {0};    // Number of pending tasks in period
+  int _started             {0};    // Number of started tasks in period
+  int _done                {0};    // Number of done tasks in period
+  int _added               {0};    // Number added in period
+  int _removed             {0};    // Number removed in period
 };
 
-////////////////////////////////////////////////////////////////////////////////
-Bar::Bar ()
-: _offset (0)
-, _major_label ("")
-, _minor_label ("")
-, _pending (0)
-, _started (0)
-, _done (0)
-, _added (0)
-, _removed (0)
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 Bar::Bar (const Bar& other)
 {
@@ -103,11 +90,6 @@ Bar& Bar::operator= (const Bar& other)
   return *this;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-Bar::~Bar ()
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Data gathering algorithm:
 //

From 8ea7a88281014fb2dda5f9dd845c4d4c75302efd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:52:04 -0500
Subject: [PATCH 347/879] CmdCalc: Code cleanup

---
 src/commands/CmdCalc.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 6bbc5c6b0..0315c1216 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -54,10 +54,8 @@ CmdCalc::CmdCalc ()
 int CmdCalc::execute (std::string& output)
 {
   // Configurable infix/postfix
-  bool infix = true;
-  if (context.config.get ("expressions") == "infix")
-    infix = true;
-  else if (context.config.get ("expressions") == "postfix")
+  auto infix {true};
+  if (context.config.get ("expressions") == "postfix")
     infix = false;
 
   // Create an evaluator with DOM access.
@@ -68,7 +66,7 @@ int CmdCalc::execute (std::string& output)
 
   // Compile all the args into one expression.
   std::string expression;
-  for (auto& word : context.cli2.getWords ())
+  for (const auto& word : context.cli2.getWords ())
     expression += word + ' ';
 
   // Evaluate according to preference.

From 6828ce30f5741adeb3fedf28c7c931ffd2f62dec Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 17:53:05 -0500
Subject: [PATCH 348/879] CmdColor: Code cleanup

---
 src/commands/CmdColor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index a7123047d..7bce8376d 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -59,8 +59,8 @@ int CmdColor::execute (std::string& output)
   int rc = 0;
 
   // Get the non-attribute, non-fancy command line arguments.
-  bool legend = false;
-  std::vector <std::string> words = context.cli2.getWords ();
+  auto legend = false;
+  auto words = context.cli2.getWords ();
   for (auto& word : words)
     if (closeEnough ("legend", word))
       legend = true;

From 5806cddfd3e043a210baec4e6402f08e8fddf058 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 19:19:42 -0500
Subject: [PATCH 349/879] CmdColumns: Code cleanup

---
 src/commands/CmdColumns.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 07328ddcd..3cd73fc21 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -58,13 +58,13 @@ int CmdColumns::execute (std::string& output)
 {
   // Obtain the arguments from the description.  That way, things like '--'
   // have already been handled.
-  std::vector <std::string> words = context.cli2.getWords ();
+  auto words = context.cli2.getWords ();
   if (words.size () > 1)
     throw std::string (STRING_CMD_COLUMNS_ARGS);
 
   // Include all columns in the table.
   std::vector <std::string> names;
-  for (auto& col : context.columns)
+  for (const auto& col : context.columns)
     names.push_back (col.first);
 
   std::sort (names.begin (), names.end ());
@@ -88,17 +88,17 @@ int CmdColumns::execute (std::string& output)
     formats.intraColorOdd (alternate);
   }
 
-  for (auto& name : names)
+  for (const auto& name : names)
   {
     if (words.size () == 0 ||
         find (name, words[0], false) != std::string::npos)
     {
-      const std::vector <std::string> styles   = context.columns[name]->styles ();
-      const std::vector <std::string> examples = context.columns[name]->examples ();
+      auto styles   = context.columns[name]->styles ();
+      auto examples = context.columns[name]->examples ();
 
       for (unsigned int i = 0; i < styles.size (); ++i)
       {
-        int row = formats.addRow ();
+        auto row = formats.addRow ();
         formats.set (row, 0, i == 0 ? name : "");
         formats.set (row, 1, i == 0 ? context.columns[name]->type () : "");
         formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? STRING_COLUMN_LABEL_MODIFY : STRING_COLUMN_LABEL_NOMODIFY) : "");
@@ -108,7 +108,7 @@ int CmdColumns::execute (std::string& output)
     }
   }
 
-  int row = formats.addRow ();
+  auto row = formats.addRow ();
   formats.set (row, 0, "<uda>");
   formats.set (row, 1, "<type>");
   formats.set (row, 2, "Modifiable");
@@ -148,13 +148,13 @@ int CmdCompletionColumns::execute (std::string& output)
 {
   // Include all columns.
   std::vector <std::string> names;
-  for (auto& col : context.columns)
+  for (const auto& col : context.columns)
     names.push_back (col.first);
 
   std::sort (names.begin (), names.end ());
 
   // Render only the column names.
-  for (auto& name : names)
+  for (const auto& name : names)
     output += name + '\n';
 
   return 0;

From 9e28c62730d5a104169fad1d9eebf9b09f2d1f39 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 20:31:52 -0500
Subject: [PATCH 350/879] CmdCalendar: Code cleanup

---
 src/commands/CmdCalendar.cpp | 106 +++++++++++++++++------------------
 1 file changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index c944b1143..5dfbd3307 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -64,11 +64,11 @@ int CmdCalendar::execute (std::string& output)
 
   // Each month requires 28 text columns width.  See how many will actually
   // fit.  But if a preference is specified, and it fits, use it.
-  int width = context.getWidth ();
-  int preferredMonthsPerLine = (context.config.getInteger ("monthsperline"));
-  int monthsThatFit = width / 26;
+  auto width = context.getWidth ();
+  auto preferredMonthsPerLine = context.config.getInteger ("monthsperline");
+  auto monthsThatFit = width / 26;
 
-  int monthsPerLine = monthsThatFit;
+  auto monthsPerLine = monthsThatFit;
   if (preferredMonthsPerLine != 0 && preferredMonthsPerLine < monthsThatFit)
     monthsPerLine = preferredMonthsPerLine;
 
@@ -77,12 +77,12 @@ int CmdCalendar::execute (std::string& output)
   auto tasks = context.tdb2.pending.get_tasks ();
 
   Datetime today;
-  bool getpendingdate = false;
-  int monthsToDisplay = 1;
-  int mFrom = today.month ();
-  int yFrom = today.year ();
-  int mTo = mFrom;
-  int yTo = yFrom;
+  auto getPendingDate = false;
+  auto monthsToDisplay = 1;
+  auto mFrom = today.month ();
+  auto yFrom = today.year ();
+  auto mTo = mFrom;
+  auto yTo = yFrom;
 
   // Defaults.
   monthsToDisplay = monthsPerLine;
@@ -90,12 +90,10 @@ int CmdCalendar::execute (std::string& output)
   yFrom = today.year ();
 
   // Set up a vector of commands (1), for autoComplete.
-  std::vector <std::string> commandNames;
-  commandNames.push_back ("calendar");
+  std::vector <std::string> commandNames {"calendar"};
 
   // Set up a vector of keywords, for autoComplete.
-  std::vector <std::string> keywordNames;
-  keywordNames.push_back ("due");
+  std::vector <std::string> keywordNames {"due"};
 
   // Set up a vector of months, for autoComplete.
   std::vector <std::string> monthNames;
@@ -106,13 +104,11 @@ int CmdCalendar::execute (std::string& output)
   std::vector <std::string> matches;
 
   // Look at all args, regardless of sequence.
-  int argMonth = 0;
-  int argYear = 0;
-  bool argWholeYear = false;
+  auto argMonth = 0;
+  auto argYear = 0;
+  auto argWholeYear = false;
 
-  std::vector <std::string> words = context.cli2.getWords ();
-
-  for (auto& arg : words)
+  for (auto& arg : context.cli2.getWords ())
   {
     // Some version of "calendar".
     if (autoComplete (Lexer::lowerCase (arg), commandNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
@@ -120,7 +116,7 @@ int CmdCalendar::execute (std::string& output)
 
     // "due".
     else if (autoComplete (Lexer::lowerCase (arg), keywordNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
-      getpendingdate = true;
+      getPendingDate = true;
 
     // "y".
     else if (Lexer::lowerCase (arg) == "y")
@@ -152,7 +148,7 @@ int CmdCalendar::execute (std::string& output)
 
   // Supported combinations:
   //
-  //   Command line  monthsToDisplay  mFrom  yFrom  getpendingdate
+  //   Command line  monthsToDisplay  mFrom  yFrom  getPendingDate
   //   ------------  ---------------  -----  -----  --------------
   //   cal             monthsPerLine  today  today           false
   //   cal y                      12  today  today           false
@@ -174,8 +170,8 @@ int CmdCalendar::execute (std::string& output)
     yFrom = argYear;
 
   // Now begin the data subset and rendering.
-  int countDueDates = 0;
-  if (getpendingdate == true)
+  auto countDueDates = 0;
+  if (getPendingDate == true)
   {
     // Find the oldest pending due date.
     Datetime oldest (2037, 12, 31);
@@ -198,8 +194,8 @@ int CmdCalendar::execute (std::string& output)
 
   if (context.config.getBoolean ("calendar.offset"))
   {
-    int moffset = context.config.getInteger ("calendar.offset.value") % 12;
-    int yoffset = context.config.getInteger ("calendar.offset.value") / 12;
+    auto moffset = context.config.getInteger ("calendar.offset.value") % 12;
+    auto yoffset = context.config.getInteger ("calendar.offset.value") / 12;
     mFrom += moffset;
     yFrom += yoffset;
     if (mFrom < 1)
@@ -222,21 +218,21 @@ int CmdCalendar::execute (std::string& output)
     yTo++;
   }
 
-  int details_yFrom = yFrom;
-  int details_mFrom = mFrom;
+  auto details_yFrom = yFrom;
+  auto details_mFrom = mFrom;
 
   std::stringstream out;
   out << '\n';
 
   while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
   {
-    int nextM = mFrom;
-    int nextY = yFrom;
+    auto nextM = mFrom;
+    auto nextY = yFrom;
 
     // Print month headers (cheating on the width settings, yes)
     for (int i = 0 ; i < monthsPerLine ; i++)
     {
-      std::string month = Datetime::monthName (nextM);
+      auto month = Datetime::monthName (nextM);
 
       //    12345678901234567890123456 = 26 chars wide
       //                ^^             = center
@@ -252,10 +248,10 @@ int CmdCalendar::execute (std::string& output)
       //   |  31 27 28 29 30 31       |
       //   +--------------------------+
 
-      int totalWidth = 26;
-      int labelWidth = month.length () + 5;  // 5 = " 2009"
-      int leftGap = (totalWidth / 2) - (labelWidth / 2);
-      int rightGap = totalWidth - leftGap - labelWidth;
+      auto totalWidth = 26;
+      auto labelWidth = month.length () + 5;  // 5 = " 2009"
+      auto leftGap = (totalWidth / 2) - (labelWidth / 2);
+      auto rightGap = totalWidth - leftGap - labelWidth;
 
       out << std::setw (leftGap) << ' '
           << month
@@ -329,16 +325,16 @@ int CmdCalendar::execute (std::string& output)
     }
 
     Datetime date_after (details_yFrom, details_mFrom, details_dFrom);
-    std::string after = date_after.toString (context.config.get ("dateformat"));
+    auto after = date_after.toString (context.config.get ("dateformat"));
 
     Datetime date_before (yTo, mTo, 1);
-    std::string before = date_before.toString (context.config.get ("dateformat"));
+    auto before = date_before.toString (context.config.get ("dateformat"));
 
     // Table with due date information
     if (context.config.get ("calendar.details") == "full")
     {
       // Assert that 'report' is a valid report.
-      std::string report = context.config.get ("calendar.details.report");
+      auto report = context.config.get ("calendar.details.report");
       if (context.commands.find (report) == context.commands.end ())
         throw std::string (STRING_ERROR_DETAILS);
 
@@ -346,7 +342,7 @@ int CmdCalendar::execute (std::string& output)
       //                 calendar --> taskendar
 
       // If the executable was "cal" or equivalent, replace it with "task".
-      std::string executable = context.cli2._original_args[0].attribute ("raw");
+      auto executable = context.cli2._original_args[0].attribute ("raw");
       auto cal = executable.find ("cal");
       if (cal != std::string::npos)
         executable = executable.substr (0, cal) + PACKAGE;
@@ -379,17 +375,17 @@ int CmdCalendar::execute (std::string& output)
         if (it.first.substr (0, 8) == "holiday.")
           if (it.first.substr (it.first.size () - 4) == "name")
           {
-            std::string holName = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".name");
-            std::string holDate = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".date");
+            auto holName = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".name");
+            auto holDate = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".date");
             Datetime hDate (holDate.c_str (), context.config.get ("dateformat.holiday"));
 
             if (date_after < hDate && hDate < date_before)
-              hm[hDate.toEpoch()].push_back(holName);
+              hm[hDate.toEpoch()].push_back (holName);
           }
 
-      std::string format = context.config.get ("report." +
-                                               context.config.get ("calendar.details.report") +
-                                               ".dateformat");
+      auto format = context.config.get ("report." +
+                                        context.config.get ("calendar.details.report") +
+                                        ".dateformat");
       if (format == "")
         format = context.config.get ("dateformat.report");
       if (format == "")
@@ -397,12 +393,12 @@ int CmdCalendar::execute (std::string& output)
 
       for (auto& hm_it : hm)
       {
-        std::vector <std::string> v = hm_it.second;
+        auto v = hm_it.second;
         Datetime hDate (hm_it.first);
-        std::string d = hDate.toString (format);
+        auto d = hDate.toString (format);
         for (size_t i = 0; i < v.size(); i++)
         {
-          int row = holTable.addRow ();
+          auto row = holTable.addRow ();
           holTable.set (row, 0, d);
           holTable.set (row, 1, v[i]);
         }
@@ -427,7 +423,7 @@ std::string CmdCalendar::renderMonths (
   int monthsPerLine)
 {
   // What day of the week does the user consider the first?
-  int weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
+  auto weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
   if (weekStart != 0 && weekStart != 1)
     throw std::string (STRING_CMD_CAL_SUN_MON);
 
@@ -492,7 +488,7 @@ std::string CmdCalendar::renderMonths (
     daysInMonth.push_back (Datetime::daysInMonth (thisYear, thisMonth++));
   }
 
-  int row = 0;
+  auto row = 0;
 
   Color color_today      (context.config.get ("color.calendar.today"));
   Color color_due        (context.config.get ("color.calendar.due"));
@@ -513,8 +509,8 @@ std::string CmdCalendar::renderMonths (
     for (int d = 1; d <= daysInMonth[mpl]; ++d)
     {
       Datetime temp (years[mpl], months[mpl], d);
-      int dow = temp.dayOfWeek ();
-      int woy = temp.week ();
+      auto dow = temp.dayOfWeek ();
+      auto woy = temp.week ();
 
       if (context.config.getBoolean ("displayweeknumber"))
         view.set (row,
@@ -524,9 +520,9 @@ std::string CmdCalendar::renderMonths (
                   color_weeknumber);
 
       // Calculate column id.
-      int thisCol = dow +                       // 0 = Sunday
-                    (weekStart == 1 ? 0 : 1) +  // Offset for weekStart
-                    (8 * mpl);                  // Columns in 1 month
+      auto thisCol = dow +                       // 0 = Sunday
+                     (weekStart == 1 ? 0 : 1) +  // Offset for weekStart
+                     (8 * mpl);                  // Columns in 1 month
 
       if (thisCol == (8 * mpl))
         thisCol += 7;

From 0aa7b4c3e35599e0629ffca404fefa0a0fc2a3ad Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 20:35:50 -0500
Subject: [PATCH 351/879] CmdCommands: Code cleanup

---
 src/commands/CmdCommands.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 36f79ac19..4f0156380 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -85,7 +85,7 @@ int CmdCommands::execute (std::string& output)
 
   for (auto& command : context.commands)
   {
-    int row = view.addRow ();
+    auto row = view.addRow ();
     view.set (row, 0, command.first);
     view.set (row, 1, Command::categoryNames.at (command.second->category ()));
 
@@ -144,15 +144,14 @@ int CmdCompletionCommands::execute (std::string& output)
 {
   // Get a list of all commands.
   std::vector <std::string> commands;
-
-  for (auto& command : context.commands)
+  for (const auto& command : context.commands)
     commands.push_back (command.first);
 
   // Sort alphabetically.
   std::sort (commands.begin (), commands.end ());
 
   std::stringstream out;
-  for (auto& c : commands)
+  for (const auto& c : commands)
     out << c << '\n';
 
   output = out.str ();
@@ -179,6 +178,7 @@ CmdZshCommands::CmdZshCommands ()
 struct ZshCommand
 {
   bool operator< (const struct ZshCommand&) const;
+
   Command::Category _category;
   std::string _command;
   std::string _description;
@@ -222,7 +222,7 @@ int CmdZshCommands::execute (std::string& output)
 
   // Emit the commands in order.
   std::stringstream out;
-  for (auto& zc : commands)
+  for (const auto& zc : commands)
     out << zc._command << ':'
         << Command::categoryNames.at (zc._category) << ':'
         << zc._description << '\n';

From bc2b8cca5298353aa2ebf85fa42ce2ff05654a95 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 20:48:14 -0500
Subject: [PATCH 352/879] CmdConfig: Code cleanup

---
 src/commands/CmdConfig.cpp | 45 ++++++++++++++++++++------------------
 src/commands/CmdConfig.h   |  4 ++--
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 21c89f795..0ccdc1529 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -53,14 +53,17 @@ CmdConfig::CmdConfig ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool CmdConfig::setConfigVariable (std::string name, std::string value, bool confirmation /* = false */)
+bool CmdConfig::setConfigVariable (
+  const std::string& name,
+  const std::string& value,
+  bool confirmation /* = false */)
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
   File::read (context.config._original_file, contents);
 
-  bool found = false;
-  bool change = false;
+  auto found = false;
+  auto change = false;
 
   for (auto& line : contents)
   {
@@ -76,10 +79,10 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
       if (!confirmation ||
           confirm (format (STRING_CMD_CONFIG_CONFIRM, name, context.config.get (name), value)))
       {
+        line = name + '=' + json::encode (value);
+
         if (comment != std::string::npos)
-          line = name + '=' + json::encode (value) + ' ' + line.substr (comment);
-        else
-          line = name + '=' + json::encode (value);
+          line += ' ' + line.substr (comment);
 
         change = true;
       }
@@ -87,8 +90,8 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
   }
 
   // Not found, so append instead.
-  if (!found &&
-      (!confirmation ||
+  if (! found &&
+      (! confirmation ||
        confirm (format (STRING_CMD_CONFIG_CONFIRM2, name, value))))
   {
     contents.push_back (name + '=' + json::encode (value));
@@ -102,18 +105,18 @@ bool CmdConfig::setConfigVariable (std::string name, std::string value, bool con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = false */)
+int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /* = false */)
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
   File::read (context.config._original_file, contents);
 
-  bool found = false;
-  bool change = false;
+  auto found = false;
+  auto change = false;
 
   for (auto line = contents.begin (); line != contents.end (); )
   {
-    bool lineDeleted = false;
+    auto lineDeleted = false;
 
     // If there is a comment on the line, it must follow the pattern.
     auto comment = line->find ('#');
@@ -143,9 +146,9 @@ int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = fal
   if (change)
     File::write (context.config._original_file, contents);
 
-  if ( change && found )
+  if (change && found)
     return 0;
-  else if ( found )
+  else if (found)
     return 1;
   else
     return 2;
@@ -154,7 +157,7 @@ int CmdConfig::unsetConfigVariable (std::string name, bool confirmation /* = fal
 ////////////////////////////////////////////////////////////////////////////////
 int CmdConfig::execute (std::string& output)
 {
-  int rc = 0;
+  auto rc = 0;
   std::stringstream out;
 
   // Get the non-attribute, non-fancy command line arguments.
@@ -166,10 +169,10 @@ int CmdConfig::execute (std::string& output)
   //   task config name          # remove name
   if (words.size ())
   {
-    bool confirmation = context.config.getBoolean ("confirmation");
-    bool found = false;
+    auto confirmation = context.config.getBoolean ("confirmation");
+    auto found = false;
 
-    std::string name = words[0];
+    auto name = words[0];
     std::string value = "";
 
     // Join the remaining words into config variable's value
@@ -186,7 +189,7 @@ int CmdConfig::execute (std::string& output)
 
     if (name != "")
     {
-      bool change = false;
+      auto change = false;
 
       // task config name value
       // task config name ""
@@ -205,7 +208,7 @@ int CmdConfig::execute (std::string& output)
         else if (rc == 1)
           found = true;
 
-        if (!found)
+        if (! found)
           throw format (STRING_CMD_CONFIG_NO_ENTRY, name);
       }
 
@@ -253,7 +256,7 @@ int CmdCompletionConfig::execute (std::string& output)
   context.config.all (configs);
   std::sort (configs.begin (), configs.end ());
 
-  for (auto& config : configs)
+  for (const auto& config : configs)
     output += config + '\n';
 
   return 0;
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 41ab02795..4e4ee4bda 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -34,8 +34,8 @@ class CmdConfig : public Command
 {
 public:
   CmdConfig ();
-  static bool setConfigVariable (std::string name, std::string value, bool confirmation = false);
-  static int unsetConfigVariable (std::string name, bool confirmation = false);
+  static bool setConfigVariable (const std::string&, const std::string&, bool confirmation = false);
+  static int unsetConfigVariable (const std::string&, bool confirmation = false);
   int execute (std::string&);
 };
 

From 6671861e5451b4105c509efb7bc782d9befaee99 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 20:50:12 -0500
Subject: [PATCH 353/879] CmdCount: Code cleanup

---
 src/commands/CmdCount.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index a1a20eb77..005f735fd 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -58,7 +58,7 @@ int CmdCount::execute (std::string& output)
 
   // Find number of matching tasks.  Skip recurring parent tasks.
   int count = 0;
-  for (auto& task : filtered)
+  for (const auto& task : filtered)
     if (task.getStatus () != Task::recurring)
       ++count;
 

From cd4e406dc99f28f9c495a6669b1ee0c05ad9318d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 20:53:46 -0500
Subject: [PATCH 354/879] CmdCustom: Code cleanup

---
 src/commands/CmdCustom.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 4b3cc6d6e..ffe789a20 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -65,13 +65,13 @@ CmdCustom::CmdCustom (
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCustom::execute (std::string& output)
 {
-  int rc = 0;
+  auto rc = 0;
 
   // Load report configuration.
-  std::string reportColumns = context.config.get ("report." + _keyword + ".columns");
-  std::string reportLabels  = context.config.get ("report." + _keyword + ".labels");
-  std::string reportSort    = context.config.get ("report." + _keyword + ".sort");
-  std::string reportFilter  = context.config.get ("report." + _keyword + ".filter");
+  auto reportColumns = context.config.get ("report." + _keyword + ".columns");
+  auto reportLabels  = context.config.get ("report." + _keyword + ".labels");
+  auto reportSort    = context.config.get ("report." + _keyword + ".sort");
+  auto reportFilter  = context.config.get ("report." + _keyword + ".filter");
 
   auto columns = split (reportColumns, ',');
   validateReportColumns (columns);
@@ -149,7 +149,7 @@ int CmdCustom::execute (std::string& output)
   std::vector <std::string> sortColumns;
 
   // Add the break columns, if any.
-  for (auto& so : sortOrder)
+  for (const auto& so : sortOrder)
   {
     std::string name;
     bool ascending;
@@ -187,8 +187,8 @@ int CmdCustom::execute (std::string& output)
   }
 
   // Report output can be limited by rows or lines.
-  int maxrows = 0;
-  int maxlines = 0;
+  auto maxrows = 0;
+  auto maxlines = 0;
   context.getLimits (maxrows, maxlines);
 
   // Adjust for fluff in the output.

From 24d5be3e1448a1a3e6d2011edd47fe333d8de123 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 21:34:27 -0500
Subject: [PATCH 355/879] CmdDelete: Code cleanup

---
 src/commands/CmdDelete.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 299fd7c1a..d524efd55 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -56,8 +56,8 @@ CmdDelete::CmdDelete ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDelete::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
+  auto rc = 0;
+  auto count = 0;
 
   // Apply filter.
   Filter filter;
@@ -176,7 +176,7 @@ int CmdDelete::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From 613911dc10de517fa36f3838c289d2593e6b8e6a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 21:34:39 -0500
Subject: [PATCH 356/879] CmdDenotate: Code cleanup

---
 src/commands/CmdDenotate.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 6e679d38c..d5c92b4a2 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -56,9 +56,9 @@ CmdDenotate::CmdDenotate ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDenotate::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
-  bool sensitive = context.config.getBoolean ("search.case.sensitive");
+  auto rc = 0;
+  auto count = 0;
+  auto sensitive = context.config.getBoolean ("search.case.sensitive");
 
   // Apply filter.
   Filter filter;
@@ -96,7 +96,7 @@ int CmdDenotate::execute (std::string&)
       throw std::string (STRING_CMD_DENO_NONE);
 
     std::string anno;
-    bool match = false;
+    auto match = false;
     for (auto i = annotations.begin (); i != annotations.end (); ++i)
     {
       if (i->second == pattern)
@@ -126,9 +126,9 @@ int CmdDenotate::execute (std::string&)
 
     if (before.data != task.data)
     {
-      std::string question = format (STRING_CMD_DENO_CONFIRM,
-                                     task.identifier (true),
-                                     task.get ("description"));
+      auto question = format (STRING_CMD_DENO_CONFIRM,
+                              task.identifier (true),
+                              task.get ("description"));
 
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
@@ -154,7 +154,7 @@ int CmdDenotate::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From acd61f14fd4e23e45b986160f097f7bb8eb5f270 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 21:34:51 -0500
Subject: [PATCH 357/879] CmdDiagnostics: Code cleanup

---
 src/commands/CmdDiagnostics.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 03c9faa66..3950c6429 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -224,7 +224,7 @@ int CmdDiagnostics::execute (std::string& output)
       << context.config.get ("taskd.server")
       << '\n';
 
-  std::string ca_pem = context.config.get ("taskd.ca");
+  auto ca_pem = context.config.get ("taskd.ca");
   out << "         CA: ";
   if (ca_pem != "")
   {
@@ -240,7 +240,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  std::string cert_pem = context.config.get ("taskd.certificate");
+  auto cert_pem = context.config.get ("taskd.certificate");
   out << "Certificate: ";
   if (cert_pem != "")
   {
@@ -256,7 +256,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  std::string key_pem = context.config.get ("taskd.key");
+  auto key_pem = context.config.get ("taskd.key");
   out << "        Key: ";
   if (key_pem != "")
   {
@@ -272,7 +272,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  std::string trust_value = context.config.get ("taskd.trust");
+  auto trust_value = context.config.get ("taskd.trust");
   if (trust_value == "strict" ||
       trust_value == "ignore hostname" ||
       trust_value == "allow all")
@@ -285,7 +285,7 @@ int CmdDiagnostics::execute (std::string& output)
       << '\n';
 
   // Get credentials, but mask out the key.
-  std::string credentials = context.config.get ("taskd.credentials");
+  auto credentials = context.config.get ("taskd.credentials");
   auto last_slash = credentials.rfind ('/');
   if (last_slash != std::string::npos)
     credentials = credentials.substr (0, last_slash)
@@ -408,7 +408,7 @@ int CmdDiagnostics::execute (std::string& output)
       << ")\n";
 
   // Scan tasks for duplicate UUIDs.
-  std::vector <Task> all = context.tdb2.all_tasks ();
+  auto all = context.tdb2.all_tasks ();
   std::map <std::string, int> seen;
   std::vector <std::string> dups;
   std::string uuid;
@@ -458,7 +458,7 @@ int CmdDiagnostics::execute (std::string& output)
     }
 
     // Check recurrence parent
-    std::string parentUUID = task.get ("parent");
+    auto parentUUID = task.get ("parent");
 
     if (parentUUID != "" && ! context.tdb2.has (parentUUID))
     {

From b5aadd0899202ced5e4f25eb92db825037527444 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 21:35:02 -0500
Subject: [PATCH 358/879] CmdDone: Code cleanup

---
 src/commands/CmdDone.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 18d1db4ff..b42f7fea9 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -55,8 +55,8 @@ CmdDone::CmdDone ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDone::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
+  auto rc = 0;
+  auto count = 0;
 
   // Apply filter.
   Filter filter;
@@ -71,7 +71,7 @@ int CmdDone::execute (std::string&)
   // Accumulated project change notifications.
   std::map <std::string, std::string> projectChanges;
 
-  bool nagged = false;
+  auto nagged = false;
   for (auto& task : filtered)
   {
     Task before (task);
@@ -129,7 +129,7 @@ int CmdDone::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From 45ecb72c16c3e981601b6a1f1457cd1cb7b04c4a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 Jan 2017 21:35:12 -0500
Subject: [PATCH 359/879] CmdDuplicate: Code cleanup

---
 src/commands/CmdDuplicate.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 696c211d0..94df029ce 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -55,8 +55,8 @@ CmdDuplicate::CmdDuplicate ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDuplicate::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
+  auto rc = 0;
+  auto count = 0;
 
   // Apply filter.
   Filter filter;
@@ -137,7 +137,7 @@ int CmdDuplicate::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 

From 98fd46549c4e002765da447d9e1eb5ff2bd606b7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 00:26:43 -0500
Subject: [PATCH 360/879] CmdEdit: Code cleanup

---
 src/commands/CmdEdit.cpp | 64 +++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index d3b618b43..0658284c0 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -154,7 +154,7 @@ std::vector <std::string> CmdEdit::findValues (
       auto eol = text.find ('\n', found + 1);
       if (eol != std::string::npos)
       {
-        std::string value = text.substr (
+        auto value = text.substr (
           found + name.length (),
           eol - (found + name.length ()));
 
@@ -173,7 +173,7 @@ std::string CmdEdit::formatDate (
   const std::string& attribute,
   const std::string& dateformat)
 {
-  std::string value = task.get (attribute);
+  auto value = task.get (attribute);
   if (value.length ())
     value = Datetime (value).toString (dateformat);
 
@@ -185,7 +185,7 @@ std::string CmdEdit::formatDuration (
   Task& task,
   const std::string& attribute)
 {
-  std::string value = task.get (attribute);
+  auto value = task.get (attribute);
   if (value.length ())
     value = Duration (value).formatISO ();
 
@@ -196,7 +196,7 @@ std::string CmdEdit::formatDuration (
 std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 {
   std::stringstream before;
-  bool verbose = context.verbose ("edit");
+  auto verbose = context.verbose ("edit");
 
   if (verbose)
     before << "# " << STRING_EDIT_HEADER_1 << '\n'
@@ -329,7 +329,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 void CmdEdit::parseTask (Task& task, const std::string& after, const std::string& dateformat)
 {
   // project
-  std::string value = findValue (after, "\n  Project:");
+  auto value = findValue (after, "\n  Project:");
   if (task.get ("project") != value)
   {
     if (value != "")
@@ -366,9 +366,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   value = findValue (after, "\n  Created:");
   if (value != "")
   {
-    std::string formatted = formatDate (task, "entry", dateformat);
-
-    if (formatted != value)
+    if (value != formatDate (task, "entry", dateformat))
     {
       context.footnote (STRING_EDIT_ENTRY_MOD);
       task.set ("entry", Datetime (value, dateformat).toEpochString ());
@@ -383,9 +381,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("start") != "")
     {
-      std::string formatted = formatDate (task, "start", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "start", dateformat))
       {
         context.footnote (STRING_EDIT_START_MOD);
         task.set ("start", Datetime (value, dateformat).toEpochString ());
@@ -412,9 +408,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("end") != "")
     {
-      std::string formatted = formatDate (task, "end", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "end", dateformat))
       {
         context.footnote (STRING_EDIT_END_MOD);
         task.set ("end", Datetime (value, dateformat).toEpochString ());
@@ -439,9 +433,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("scheduled") != "")
     {
-      std::string formatted = formatDate (task, "scheduled", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "scheduled", dateformat))
       {
         context.footnote (STRING_EDIT_SCHED_MOD);
         task.set ("scheduled", Datetime (value, dateformat).toEpochString ());
@@ -468,9 +460,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("due") != "")
     {
-      std::string formatted = formatDate (task, "due", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "due", dateformat))
       {
         context.footnote (STRING_EDIT_DUE_MOD);
         task.set ("due", Datetime (value, dateformat).toEpochString ());
@@ -505,9 +495,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("until") != "")
     {
-      std::string formatted = formatDate (task, "until", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "until", dateformat))
       {
         context.footnote (STRING_EDIT_UNTIL_MOD);
         task.set ("until", Datetime (value, dateformat).toEpochString ());
@@ -567,9 +555,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("wait") != "")
     {
-      std::string formatted = formatDate (task, "wait", dateformat);
-
-      if (formatted != value)
+      if (value != formatDate (task, "wait", dateformat))
       {
         context.footnote (STRING_EDIT_WAIT_MOD);
         task.set ("wait", Datetime (value, dateformat).toEpochString ());
@@ -619,10 +605,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     auto eol = after.find ('\n', found + 1);
     if (eol != std::string::npos)
     {
-      std::string value = Lexer::trim (after.substr (
-        found,
-        eol - found), "\t ");
-
+      auto value = Lexer::trim (after.substr (found, eol - found), "\t ");
       auto gap = value.find (" -- ");
       if (gap != std::string::npos)
       {
@@ -649,7 +632,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
         }
         while (annotations.find (name.str ()) != annotations.end ());
 
-        std::string text = Lexer::trim (value.substr (gap + 4), "\t ");
+        auto text = Lexer::trim (value.substr (gap + 4), "\t ");
         annotations.insert (std::make_pair (name.str (), json::decode (text)));
       }
     }
@@ -673,10 +656,10 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   // UDAs
   for (auto& col : context.columns)
   {
-    std::string type = context.config.get ("uda." + col.first + ".type");
+    auto type = context.config.get ("uda." + col.first + ".type");
     if (type != "")
     {
-      std::string value = findValue (after, "\n  UDA " + col.first + ":");
+      auto value = findValue (after, "\n  UDA " + col.first + ":");
       if ((task.get (col.first) != value) && (type != "date" ||
            (task.get (col.first) != Datetime (value, dateformat).toEpochString ())) &&
            (type != "duration" ||
@@ -719,8 +702,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   }
 
   // UDA orphans
-  std::vector <std::string> orphanValues = findValues (after, "\n  UDA Orphan ");
-  for (auto& orphan : orphanValues)
+  for (auto& orphan : findValues (after, "\n  UDA Orphan "))
   {
     auto colon = orphan.find (':');
     if (colon != std::string::npos)
@@ -751,12 +733,12 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   // Determine the output date format, which uses a hierarchy of definitions.
   //   rc.dateformat.edit
   //   rc.dateformat
-  std::string dateformat = context.config.get ("dateformat.edit");
+  auto dateformat = context.config.get ("dateformat.edit");
   if (dateformat == "")
     dateformat = context.config.get ("dateformat");
 
   // Change directory for the editor
-  std::string current_dir = Directory::cwd ();
+  auto current_dir = Directory::cwd ();
   int ignored = chdir (location._data.c_str ());
   ++ignored; // Keep compiler quiet.
 
@@ -766,12 +748,12 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
     throw std::string (STRING_EDIT_IN_PROGRESS);
 
   // Format the contents, T -> text, write to a file.
-  std::string before = formatTask (task, dateformat);
-  std::string before_orig = before;
+  auto before = formatTask (task, dateformat);
+  auto before_orig = before;
   File::write (file.str (), before);
 
   // Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi
-  std::string editor = context.config.get ("editor");
+  auto editor = context.config.get ("editor");
   char* peditor = getenv ("VISUAL");
   if (editor == "" && peditor) editor = std::string (peditor);
   peditor = getenv ("EDITOR");
@@ -808,7 +790,7 @@ ARE_THESE_REALLY_HARMFUL:
   {
     std::cout << STRING_EDIT_CHANGES << '\n';
     std::string problem = "";
-    bool oops = false;
+    auto oops = false;
 
     try
     {

From 595fcef9bb2facb6cc3f22499ababe58741a3a30 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 11:31:32 -0500
Subject: [PATCH 361/879] CmdHelp: Code cleanup

---
 src/commands/CmdHelp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index a63c8af4c..fe2eca5bc 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -79,7 +79,7 @@ std::string CmdHelp::composeUsage () const
   view.add ("");
 
   // Static first row.
-  int row = view.addRow ();
+  auto row = view.addRow ();
   view.set (row, 0, STRING_CMD_HELP_USAGE_LABEL);
   view.set (row, 1, "task");
   view.set (row, 2, STRING_CMD_HELP_USAGE_DESC);

From 24882e4ce5db90b1be0eeeea5bd4977db8804566 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 12:13:30 -0500
Subject: [PATCH 362/879] CmdHistory: Code cleanup

---
 src/commands/CmdHistory.cpp | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 6e5201343..46c4e8049 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -60,7 +60,7 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 {
-  int widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
+  auto widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
 
   // Now build the view.
   Table view;
@@ -80,8 +80,8 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
   view.colorHeader (label);
 
   // Determine the longest line, and the longest "added" line.
-  int maxAddedLine = 0;
-  int maxRemovedLine = 0;
+  auto maxAddedLine = 0;
+  auto maxRemovedLine = 0;
   for (auto& i : groups)
   {
     if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine)
@@ -91,17 +91,17 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
       maxAddedLine = addedGroup[i.first];
   }
 
-  int maxLine = maxAddedLine + maxRemovedLine;
+  auto maxLine = maxAddedLine + maxRemovedLine;
   if (maxLine > 0)
   {
     unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine;
 
-    int totalAdded     = 0;
-    int totalCompleted = 0;
-    int totalDeleted   = 0;
+    auto totalAdded     = 0;
+    auto totalCompleted = 0;
+    auto totalDeleted   = 0;
 
     time_t priorTime = 0;
-    int row = 0;
+    auto row = 0;
     for (auto& i : groups)
     {
       row = view.addRow ();
@@ -213,11 +213,11 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
     view.colorHeader (label);
   }
 
-  int totalAdded     = 0;
-  int totalCompleted = 0;
-  int totalDeleted   = 0;
+  auto totalAdded     = 0;
+  auto totalCompleted = 0;
+  auto totalDeleted   = 0;
 
-  int row = 0;
+  auto row = 0;
   time_t lastTime = 0;
   for (auto& i : groups)
   {
@@ -230,7 +230,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
     HistoryStrategy::insertRowDate (view, row, i.first, lastTime);
     lastTime = i.first;
 
-    int net = 0;
+    auto net = 0;
 
     if (addedGroup.find (i.first) != addedGroup.end ())
     {
@@ -316,7 +316,7 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
     if (task.has ("end"))
       end = Datetime (task.get_date ("end"));
 
-    time_t epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
+    auto epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
     groups[epoch] = 0;
 
     // Every task has an entry date, but exclude templates.
@@ -341,12 +341,10 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
   }
 
   // Now build the view.
-
-  if (HistoryStrategy::graphical) {
+  if (HistoryStrategy::graphical)
     this->outputGraphical (output);
-  } else {
+  else
     this->outputTabular (output);
-  }
 
   return rc;
 }

From 0a6d606342305cfc1be8a8cbd99dc692a5bb7f84 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 12:15:38 -0500
Subject: [PATCH 363/879] CmdIDs: Code cleanup

---
 src/commands/CmdIDs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index ef3cb5847..f9c134a20 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -92,8 +92,8 @@ std::string CmdIDs::compressIds (const std::vector <int>& ids)
 {
   std::stringstream result;
 
-  int range_start = 0;
-  int range_end = 0;
+  auto range_start = 0;
+  auto range_end = 0;
 
   for (unsigned int i = 0; i < ids.size (); ++i)
   {

From 8f7ec806667e5eb9abfdb78fddfda0f0747049f2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 12:17:44 -0500
Subject: [PATCH 364/879] CmdImport: Code cleanup

---
 src/commands/CmdImport.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index e0b6e2b62..c54fc38b0 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -58,12 +58,13 @@ CmdImport::CmdImport ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdImport::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
+  auto rc = 0;
+  auto count = 0;
 
   // Get filenames from command line arguments.
-  std::vector <std::string> words = context.cli2.getWords ();
-  if (! words.size () || (words.size () == 1 && words[0] == "-"))
+  auto words = context.cli2.getWords ();
+  if (! words.size () ||
+      (words.size () == 1 && words[0] == "-"))
   {
     std::cout << format (STRING_CMD_IMPORT_FILE, "STDIN") << '\n';
 
@@ -101,7 +102,7 @@ int CmdImport::execute (std::string&)
 ////////////////////////////////////////////////////////////////////////////////
 int CmdImport::import (const std::string& input)
 {
-  int count = 0;
+  auto count = 0;
   try
   {
     json::value* root = json::parse (input);
@@ -171,12 +172,12 @@ void CmdImport::importSingleTask (json::object* obj)
   // Parse the whole thing, validate the data.
   Task task (obj);
 
-  bool hasGeneratedEntry = not task.has ("entry");
-  bool hasExplicitEnd = task.has ("end");
+  auto hasGeneratedEntry = not task.has ("entry");
+  auto hasExplicitEnd = task.has ("end");
 
   task.validate ();
 
-  bool hasGeneratedEnd = not hasExplicitEnd and task.has ("end");
+  auto hasGeneratedEnd = not hasExplicitEnd and task.has ("end");
 
   // Check whether the imported task is new or a modified existing task.
   Task before;

From 5915d3834d6efdc0337cf42741743ff51ee55093 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 12:22:31 -0500
Subject: [PATCH 365/879] CmdInfo: Code cleanup

---
 src/commands/CmdInfo.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 319c3f1d6..a594c0c7a 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -66,7 +66,7 @@ CmdInfo::CmdInfo ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdInfo::execute (std::string& output)
 {
-  int rc = 0;
+  auto rc = 0;
 
   // Apply filter.
   Filter filter;
@@ -87,11 +87,11 @@ int CmdInfo::execute (std::string& output)
   // Determine the output date format, which uses a hierarchy of definitions.
   //   rc.dateformat.info
   //   rc.dateformat
-  std::string dateformat = context.config.get ("dateformat.info");
+  auto dateformat = context.config.get ("dateformat.info");
   if (dateformat == "")
     dateformat = context.config.get ("dateformat");
 
-  std::string dateformatanno = context.config.get ("dateformat.annotation");
+  auto dateformatanno = context.config.get ("dateformat.annotation");
   if (dateformatanno == "")
     dateformatanno = dateformat;
 
@@ -122,7 +122,7 @@ int CmdInfo::execute (std::string& output)
     Datetime now;
 
     // id
-    int row = view.addRow ();
+    auto row = view.addRow ();
     view.set (row, 0, STRING_COLUMN_LABEL_ID);
     view.set (row, 1, (task.id ? format (task.id) : "-"));
 
@@ -131,8 +131,8 @@ int CmdInfo::execute (std::string& output)
     // description
     Color c;
     autoColorize (task, c);
-    std::string description = task.get ("description");
-    int indent = context.config.getInteger ("indent.annotation");
+    auto description = task.get ("description");
+    auto indent = context.config.getInteger ("indent.annotation");
 
     for (auto& anno : task.getAnnotations ())
       description += '\n'
@@ -227,7 +227,7 @@ int CmdInfo::execute (std::string& output)
     std::string entry = dt.toString (dateformat);
 
     std::string age;
-    std::string created = task.get ("entry");
+    auto created = task.get ("entry");
     if (created.length ())
     {
       Datetime dt (strtol (created.c_str (), NULL, 10));
@@ -350,7 +350,7 @@ int CmdInfo::execute (std::string& output)
     // uuid
     row = view.addRow ();
     view.set (row, 0, STRING_COLUMN_LABEL_UUID);
-    std::string uuid = task.get ("uuid");
+    auto uuid = task.get ("uuid");
     view.set (row, 1, uuid);
 
     // Task::urgency
@@ -359,7 +359,7 @@ int CmdInfo::execute (std::string& output)
     view.set (row, 1, format (task.urgency (), 4, 4));
 
     // Show any UDAs
-    std::vector <std::string> all = task.all ();
+    auto all = task.all ();
     std::string type;
     for (auto& att: all)
     {
@@ -368,7 +368,7 @@ int CmdInfo::execute (std::string& output)
         Column* col = context.columns[att];
         if (col->is_uda ())
         {
-          std::string value = task.get (att);
+          auto value = task.get (att);
           if (value != "")
           {
             row = view.addRow ();
@@ -453,7 +453,7 @@ int CmdInfo::execute (std::string& output)
           if (var.first.substr (13, 8) == "project." &&
               (end = var.first.find (".coefficient")) != std::string::npos)
           {
-            std::string project = var.first.substr (21, end - 21);
+            auto project = var.first.substr (21, end - 21);
             if (task.get ("project").find (project) == 0)
               urgencyTerm (urgencyDetails, "PROJECT " + project, 1.0, var.second);
           }
@@ -462,7 +462,7 @@ int CmdInfo::execute (std::string& output)
           if (var.first.substr (13, 4) == "tag." &&
               (end = var.first.find (".coefficient")) != std::string::npos)
           {
-            std::string name = var.first.substr (17, end - 17);
+            auto name = var.first.substr (17, end - 17);
             if (task.hasTag (name))
               urgencyTerm (urgencyDetails, "TAG " + name, 1.0, var.second);
           }
@@ -471,7 +471,7 @@ int CmdInfo::execute (std::string& output)
           if (var.first.substr (13, 8) == "keyword." &&
               (end = var.first.find (".coefficient")) != std::string::npos)
           {
-            std::string keyword = var.first.substr (21, end - 21);
+            auto keyword = var.first.substr (21, end - 21);
             if (task.get ("description").find (keyword) != std::string::npos)
               urgencyTerm (urgencyDetails, "KEYWORD " + keyword, 1.0, var.second);
           }
@@ -485,7 +485,7 @@ int CmdInfo::execute (std::string& output)
           auto end = var.first.find (".coefficient");
           if (end != std::string::npos)
           {
-            const std::string uda = var.first.substr (12, end - 12);
+            auto uda = var.first.substr (12, end - 12);
             auto dot = uda.find (".");
             if (dot == std::string::npos)
             {
@@ -591,10 +591,10 @@ void CmdInfo::urgencyTerm (
   float measure,
   float coefficient) const
 {
-  float value = measure * coefficient;
+  auto value = measure * coefficient;
   if (value != 0.0)
   {
-    int row = view.addRow ();
+    auto row = view.addRow ();
     view.set (row, 0, "    " + label);
     view.set (row, 1, rightJustify (format (measure, 5, 3), 6));
     view.set (row, 2, "*");

From 29f2bce64d45818d23ec253bb190d7b917acf389 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Jan 2017 13:04:51 -0500
Subject: [PATCH 366/879] CmdModify: Code cleanup

---
 src/commands/CmdModify.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 136796c27..e1ebdb254 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -55,7 +55,7 @@ CmdModify::CmdModify ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdModify::execute (std::string&)
 {
-  int rc = 0;
+  auto rc = 0;
 
   // Apply filter.
   Filter filter;
@@ -70,7 +70,7 @@ int CmdModify::execute (std::string&)
   // Accumulated project change notifications.
   std::map <std::string, std::string> projectChanges;
 
-  int count = 0;
+  auto count = 0;
   for (auto& task : filtered)
   {
     Task before (task);
@@ -81,10 +81,9 @@ int CmdModify::execute (std::string&)
       // Abort if change introduces inconsistencies.
       checkConsistency(before, task);
 
-      std::string question;
-      question = format (STRING_CMD_MODIFY_CONFIRM,
-                         task.identifier (true),
-                         task.get ("description"));
+      auto question = format (STRING_CMD_MODIFY_CONFIRM,
+                              task.identifier (true),
+                              task.get ("description"));
 
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
@@ -101,7 +100,7 @@ int CmdModify::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);
 
@@ -110,22 +109,23 @@ int CmdModify::execute (std::string&)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// TODO Why is this not in Task::validate?
 void CmdModify::checkConsistency (Task &before, Task &after)
 {
   // Perform some logical consistency checks.
   if (after.has ("recur")  &&
-      !after.has ("due")   &&
-      !before.has ("due"))
+      ! after.has ("due")   &&
+      ! before.has ("due"))
     throw std::string (STRING_CMD_MODIFY_NO_DUE);
 
   if (before.has ("recur") &&
       before.has ("due")   &&
-      (!after.has ("due")  ||
+      (! after.has ("due")  ||
         after.get ("due") == ""))
     throw std::string (STRING_CMD_MODIFY_REM_DUE);
 
   if (before.has ("recur")  &&
-      (!after.has ("recur") ||
+      (! after.has ("recur") ||
         after.get ("recur") == ""))
     throw std::string (STRING_CMD_MODIFY_REC_ALWAYS);
 }
@@ -136,7 +136,7 @@ int CmdModify::modifyAndUpdate (
   std::map <std::string, std::string> *projectChanges /* = NULL */)
 {
   // This task.
-  int count = 1;
+  auto count = 1;
 
   updateRecurrenceMask (after);
   feedback_affected (STRING_CMD_MODIFY_TASK, after);
@@ -161,7 +161,7 @@ int CmdModify::modifyRecurrenceSiblings (
   Task &task,
   std::map <std::string, std::string> *projectChanges /* = NULL */)
 {
-  int count = 0;
+  auto count = 0;
 
   if ((context.config.get ("recurrence.confirmation") == "prompt"
         && confirm (STRING_CMD_MODIFY_RECUR)) ||
@@ -196,9 +196,9 @@ int CmdModify::modifyRecurrenceParent (
   Task &task,
   std::map <std::string, std::string> *projectChanges /* = NULL */)
 {
-  int count = 0;
+  auto count = 0;
 
-  std::vector <Task> children = context.tdb2.children (task);
+  auto children = context.tdb2.children (task);
   if (children.size () &&
       (! context.config.getBoolean ("recurrence.confirmation") ||
         confirm (STRING_CMD_MODIFY_RECUR)))

From c4f060413e23a0723beee9f2407ed589a4e6409b Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Mon, 30 Jan 2017 15:49:42 +0100
Subject: [PATCH 367/879] Move strategies to cpp file

---
 src/commands/CmdHistory.cpp | 170 +++++++++++++++++++++++++++++++++
 src/commands/CmdHistory.h   | 181 ++----------------------------------
 2 files changed, 176 insertions(+), 175 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 46c4e8049..319265f07 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -290,6 +290,50 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
   output = out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////i
+class MonthlyHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfMonth ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+  }
+
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+
+    view.set (row, 1, Datetime::monthName (m));
+  }
+
+  static constexpr const char* keyword         = "history.monthly";
+  static constexpr const char* usage           = "task <filter> history.monthly";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_M;
+  static constexpr unsigned int dateFieldCount = 2;
+  static constexpr bool graphical              = false;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
 int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
@@ -349,6 +393,132 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
   return rc;
 }
 
+////////////////////////////////////////////////////////////////////////////i
+class MonthlyGHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfMonth ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+  }
+
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+
+    view.set (row, 1, Datetime::monthName (m));
+  }
+
+  static constexpr const char* keyword         = "ghistory.monthly";
+  static constexpr const char* usage           = "task <filter> ghistory.monthly";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_M;
+  static constexpr unsigned int dateFieldCount = 2;
+  static constexpr bool graphical              = true;
+};
+
+////////////////////////////////////////////////////////////////////////////i
+class AnnualGHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfYear ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+  }
+
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+  }
+
+  static constexpr const char* keyword         = "ghistory.annual";
+  static constexpr const char* usage           = "task <filter> ghistory.annual";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_A;
+  static constexpr unsigned int dateFieldCount = 1;
+  static constexpr bool graphical              = true;
+};
+
+////////////////////////////////////////////////////////////////////////////i
+class AnnualHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfYear ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+  }
+
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if (y != last_y)
+    {
+      view.set (row, 0, y);
+    }
+  }
+
+  static constexpr const char* keyword         = "history.annual";
+  static constexpr const char* usage           = "task <filter> history.annual";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_A;
+  static constexpr unsigned int dateFieldCount = 1;
+  static constexpr bool graphical              = false;
+};
+
 // Explicit instantiations, avoiding cpp-inclusion or implementation in header
 template class CmdHistoryBase<MonthlyHistoryStrategy>;
 template class CmdHistoryBase<AnnualHistoryStrategy>;
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 5fd4e25b3..10b7f5e11 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -51,185 +51,16 @@ private:
   void outputGraphical (std::string&);
 };
 
-////////////////////////////////////////////////////////////////////////////i
-class MonthlyHistoryStrategy
-{
-public:
-  static Datetime getRelevantDate (const Datetime & dt)
-  {
-    return dt.startOfMonth ();
-  }
-
-  static void setupTableDates (Table & view)
-  {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-  }
-
-  static void insertRowDate (
-    Table& view,
-    int row,
-    time_t rowTime,
-    time_t lastTime)
-  {
-    Datetime dt (rowTime);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    Datetime last_dt (lastTime);
-    int last_m, last_d, last_y;
-    last_dt.toYMD (last_y, last_m, last_d);
-
-    if (y != last_y)
-    {
-      view.set (row, 0, y);
-    }
-
-    view.set (row, 1, Datetime::monthName (m));
-  }
-
-  static constexpr const char* keyword         = "history.monthly";
-  static constexpr const char* usage           = "task <filter> history.monthly";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_M;
-  static constexpr unsigned int dateFieldCount = 2;
-  static constexpr bool graphical              = false;
-};
+// Forward-declare strategies implemented in CmdHistory.cpp
+class MonthlyHistoryStrategy;
+class MonthlyGHistoryStrategy;
+class AnnualHistoryStrategy;
+class AnnualGHistoryStrategy;
 
+// typedef the templates to nice names to be used outside this class
 typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
-
-
-////////////////////////////////////////////////////////////////////////////i
-class MonthlyGHistoryStrategy
-{
-public:
-  static Datetime getRelevantDate (const Datetime & dt)
-  {
-    return dt.startOfMonth ();
-  }
-
-  static void setupTableDates (Table & view)
-  {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-  }
-
-  static void insertRowDate (
-    Table& view,
-     int row,
-     time_t rowTime,
-     time_t lastTime)
-  {
-    Datetime dt (rowTime);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    Datetime last_dt (lastTime);
-    int last_m, last_d, last_y;
-    last_dt.toYMD (last_y, last_m, last_d);
-
-    if (y != last_y)
-    {
-      view.set (row, 0, y);
-    }
-
-    view.set (row, 1, Datetime::monthName (m));
-  }
-
-  static constexpr const char* keyword         = "ghistory.monthly";
-  static constexpr const char* usage           = "task <filter> ghistory.monthly";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_M;
-  static constexpr unsigned int dateFieldCount = 2;
-  static constexpr bool graphical              = true;
-};
-
 typedef CmdHistoryBase<MonthlyGHistoryStrategy> CmdGHistoryMonthly;
-
-
-////////////////////////////////////////////////////////////////////////////i
-class AnnualHistoryStrategy
-{
-public:
-  static Datetime getRelevantDate (const Datetime & dt) 
-  {
-    return dt.startOfYear ();
-  }
-
-  static void setupTableDates (Table & view)
-  {
-    view.add (STRING_CMD_HISTORY_YEAR);
-  }
-
-  static void insertRowDate (
-    Table& view,
-     int row,
-     time_t rowTime,
-     time_t lastTime)
-  {
-    Datetime dt (rowTime);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    Datetime last_dt (lastTime);
-    int last_m, last_d, last_y;
-    last_dt.toYMD (last_y, last_m, last_d);
-
-    if (y != last_y)
-    {
-      view.set (row, 0, y);
-    }
-  }
-
-  static constexpr const char* keyword         = "history.annual";
-  static constexpr const char* usage           = "task <filter> history.annual";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_A;
-  static constexpr unsigned int dateFieldCount = 1;
-  static constexpr bool graphical              = false;
-};
-
 typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
-
-
-////////////////////////////////////////////////////////////////////////////i
-class AnnualGHistoryStrategy
-{
-public:
-  static Datetime getRelevantDate (const Datetime & dt)
-  {
-    return dt.startOfYear ();
-  }
-
-  static void setupTableDates (Table & view)
-  {
-    view.add (STRING_CMD_HISTORY_YEAR);
-  }
-
-  static void insertRowDate (
-    Table& view,
-    int row,
-    time_t rowTime,
-    time_t lastTime)
-  {
-    Datetime dt (rowTime);
-    int m, d, y;
-    dt.toYMD (y, m, d);
-
-    Datetime last_dt (lastTime);
-    int last_m, last_d, last_y;
-    last_dt.toYMD (last_y, last_m, last_d);
-
-    if (y != last_y)
-    {
-      view.set (row, 0, y);
-    }
-  }
-
-  static constexpr const char* keyword         = "ghistory.annual";
-  static constexpr const char* usage           = "task <filter> ghistory.annual";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_A;
-  static constexpr unsigned int dateFieldCount = 1;
-  static constexpr bool graphical              = true;
-};
-
 typedef CmdHistoryBase<AnnualGHistoryStrategy> CmdGHistoryAnnual;
 
 #endif

From adea89122908f54d05e655c3831772928fd778ee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 12:00:06 +0100
Subject: [PATCH 368/879] Doc: Test change

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 7686f2207..87ce2d1f2 100644
--- a/NEWS
+++ b/NEWS
@@ -61,3 +61,4 @@ Or just send a message to:
   support@taskwarrior.org
 
 Thank you.
+

From dd92f7004d0b77cec7d39f7a2920b0b78da695b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 12:20:40 +0100
Subject: [PATCH 369/879] Doc: Test change

---
 NEWS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NEWS b/NEWS
index 87ce2d1f2..7686f2207 100644
--- a/NEWS
+++ b/NEWS
@@ -61,4 +61,3 @@ Or just send a message to:
   support@taskwarrior.org
 
 Thank you.
-

From 84f371ca514f856a59a496862c461f32bad95a4c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 13:38:05 +0100
Subject: [PATCH 370/879] Doc: Test change

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 7686f2207..87ce2d1f2 100644
--- a/NEWS
+++ b/NEWS
@@ -61,3 +61,4 @@ Or just send a message to:
   support@taskwarrior.org
 
 Thank you.
+

From 77077fb5f4e79cee1091a49cce316868f36eea0a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 13:58:53 +0100
Subject: [PATCH 371/879] Doc: Test change

---
 NEWS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NEWS b/NEWS
index 87ce2d1f2..7686f2207 100644
--- a/NEWS
+++ b/NEWS
@@ -61,4 +61,3 @@ Or just send a message to:
   support@taskwarrior.org
 
 Thank you.
-

From a598dc4d3fee5081e8fbd5601966d1610878ef72 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 14:28:40 +0100
Subject: [PATCH 372/879] CmdCalc: 'auto infix{true}' doesn't compile

---
 src/commands/CmdCalc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 0315c1216..2c8ffe43a 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -54,7 +54,7 @@ CmdCalc::CmdCalc ()
 int CmdCalc::execute (std::string& output)
 {
   // Configurable infix/postfix
-  auto infix {true};
+  bool infix {true};
   if (context.config.get ("expressions") == "postfix")
     infix = false;
 

From 2e0c7418e42a094626ae60a1b2bce5209bbd31dc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 14:34:24 +0100
Subject: [PATCH 373/879] calc: Fixed Dirk

---
 src/calc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index d85c361ff..a4efbed0f 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -58,7 +58,7 @@ int main (int argc, char** argv)
 
   try
   {
-    auto infix {true};
+    bool infix {true};
 
     // Add a source for constants.
     Eval e;

From c5024ddea45977fc343229fac1e3f30b3e3eee0d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Feb 2017 22:29:03 +0100
Subject: [PATCH 374/879] Doc: Test change

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 7686f2207..87ce2d1f2 100644
--- a/NEWS
+++ b/NEWS
@@ -61,3 +61,4 @@ Or just send a message to:
   support@taskwarrior.org
 
 Thank you.
+

From 1f0df70ac3d9994f0ddda283d72ce41271822f38 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 01:45:05 +0100
Subject: [PATCH 375/879] TLSClient: Typo

---
 src/TLSClient.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 61132d041..8feca6ea9 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -210,8 +210,16 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
 #endif
 
+  // SNI.  Only permitted when _host is a DNS name, not an IPv4/6 address.
+  if (_host.find_first_not_of ("0123456789abcdefABCDEF:.") != std::string::npos)
+  {
+    ret = gnutls_server_name_set (_session, GNUTLS_NAME_DNS, _host.c_str (), _host.length ()); // All
+    if (ret < 0)
+      throw format ("TLS SNI error. {1}", gnutls_strerror (ret)); // All
+  }
+
   // Store the TLSClient instance, so that the verification callback can access
-  // it during the handshake below and call the verifcation method.
+  // it during the handshake below and call the verification method.
   gnutls_session_set_ptr (_session, (void*) this); // All
 
   // use IPv4 or IPv6, does not matter.

From fa654473c9fb1b39bfb363893b56dc018ddc4a39 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 01:47:54 +0100
Subject: [PATCH 376/879] TLSClient: Removed test code

---
 src/TLSClient.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 8feca6ea9..b276627bd 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -210,14 +210,6 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
 #endif
 
-  // SNI.  Only permitted when _host is a DNS name, not an IPv4/6 address.
-  if (_host.find_first_not_of ("0123456789abcdefABCDEF:.") != std::string::npos)
-  {
-    ret = gnutls_server_name_set (_session, GNUTLS_NAME_DNS, _host.c_str (), _host.length ()); // All
-    if (ret < 0)
-      throw format ("TLS SNI error. {1}", gnutls_strerror (ret)); // All
-  }
-
   // Store the TLSClient instance, so that the verification callback can access
   // it during the handshake below and call the verification method.
   gnutls_session_set_ptr (_session, (void*) this); // All

From 01c095cac78e272b60452cc73f8d644761b2a8bc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 02:49:39 +0100
Subject: [PATCH 377/879] Tests: Improved documenation in template

---
 test/template.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/template.t b/test/template.t
index c1e27371a..c0bb27679 100644
--- a/test/template.t
+++ b/test/template.t
@@ -46,8 +46,8 @@ from basetest import Taskd, ServerTestCase
 #     self.assertIsNot(a, b)
 #     self.assertIsNone(x)
 #     self.assertIsNotNone(x)
-#     self.assertIn(a, b)
-#     self.assertNotIn(a, b)
+#     self.assertIn(p, t)
+#     self.assertNotIn(p, t)
 #     self.assertIsInstance(a, b)
 #     self.assertNotIsInstance(a, b)
 #     self.assertRaises(e)

From a5d7f1093e5d1c033d25610309263847e1bb9c53 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 08:19:30 -0500
Subject: [PATCH 378/879] CmdTimesheet: Rewrote the command

- Updated the 'timesheet' command with a more compact report that accepts a
  filter, and has a default filter showing the last four weeks of completed and
  started tasks.
---
 ChangeLog                     |   3 +
 NEWS                          |   9 +-
 doc/man/taskrc.5.in           |   3 +
 src/Config.cpp                |   5 +-
 src/commands/CmdInfo.cpp      |  16 +-
 src/commands/CmdShow.cpp      |   1 +
 src/commands/CmdTimesheet.cpp | 296 ++++++++++++++++------------------
 src/l10n/eng-USA.h            |   2 +-
 src/l10n/jpn-JPN.h            |   2 +-
 test/timesheet.t              |  35 ++--
 10 files changed, 182 insertions(+), 190 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db7673fb5..74ed09eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,9 @@
           (thanks to Jelle van der Waa).
 - Improved portability for SunOS-like OSes.
           (thanks to Antonio Huete Jimenez).
+- Updated the 'timesheet' command with a more compact report that accepts a
+  filter, and has a default filter showing the last four weeks of completed and
+  started tasks.
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index 87ce2d1f2..1ecfa637e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,22 +6,27 @@ New Features in Taskwarrior 2.5.2
     command usage.
   - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
   - New DOM reference: annotations.count.
+  - Renovated 'timesheet' command with a more compact report that accepts a
+    filter, and has a default filter showing the last four weeks of completed
+    and started tasks.
 
 New Commands in Taskwarrior 2.5.2
 
-  - The 'purge' command was introduced.
+  - The 'purge' command was added, which completely removes old tasks.
 
 New Configuration Options in Taskwarrior 2.5.2
 
   - New 'relative' column format for 'date' type columns does what 'remaining'
     and 'countdown' do, but in one format.
   - The 'default.scheduled' date/duraiton works just like 'default.due'.
+  - The 'report.timesheet.filter' setting controls the tasks shown by the
+    'timesheet' command.
 
 Newly Deprecated Features in Taskwarrior 2.5.2
 
   - The 'DUETODAY' virtual tag is a synonym for the 'TODAY' virtual tag, and is
     not needed.
-  - The 'new-uuid' verbosity option is to be removed due to being redundant, its
+  - The 'new-uuid' verbosity option is to be removed, as it is redundant, its
     functionality will be merged with 'new-id' option.
   - The use of alternate Boolean configuration settings is deprecated. Use values
     "0" for off, and "1" for on.  Avoid used of "on", "off", "true", "t",
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index eae6c4ce0..096860210 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1279,6 +1279,9 @@ will be presented in the order (if any) in which they are selected.
 This adds a filter to the report X so that only tasks matching the filter
 criteria are displayed in the generated report.
 
+There is a special case for 'report.timesheet.filter', which may be specified
+even though the 'timesheet' report is not very customizable.
+
 .TP
 .B report.X.dateformat
 This adds a dateformat to the report X that will be used by the "due date"
diff --git a/src/Config.cpp b/src/Config.cpp
index 84682b8b6..5fa2ab79c 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -251,6 +251,7 @@ std::string Config::_defaults =
   "#default.due=eom                               # Default due date for 'add' command\n"
   "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"
   "default.command=next                           # When no arguments are specified\n"
+  "default.timesheet.filter=( +PENDING and start.after:now-4wks ) or ( +COMPLETED and end.after:now-4wks )\n"
   "\n"
   "_forcecolor=0                                  # Forces color to be on, even for non TTY output\n"
   "complete.all.tags=0                            # Include old tag names in '_ags' command\n"
@@ -383,7 +384,9 @@ std::string Config::_defaults =
   "report.blocking.labels=ID,UUID,A,Deps,Project,Tags,R,W,Sch,Due,Until,Description,Urg\n"
   "report.blocking.columns=id,uuid.short,start.active,depends,project,tags,recur,wait,scheduled.remaining,due.relative,until.remaining,description.count,urgency\n"
   "report.blocking.sort=urgency-,due+,entry+\n"
-  "report.blocking.filter= status:pending +BLOCKING\n"
+  "report.blocking.filter=status:pending +BLOCKING\n"
+  "\n"
+  "report.timesheet.filter=(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)\n"
   "\n";
 
 extern Context context;
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index a594c0c7a..60aca8ded 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -103,7 +103,7 @@ int CmdInfo::execute (std::string& output)
     view.width (context.getWidth ());
     if (context.config.getBoolean ("obfuscate"))
       view.obfuscate ();
-    if (context.config.getBoolean ("color"))
+    if (context.color ())
       view.forceColor ();
     view.add (STRING_COLUMN_LABEL_NAME);
     view.add (STRING_COLUMN_LABEL_VALUE);
@@ -113,11 +113,11 @@ int CmdInfo::execute (std::string& output)
     {
       Color alternate (context.config.get ("color.alternate"));
       view.colorOdd (alternate);
-      view.intraColorOdd (alternate);
 
-      Color label (context.config.get ("color.label"));
-      view.colorHeader (label);
+      view.colorHeader (Color ("underline " + context.config.get ("color.label")));
     }
+    else
+      view.underlineHeaders ();
 
     Datetime now;
 
@@ -415,8 +415,7 @@ int CmdInfo::execute (std::string& output)
         urgencyDetails.colorOdd (alternate);
         urgencyDetails.intraColorOdd (alternate);
 
-        Color label (context.config.get ("color.label"));
-        urgencyDetails.colorHeader (label);
+        urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
       }
 
       if (context.config.getBoolean ("obfuscate"))
@@ -519,9 +518,10 @@ int CmdInfo::execute (std::string& output)
       journal.colorOdd (alternate);
       journal.intraColorOdd (alternate);
 
-      Color label (context.config.get ("color.label"));
-      journal.colorHeader (label);
+      journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
     }
+    else
+      journal.underlineHeaders ();
 
     if (context.config.getBoolean ("obfuscate"))
       journal.obfuscate ();
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index b617fc95a..9a286be5b 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -147,6 +147,7 @@ int CmdShow::execute (std::string& output)
     " default.scheduled"
     " defaultheight"
     " defaultwidth"
+    " default.timesheet.filter"
     " dependency.confirmation"
     " dependency.indicator"
     " dependency.reminder"
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 4f26ed506..a15c882b1 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -26,6 +26,7 @@
 
 #include <cmake.h>
 #include <CmdTimesheet.h>
+#include <algorithm>
 #include <sstream>
 #include <stdlib.h>
 #include <Context.h>
@@ -33,6 +34,7 @@
 #include <Table.h>
 #include <Datetime.h>
 #include <main.h>
+#include <util.h>
 #include <i18n.h>
 #include <format.h>
 
@@ -42,16 +44,16 @@ extern Context context;
 CmdTimesheet::CmdTimesheet ()
 {
   _keyword               = "timesheet";
-  _usage                 = "task          timesheet [weeks]";
+  _usage                 = "task [filter] timesheet";
   _description           = STRING_CMD_TIMESHEET_USAGE;
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
   _uses_context          = false;
-  _accepts_filter        = false;
+  _accepts_filter        = true;
   _accepts_modifications = false;
-  _accepts_miscellaneous = true;
-  _category              = Command::Category::graphs;
+  _accepts_miscellaneous = false;
+  _category              = Command::Category::report;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,165 +61,145 @@ int CmdTimesheet::execute (std::string& output)
 {
   int rc = 0;
 
-  // Scan the pending tasks.
-  handleRecurrence ();
-  std::vector <Task> all = context.tdb2.all_tasks ();
-
-  // What day of the week does the user consider the first?
-  int weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
-  if (weekStart != 0 && weekStart != 1)
-    throw std::string (STRING_DATE_BAD_WEEKSTART);
-
-  // Determine the date of the first day of the most recent report.
-  Datetime today;
-  Datetime start;
-  start -= (((today.dayOfWeek () - weekStart) + 7) % 7) * 86400;
-
-  // Roll back to midnight.
-  start = Datetime (start.year (), start.month (), start.day ());
-  Datetime end = start + (7 * 86400);
-
-  // Determine how many reports to run.
-  int quantity = 1;
-  std::vector <std::string> words = context.cli2.getWords ();
-  if (words.size () == 1)
-    quantity = strtol (words[0].c_str (), NULL, 10);;
-
-  std::stringstream out;
-  for (int week = 0; week < quantity; ++week)
+  // Detect a filter.
+  bool hasFilter {false};
+  for (auto& a : context.cli2._args)
   {
-    Datetime endString (end);
-    endString -= 86400;
+    if (a.hasTag ("FILTER"))
+    {
+      hasFilter = true;
+      break;
+    }
+  }
 
-    std::string title = start.toString (context.config.get ("dateformat"))
-                        + " - "
-                        + endString.toString (context.config.get ("dateformat"));
+  if (! hasFilter)
+  {
+    auto defaultFilter = context.config.get ("report.timesheet.filter");
+    if (defaultFilter == "")
+      defaultFilter = "(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)";
+    context.cli2.addFilter (defaultFilter);
+  }
 
-    Color bold;
-    if (context.color ())
-      bold = Color ("bold");
+  // Apply filter to get a set of tasks.
+  handleRecurrence ();
+  Filter filter;
+  std::vector <Task> filtered;
+  filter.subset (filtered);
 
-    out << '\n'
-        << bold.colorize (title)
+  // Subset the tasks to only those that are either completed or started.
+  // The _key attribute is represents either the 'start' or 'end' date.
+  int num_completed = 0;
+  int num_started = 0;
+  std::vector <Task> shown;
+  for (auto& task : filtered)
+  {
+    if (task.getStatus () == Task::completed)
+    {
+      task.set ("_key", task.get ("end"));
+      ++num_completed;
+    }
+
+    if (task.getStatus () == Task::pending && task.has ("start"))
+    {
+      task.set ("_key", task.get ("start"));
+      ++num_started;
+    }
+
+    shown.push_back (task);
+  }
+
+  // Sort tasks by _key.
+  std::sort (shown.begin (),
+             shown.end (),
+             [](const Task& a, const Task& b) { return a.get ("_key") < b.get ("_key"); });
+
+  // Render the completed table.
+  Table table;
+  table.width (context.getWidth ());
+  if (context.config.getBoolean ("obfuscate"))
+    table.obfuscate ();
+  table.add ("Wk");
+  table.add ("Date");
+  table.add ("Day");
+  table.add ("Action");
+  table.add ("Project");
+  table.add ("Due");
+  table.add ("Task");
+
+  if (context.color ())
+  {
+    table.forceColor ();
+    table.colorHeader (Color ("underline " + context.config.get ("color.label")));
+    table.colorOdd    (Color (context.config.get ("color.alternate")));
+  }
+  else
+    table.underlineHeaders ();
+
+  auto dateformat = context.config.get ("dateformat");
+
+  int previous_week = -1;
+  std::string previous_date = "";
+  std::string previous_day = "";
+  int weekCounter = 0;
+  Color week_color;
+  for (auto& task : shown)
+  {
+    Datetime key (task.get_date ("_key"));
+
+    std::string label = task.has ("end")   ? "Completed"
+                      : task.has ("start") ? "Started"
+                      :                      "";
+
+    auto week = key.week ();
+    auto date = key.toString (dateformat);
+    auto due  = task.has ("due") ? Datetime (task.get ("due")).toString (dateformat) : "";
+    auto day  = Datetime::dayNameShort (key.dayOfWeek ());
+
+    Color task_color;
+    autoColorize (task, task_color);
+
+    // Add a blank line between weeks.
+    if (week != previous_week && previous_week != -1)
+    {
+      auto row = table.addRowEven ();
+      table.set (row, 0, " ");
+    }
+
+    // Keep track of unique week numbers.
+    if (week != previous_week)
+      ++weekCounter;
+
+    // User-defined oddness.
+    int row;
+    if (weekCounter % 2)
+      row = table.addRowOdd ();
+    else
+      row = table.addRowEven ();
+
+    // If the data doesn't change, it doesn't get shown.
+    table.set (row, 0, (week != previous_week ? format ("W{1}", week) : ""));
+    table.set (row, 1, (date != previous_date ? date                  : ""));
+    table.set (row, 2, (day != previous_day   ? day                   : ""));
+    table.set (row, 3, label);
+    table.set (row, 4, task.get ("project"));
+    table.set (row, 5, due);
+    table.set (row, 6, task.get ("description"), task_color);
+
+    previous_week = week;
+    previous_date = date;
+    previous_day  = day;
+  }
+
+  // Render the table.
+  std::stringstream out;
+  if (table.rows ())
+    out << optionalBlankLine ()
+        << table.render ()
         << '\n';
 
-    // Render the completed table.
-    Table completed;
-    completed.width (context.getWidth ());
-    completed.add ("   ");
-    completed.add (STRING_COLUMN_LABEL_PROJECT);
-    completed.add (STRING_COLUMN_LABEL_DUE, false);
-    completed.add (STRING_COLUMN_LABEL_DESC);
-
-    Color label;
-    if (context.color ())
-    {
-      label = Color (context.config.get ("color.label"));
-      completed.colorHeader (label);
-    }
-
-    for (auto& task : all)
-    {
-      // If task completed within range.
-      if (task.getStatus () == Task::completed)
-      {
-        Datetime compDate (task.get_date ("end"));
-        if (compDate >= start && compDate < end)
-        {
-          Color c;
-          autoColorize (task, c);
-
-          int row = completed.addRow ();
-          std::string format = context.config.get ("dateformat.report");
-          if (format == "")
-            format = context.config.get ("dateformat");
-          completed.set (row, 1, task.get ("project"), c);
-
-          if(task.has ("due"))
-          {
-            Datetime dt (task.get_date ("due"));
-            completed.set (row, 2, dt.toString (format));
-          }
-
-          std::string description = task.get ("description");
-          int indent = context.config.getInteger ("indent.annotation");
-
-          for (auto& ann : task.getAnnotations ())
-            description += '\n'
-                         + std::string (indent, ' ')
-                         + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))
-                         + ' '
-                         + ann.second;
-
-          completed.set (row, 3, description, c);
-        }
-      }
-    }
-
-    out << "  " << format (STRING_CMD_TIMESHEET_DONE, completed.rows ()) << '\n';
-
-    if (completed.rows ())
-      out << completed.render ()
-          << '\n';
-
-    // Now render the started table.
-    Table started;
-    started.width (context.getWidth ());
-    started.add ("   ");
-    started.add (STRING_COLUMN_LABEL_PROJECT);
-    started.add (STRING_COLUMN_LABEL_DUE, false);
-    started.add (STRING_COLUMN_LABEL_DESC);
-    started.colorHeader (label);
-
-    for (auto& task : all)
-    {
-      // If task started within range, but not completed withing range.
-      if (task.getStatus () == Task::pending &&
-          task.has ("start"))
-      {
-        Datetime startDate (task.get_date ("start"));
-        if (startDate >= start && startDate < end)
-        {
-          Color c;
-          autoColorize (task, c);
-
-          int row = started.addRow ();
-          std::string format = context.config.get ("dateformat.report");
-          if (format == "")
-            format = context.config.get ("dateformat");
-          started.set (row, 1, task.get ("project"), c);
-
-          if (task.has ("due"))
-          {
-            Datetime dt (task.get_date ("due"));
-            started.set (row, 2, dt.toString (format));
-          }
-
-          std::string description = task.get ("description");
-          int indent = context.config.getInteger ("indent.annotation");
-
-          for (auto& ann : task.getAnnotations ())
-            description += '\n'
-                         + std::string (indent, ' ')
-                         + Datetime (ann.first.substr (11)).toString (context.config.get ("dateformat"))
-                         + ' '
-                         + ann.second;
-
-          started.set (row, 3, description, c);
-        }
-      }
-    }
-
-    out << "  " << format (STRING_CMD_TIMESHEET_STARTED, started.rows ()) << '\n';
-
-    if (started.rows ())
-      out << started.render ()
-          << "\n\n";
-
-    // Prior week.
-    start -= 7 * 86400;
-    end   -= 7 * 86400;
-  }
+  if (context.verbose ("affected"))
+    out << format ("{1} completed, {2} started.", num_completed, num_started)
+        << '\n';
 
   output = out.str ();
   return rc;
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 90b9f217b..ec0bf6e54 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -534,7 +534,7 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_TIMESHEET_USAGE   "Weekly summary of completed and started tasks"
+#define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
 #define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
 #define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
 #define STRING_CMD_BURN_USAGE_M      "Shows a graphical burndown chart, by month"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 803b7229c..29348d3d3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -536,7 +536,7 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_TIMESHEET_USAGE   "Weekly summary of completed and started tasks"
+#define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
 #define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
 #define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
 #define STRING_CMD_BURN_USAGE_M      "Shows a graphical burndown chart, by month"
diff --git a/test/timesheet.t b/test/timesheet.t
index 016cb93f1..28796fdf5 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -70,32 +70,27 @@ class TestTimesheet(TestCase):
         cls.t("log C1 entry:{0} end:{1}".format(fourteen, seven))
         cls.t("log C2 entry:{0} end:{0}".format(fourteen))
 
-    def test_one_week(self):
-        """One week of started and completed"""
-        code, out, err = self.t("timesheet")
-
-        expected = re.compile("Completed.+C0.+Started.+PS0", re.DOTALL)
-        self.assertRegexpMatches(out, expected)
-
-    def test_two_weeks(self):
-        """Two weeks of started and completed"""
-        code, out, err = self.t("timesheet 2")
-
-        expected = re.compile(
-            "Completed.+C0.+Started.+PS0.+"
-            "Completed.+C1.+Started.+PS1", re.DOTALL)
-        self.assertRegexpMatches(out, expected)
-
     def test_three_weeks(self):
         """Three weeks of started and completed"""
-        code, out, err = self.t("timesheet 3")
+        code, out, err = self.t("timesheet")
 
         expected = re.compile(
-            "Completed.+C0.+Started.+PS0.+"
-            "Completed.+C1.+Started.+PS1.+"
-            "Completed.+C2.+Started.+PS2", re.DOTALL)
+            "Started.+PS2.+Completed.+C2.+"
+            "Started.+PS1.+Completed.+C1.+"
+            "Started.+PS0.+Completed.+C0", re.DOTALL)
         self.assertRegexpMatches(out, expected)
 
+    def test_one_week(self):
+        """One week of started and completed"""
+        # This is the default filter, reduced from 4 weeks to 1.
+        code, out, err = self.t("timesheet (+PENDING and start.after:now-1wk) or (+COMPLETED and end.after:now-1wk)")
+
+        expected = re.compile("Started.+PS0.+Completed.+C0", re.DOTALL)
+        self.assertRegexpMatches(out, expected)
+        self.assertNotIn("PS1", out)
+        self.assertNotIn("PS2", out)
+        self.assertNotIn("C1", out)
+        self.assertNotIn("C2", out)
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner

From 5b42cb37c7d8d0ae728f01ab35dad7a9dc1b4f7f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 10:03:47 -0500
Subject: [PATCH 379/879] libshared: Updated to
 09ddc067c8db2d19472283d037ff38d76d63eff8

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 2daeeb7e6..09ddc067c 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 2daeeb7e6e0716ce42f7a3d0e4400aee71531d6e
+Subproject commit 09ddc067c8db2d19472283d037ff38d76d63eff8

From 7ef02874678b91ed1624e59b21c1373f1069270b Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Wed, 8 Feb 2017 19:18:40 +0100
Subject: [PATCH 380/879] Adding weekly/daily history commands

---
 src/commands/CmdHistory.cpp | 206 ++++++++++++++++++++++++++++++++++++
 src/commands/CmdHistory.h   |   8 ++
 src/commands/Command.cpp    |   4 +
 src/l10n/eng-USA.h          |   6 ++
 4 files changed, 224 insertions(+)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 319265f07..0b74d36ae 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -519,9 +519,215 @@ public:
   static constexpr bool graphical              = false;
 };
 
+
+////////////////////////////////////////////////////////////////////////////i
+class DailyHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfDay ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_DAY);
+  }
+
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if ((y != last_y) || (lastTime == 0))
+    {
+      view.set (row, 0, y);
+    }
+
+    if ((m != last_m) || (lastTime == 0))
+    {
+      view.set (row, 1, Datetime::monthName (m));
+    }
+
+    view.set (row, 2, d);
+  }
+
+  static constexpr const char* keyword         = "history.daily";
+  static constexpr const char* usage           = "task <filter> history.daily";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_D;
+  static constexpr unsigned int dateFieldCount = 3;
+  static constexpr bool graphical              = false;
+};
+
+////////////////////////////////////////////////////////////////////////////i
+class DailyGHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfDay ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_DAY);
+  }
+
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if ((y != last_y) || (lastTime == 0))
+    {
+      view.set (row, 0, y);
+    }
+
+    if ((m != last_m) || (lastTime == 0))
+    {
+      view.set (row, 1, Datetime::monthName (m));
+    }
+
+    view.set (row, 2, d);
+  }
+
+  static constexpr const char* keyword         = "ghistory.daily";
+  static constexpr const char* usage           = "task <filter> ghistory.daily";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_D;
+  static constexpr unsigned int dateFieldCount = 3;
+  static constexpr bool graphical              = true;
+};
+
+////////////////////////////////////////////////////////////////////////////i
+class WeeklyHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfWeek ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_DAY);
+  }
+
+  static void insertRowDate (
+    Table& view,
+    int row,
+    time_t rowTime,
+    time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if ((y != last_y) || (lastTime == 0))
+    {
+      view.set (row, 0, y);
+    }
+
+    if ((m != last_m) || (lastTime == 0))
+    {
+      view.set (row, 1, Datetime::monthName (m));
+    }
+
+    view.set (row, 2, d);
+  }
+
+  static constexpr const char* keyword         = "history.weekly";
+  static constexpr const char* usage           = "task <filter> history.weekly";
+  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_W;
+  static constexpr unsigned int dateFieldCount = 3;
+  static constexpr bool graphical              = false;
+};
+
+////////////////////////////////////////////////////////////////////////////i
+class WeeklyGHistoryStrategy
+{
+public:
+  static Datetime getRelevantDate (const Datetime & dt)
+  {
+    return dt.startOfWeek ();
+  }
+
+  static void setupTableDates (Table & view)
+  {
+    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_DAY);
+  }
+
+  static void insertRowDate (
+    Table& view,
+     int row,
+     time_t rowTime,
+     time_t lastTime)
+  {
+    Datetime dt (rowTime);
+    int m, d, y;
+    dt.toYMD (y, m, d);
+
+    Datetime last_dt (lastTime);
+    int last_m, last_d, last_y;
+    last_dt.toYMD (last_y, last_m, last_d);
+
+    if ((y != last_y) || (lastTime == 0))
+    {
+      view.set (row, 0, y);
+    }
+
+    if ((m != last_m) || (lastTime == 0))
+    {
+      view.set (row, 1, Datetime::monthName (m));
+    }
+
+    view.set (row, 2, d);
+  }
+
+  static constexpr const char* keyword         = "ghistory.weekly";
+  static constexpr const char* usage           = "task <filter> ghistory.weekly";
+  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_W;
+  static constexpr unsigned int dateFieldCount = 3;
+  static constexpr bool graphical              = true;
+};
+
+
 // Explicit instantiations, avoiding cpp-inclusion or implementation in header
+template class CmdHistoryBase<DailyHistoryStrategy>;
+template class CmdHistoryBase<WeeklyHistoryStrategy>;
 template class CmdHistoryBase<MonthlyHistoryStrategy>;
 template class CmdHistoryBase<AnnualHistoryStrategy>;
+template class CmdHistoryBase<DailyGHistoryStrategy>;
+template class CmdHistoryBase<WeeklyGHistoryStrategy>;
 template class CmdHistoryBase<MonthlyGHistoryStrategy>;
 template class CmdHistoryBase<AnnualGHistoryStrategy>;
 
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 10b7f5e11..8a3977f5e 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -52,12 +52,20 @@ private:
 };
 
 // Forward-declare strategies implemented in CmdHistory.cpp
+class DailyHistoryStrategy;
+class DailyGHistoryStrategy;
+class WeeklyHistoryStrategy;
+class WeeklyGHistoryStrategy;
 class MonthlyHistoryStrategy;
 class MonthlyGHistoryStrategy;
 class AnnualHistoryStrategy;
 class AnnualGHistoryStrategy;
 
 // typedef the templates to nice names to be used outside this class
+typedef CmdHistoryBase<DailyHistoryStrategy> CmdHistoryDaily;
+typedef CmdHistoryBase<DailyGHistoryStrategy> CmdGHistoryDaily;
+typedef CmdHistoryBase<WeeklyHistoryStrategy> CmdHistoryWeekly;
+typedef CmdHistoryBase<WeeklyGHistoryStrategy> CmdGHistoryWeekly;
 typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
 typedef CmdHistoryBase<MonthlyGHistoryStrategy> CmdGHistoryMonthly;
 typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index cb164bad7..e060f5ca9 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -134,9 +134,13 @@ void Command::factory (std::map <std::string, Command*>& all)
 #endif
   c = new CmdExport ();             all[c->keyword ()] = c;
   c = new CmdGet ();                all[c->keyword ()] = c;
+  c = new CmdGHistoryDaily ();      all[c->keyword ()] = c;
+  c = new CmdGHistoryWeekly ();     all[c->keyword ()] = c;
   c = new CmdGHistoryMonthly ();    all[c->keyword ()] = c;
   c = new CmdGHistoryAnnual ();     all[c->keyword ()] = c;
   c = new CmdHelp ();               all[c->keyword ()] = c;
+  c = new CmdHistoryDaily ();       all[c->keyword ()] = c;
+  c = new CmdHistoryWeekly ();      all[c->keyword ()] = c;
   c = new CmdHistoryMonthly ();     all[c->keyword ()] = c;
   c = new CmdHistoryAnnual ();      all[c->keyword ()] = c;
   c = new CmdIDs ();                all[c->keyword ()] = c;
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ec0bf6e54..470ed4822 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -264,9 +264,12 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tags"
 #define STRING_CMD_TAGS_NO_TAGS      "No tags."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
 #define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
 #define STRING_CMD_HISTORY_YEAR      "Year"
 #define STRING_CMD_HISTORY_MONTH     "Month"
+#define STRING_CMD_HISTORY_DAY       "Day"
 #define STRING_CMD_HISTORY_ADDED     "Added"
 #define STRING_CMD_HISTORY_COMP      "Completed"
 #define STRING_CMD_HISTORY_DEL       "Deleted"
@@ -275,10 +278,13 @@
 #define STRING_CMD_HISTORY_AVERAGE   "Average"
 #define STRING_CMD_HISTORY_LEGEND    "Legend: {1}, {2}, {3}"
 #define STRING_CMD_HISTORY_LEGEND_A  "Legend: + Added, X Completed, - Deleted"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
 #define STRING_CMD_GHISTORY_USAGE_M  "Shows a graphical report of task history, by month"
 #define STRING_CMD_GHISTORY_USAGE_A  "Shows a graphical report of task history, by year"
 #define STRING_CMD_GHISTORY_YEAR     "Year"
 #define STRING_CMD_GHISTORY_MONTH    "Month"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_GHISTORY_NUMBER   "Number Added/Completed/Deleted"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."

From e934065cf83acd9bcb5f229b190d6e79a19f2248 Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Wed, 8 Feb 2017 19:23:10 +0100
Subject: [PATCH 381/879] Update manpage for history commands

---
 doc/man/task.1.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 9467fdb56..1196554a4 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -200,6 +200,14 @@ Shows a graphical report of task status by year.
 Shows a graphical report of task status by month.  Note that 'ghistory' is
 an alias to 'ghistory.monthly'.
 
+.TP
+.B task <filter> ghistory.weekly
+Shows a graphical report of task status by week.
+
+.TP
+.B task <filter> ghistory.daily
+Shows a graphical report of task status by day.
+
 .TP
 .B task help
 Shows the long usage text.
@@ -213,6 +221,14 @@ Shows a report of task history by year.
 Shows a report of task history by month.  Note that 'history' is
 an alias to 'history.monthly'.
 
+.TP
+.B task <filter> history.weekly
+Shows a report of task history by week.
+
+.TP
+.B task <filter> history.daily
+Shows a report of task history by day.
+
 .TP
 .B task <filter> ids
 Applies the filter then extracts only the task IDs and presents them as
@@ -1312,4 +1328,3 @@ You can contact the project by emailing
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
 <https://bug.tasktools.org/>
-

From 80a3f7485230e936087d96233ca7c17164c2bd14 Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Thu, 9 Feb 2017 13:44:17 +0100
Subject: [PATCH 382/879] Add unit tests for new history commands

---
 test/history.t | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/test/history.t b/test/history.t
index 3397173e5..bcb05918e 100755
--- a/test/history.t
+++ b/test/history.t
@@ -34,6 +34,72 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from basetest import Task, TestCase
 
+class TestHistoryDaily(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+        self.data = """[
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T000000Z","wait":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T000000Z","end":"20150102T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+]"""
+        self.t("import -", input=self.data)
+
+    def test_history_daily(self):
+        """Verify 'history.daily' correctly categorizes data"""
+        code, out, err = self.t("history.daily")
+        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
+        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
+        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+
+        code, out, err = self.t("ghistory.daily rc._forcecolor:on")
+        self.assertRegexpMatches(out, "\s7.+\s1.+")
+        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+
+        code, out, err = self.t("ghistory.daily")
+        self.assertRegexpMatches(out, "2015 January  2\s+\++X+\s")
+        self.assertRegexpMatches(out, "\s+February 2\s+\++X+\-+")
+
+class TestHistoryDaily(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+        self.data = """[
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T000000Z","wait":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T000000Z","end":"20150102T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+]"""
+        self.t("import -", input=self.data)
+
+    def test_history_daily(self):
+        """Verify 'history.weekly' correctly categorizes data"""
+        code, out, err = self.t("history.weekly")
+        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
+        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
+        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+
+        code, out, err = self.t("ghistory.weekly rc._forcecolor:on")
+        self.assertRegexpMatches(out, "\s7.+\s1.+")
+        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+
+        code, out, err = self.t("ghistory.weekly")
+        self.assertRegexpMatches(out, "2014 December 28\s+\++X+\s")
+        self.assertRegexpMatches(out, "2015 February 1\s+\++X+\-+")
+
 
 class TestHistoryMonthly(TestCase):
     def setUp(self):

From d2a1b9f18ef68f72a24a559cb62f1f5a11aaba2a Mon Sep 17 00:00:00 2001
From: Lukas Barth <lukas.barth@kit.edu>
Date: Thu, 9 Feb 2017 13:57:59 +0100
Subject: [PATCH 383/879] Add localized strings

---
 src/l10n/deu-DEU.h |  8 +++++++-
 src/l10n/epo-RUS.h |  6 ++++++
 src/l10n/esp-ESP.h | 37 +++++++++++++++++++++++--------------
 src/l10n/fra-FRA.h |  8 ++++++++
 src/l10n/ita-ITA.h |  8 ++++++++
 src/l10n/jpn-JPN.h |  8 ++++++++
 src/l10n/pol-POL.h |  8 ++++++++
 src/l10n/por-PRT.h |  8 ++++++++
 8 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 399c0555f..d91be078a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -267,9 +267,12 @@
 #define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
 #define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
 #define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
+#define STRING_CMD_HISTORY_USAGE_D   "Zeigt die tägliche Aufgabenentwicklung"
+#define STRING_CMD_HISTORY_USAGE_W   "Zeigt die wöchentliche Aufgabenentwicklung"
 #define STRING_CMD_HISTORY_USAGE_M   "Zeigt die monatliche Aufgabenentwicklung"
 #define STRING_CMD_HISTORY_YEAR      "Jahr"
 #define STRING_CMD_HISTORY_MONTH     "Monat"
+#define STRING_CMD_HISTORY_DAY       "Tag"
 #define STRING_CMD_HISTORY_ADDED     "Hinzugefügt"
 #define STRING_CMD_HISTORY_COMP      "Erledigt"
 #define STRING_CMD_HISTORY_DEL       "Gelöscht"
@@ -278,10 +281,13 @@
 #define STRING_CMD_HISTORY_AVERAGE   "Durchschnitt"
 #define STRING_CMD_HISTORY_LEGEND    "Legende: {1}, {2}, {3}"
 #define STRING_CMD_HISTORY_LEGEND_A  "Legende: + hinzugefügt, X erledigt, - gelöscht"
+#define STRING_CMD_GHISTORY_USAGE_D  "Zeigt die tägliche Aufgabenentwicklung grafisch"
+#define STRING_CMD_GHISTORY_USAGE_W  "Zeigt die wöchentliche Aufgabenentwicklung grafisch"
 #define STRING_CMD_GHISTORY_USAGE_M  "Zeigt die monatliche Aufgabenentwicklung grafisch"
 #define STRING_CMD_GHISTORY_USAGE_A  "Zeigt die jährliche Aufgabenentwicklung grafisch"
 #define STRING_CMD_GHISTORY_YEAR     "Jahr"
 #define STRING_CMD_GHISTORY_MONTH    "Monat"
+#define STRING_CMD_GHISTORY_MONTH    "Tag"
 #define STRING_CMD_GHISTORY_NUMBER   "Anzahl Hinzugefügt/Erledigt/Gelöscht"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
@@ -937,7 +943,7 @@
 
 /*
   To be included later, before the 'precendence' line.
- 
+
   "  +  -                    Addition, Subtraktion\n" \
   "  !                       Negation\n" \
   "  ~  !~                   Treffer, kein Treffer\n" \
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 94af293e3..c44047d28 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -267,9 +267,12 @@
 #define STRING_CMD_TAGS_SINGLE       "1 etikedo"
 #define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
 #define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
 #define STRING_CMD_HISTORY_USAGE_M   "Montras raporton de taska historio, per monato"
 #define STRING_CMD_HISTORY_YEAR      "Jaro"
 #define STRING_CMD_HISTORY_MONTH     "Monato"
+#define STRING_CMD_HISTORY_DAY       "Day"
 #define STRING_CMD_HISTORY_ADDED     "Kreitaj"
 #define STRING_CMD_HISTORY_COMP      "Finitaj"
 #define STRING_CMD_HISTORY_DEL       "Viŝitaj"
@@ -278,10 +281,13 @@
 #define STRING_CMD_HISTORY_AVERAGE   "Meznombro"
 #define STRING_CMD_HISTORY_LEGEND    "Gamo: {1}, {2}, {3}"
 #define STRING_CMD_HISTORY_LEGEND_A  "Gamo: + kreita, X finita, - viŝita"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
 #define STRING_CMD_GHISTORY_USAGE_M  "Montras grafikan raporton de taska historio, per monato"
 #define STRING_CMD_GHISTORY_USAGE_A  "Montras grafikan raporton de taska historio, per jaro"
 #define STRING_CMD_GHISTORY_YEAR     "Jaro"
 #define STRING_CMD_GHISTORY_MONTH    "Monato"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_GHISTORY_NUMBER   "Nombro Kreitaj/Finitaj/Viŝitaj"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a6c848a89..bc2858286 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -272,6 +272,15 @@
 #define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
 #define STRING_CMD_HISTORY_USAGE_M   "Muestra un informe de historia de tareas, por mes"
 
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
+
 #define STRING_CMD_HISTORY_YEAR      "Año"
 #define STRING_CMD_HISTORY_MONTH     "Mes"
 #define STRING_CMD_HISTORY_ADDED     "Añadidas"
@@ -837,19 +846,19 @@
 
 // ****************************************************************************************************
 // Usage text.  This is an exception, and contains \n characters and formatting.
-/* FIXME más abajo 
-  "  task project:Casa due.before:hoy          <command> <mods>\n" 
-  "  task project:Home due.before:today        <command> <mods>\n" 
- y 
-  "  task <filter> <command> project:Casa\n" 
-  "  task <filter> <command> +finde +jardín due:mañana\n" 
-  "  task <filter> <command> Texto anotación/descripción\n" 
- en vez de: 
-  "  task <filter> <command> project:Home\n" 
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" 
-  "  task <filter> <command> Description/annotation text\n" 
- y 
-  "  task add -- project:Casa necesita programación\n" 
+/* FIXME más abajo
+  "  task project:Casa due.before:hoy          <command> <mods>\n"
+  "  task project:Home due.before:today        <command> <mods>\n"
+ y
+  "  task <filter> <command> project:Casa\n"
+  "  task <filter> <command> +finde +jardín due:mañana\n"
+  "  task <filter> <command> Texto anotación/descripción\n"
+ en vez de:
+  "  task <filter> <command> project:Home\n"
+  "  task <filter> <command> +weekend +garden due:tomorrow\n"
+  "  task <filter> <command> Description/annotation text\n"
+ y
+  "  task add -- project:Casa necesita programación\n"
   "  task add -- project:Home needs scheduling\n" */
  #define STRING_CMD_HELP_TEXT \
   "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc'" \
@@ -959,7 +968,7 @@
 
 /*
   To be included later, before the 'precendence' line.
- 
+
   "  +  -                    Addition, subtraction\n" \
   "  !                       Inversion\n" \
   "  ~  !~                   Match, no match\n" \
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 6e080a267..069c40709 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -267,6 +267,14 @@
 #define STRING_CMD_TAGS_SINGLE       "1 étiquette"
 #define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
 #define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
 #define STRING_CMD_HISTORY_YEAR      "Année"
 #define STRING_CMD_HISTORY_MONTH     "Mois"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index a345dbfe6..f82c565e5 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -266,6 +266,14 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tag"
 #define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_HISTORY_USAGE_M   "Mostra un report dello storico dei task, per mese"
 #define STRING_CMD_HISTORY_YEAR      "Anno"
 #define STRING_CMD_HISTORY_MONTH     "Mese"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 29348d3d3..1602c9617 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -267,6 +267,14 @@
 #define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
 #define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
 #define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
 #define STRING_CMD_HISTORY_YEAR      "Year"
 #define STRING_CMD_HISTORY_MONTH     "Month"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b2002c9c7..cad499ecd 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -267,6 +267,14 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tagów"
 #define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_HISTORY_USAGE_M   "Pokazuje raport historii zadań w ujęciu miesięcznym"
 #define STRING_CMD_HISTORY_YEAR      "Rok"
 #define STRING_CMD_HISTORY_MONTH     "Miesiąc"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5464a868a..0ca564656 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -267,6 +267,14 @@
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
+#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
+#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
+#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
+#define STRING_CMD_GHISTORY_DAY      "Day"
 #define STRING_CMD_HISTORY_USAGE_M   "Exibe um relatório mensal do histórico de tarefas"
 #define STRING_CMD_HISTORY_YEAR      "Ano"
 #define STRING_CMD_HISTORY_MONTH     "Mês"

From dbfab0a5356076af09058cb7f8983522b1ce245a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 9 Feb 2017 19:44:44 -0500
Subject: [PATCH 384/879] Docs: Updated docs with new history/ghistory
 commands.

---
 ChangeLog                   |  3 +++
 NEWS                        |  2 ++
 src/commands/CmdHistory.cpp | 36 ++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74ed09eb5..d31fd44da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,9 @@
 - Updated the 'timesheet' command with a more compact report that accepts a
   filter, and has a default filter showing the last four weeks of completed and
   started tasks.
+- Added 'history.weekly', 'history.daily', 'ghistory.weekly', 'ghistory.daily'
+  report variations, with code refactoring.
+          (thanks to Lukas Barth).
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index 1ecfa637e..6a011fafd 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ New Features in Taskwarrior 2.5.2
 New Commands in Taskwarrior 2.5.2
 
   - The 'purge' command was added, which completely removes old tasks.
+  - Added new 'history.weekly', 'history.daily', 'ghistory.weekly',
+    'ghistory.daily' reports.
 
 New Configuration Options in Taskwarrior 2.5.2
 
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 0b74d36ae..cf4ec3e0f 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -301,8 +301,8 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
   }
 
   static void insertRowDate (
@@ -404,8 +404,8 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
   }
 
   static void insertRowDate (
@@ -448,7 +448,7 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_YEAR, false);
   }
 
   static void insertRowDate (
@@ -489,7 +489,7 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
+    view.add (STRING_CMD_HISTORY_YEAR, false);
   }
 
   static void insertRowDate (
@@ -531,9 +531,9 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-    view.add (STRING_CMD_HISTORY_DAY);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
   static void insertRowDate (
@@ -581,9 +581,9 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-    view.add (STRING_CMD_HISTORY_DAY);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
   static void insertRowDate (
@@ -631,9 +631,9 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-    view.add (STRING_CMD_HISTORY_DAY);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
   static void insertRowDate (
@@ -681,9 +681,9 @@ public:
 
   static void setupTableDates (Table & view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR);
-    view.add (STRING_CMD_HISTORY_MONTH);
-    view.add (STRING_CMD_HISTORY_DAY);
+    view.add (STRING_CMD_HISTORY_YEAR,  false);
+    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
   static void insertRowDate (

From eb6af955c32952ff1f1f8762e613721c3fb6fb9d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 11 Feb 2017 13:50:25 -0500
Subject: [PATCH 385/879] libshared: Updated to
 6aa2b315c476bac3fdb7bf2bc259af55eee89f83

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 09ddc067c..6aa2b315c 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 09ddc067c8db2d19472283d037ff38d76d63eff8
+Subproject commit 6aa2b315c476bac3fdb7bf2bc259af55eee89f83

From 0a2f6caba00271455afdecb4d0d986c644d4007a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 11 Feb 2017 13:51:02 -0500
Subject: [PATCH 386/879] TLS: Now uses SNI

---
 src/CMakeLists.txt |  3 ++-
 src/TLSClient.cpp  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b95a5e49f..a5b55a450 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,8 +41,9 @@ add_library (libshared libshared/src/Color.cpp         libshared/src/Color.h
                        libshared/src/RX.cpp            libshared/src/RX.h
                        libshared/src/Table.cpp         libshared/src/Table.h
                        libshared/src/Timer.cpp         libshared/src/Timer.h
-                       libshared/src/shared.cpp        libshared/src/shared.h
                        libshared/src/format.cpp        libshared/src/format.h
+                       libshared/src/ip.cpp
+                       libshared/src/shared.cpp        libshared/src/shared.h
                        libshared/src/unicode.cpp       libshared/src/unicode.h
                        libshared/src/utf8.cpp          libshared/src/utf8.h
                        libshared/src/wcwidth6.cpp)
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index b276627bd..4bf9026be 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -46,6 +46,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
+#include <shared.h>
 #include <format.h>
 
 #define MAX_BUF 16384
@@ -210,6 +211,17 @@ void TLSClient::connect (const std::string& host, const std::string& port)
   gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
 #endif
 
+  // SNI.  Only permitted when _host is a DNS name, not an IPv4/6 address.
+  std::string dummyAddress;
+  int dummyPort;
+  if (! isIPv4Address (_host, dummyAddress, dummyPort) &&
+      ! isIPv6Address (_host, dummyAddress, dummyPort))
+  {
+    ret = gnutls_server_name_set (_session, GNUTLS_NAME_DNS, _host.c_str (), _host.length ()); // All
+    if (ret < 0)
+      throw format ("TLS SNI error. {1}", gnutls_strerror (ret)); // All
+  }
+
   // Store the TLSClient instance, so that the verification callback can access
   // it during the handshake below and call the verification method.
   gnutls_session_set_ptr (_session, (void*) this); // All

From 24538da200c3cf11dd748f45c622f07613d5fdf4 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Sun, 12 Feb 2017 22:18:26 +0100
Subject: [PATCH 387/879] Handling of git submodule in cmake

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb14ebb47..1c49533d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,15 @@ else (ENABLE_SYNC)
   message (WARNING "ENABLE_SYNC=OFF. Not building sync support.")
 endif (ENABLE_SYNC)
 
+message ("-- Looking for libshared")
+if (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+  message ("-- Found libshared")
+else (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+  message ("-- Cloning libshared")
+  execute_process (COMMAND git submodule update --init
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+endif (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
   set (HAVE_COMMIT true)

From 7d2ce304c41c3880e9cd34891b1b9c5f1caba396 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Mon, 13 Feb 2017 00:15:10 +0100
Subject: [PATCH 388/879] Mentioned cmake handling of submodule in DEVELOPER
 file

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index e9e655bea..1c626242c 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -11,7 +11,7 @@ How to Build Taskwarrior
     $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
     $ git checkout 2.5.2                 # Latest dev branch
-    $ git submodule init
+    $ git submodule init                 # This is now done by cmake (beta)
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs

From 18001a9d2def175551f9c240533da9dfb1bd0734 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Mon, 13 Feb 2017 00:54:59 +0100
Subject: [PATCH 389/879] Mentioned cmake handling of submodule in DEVELOPER
 file

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index 1c626242c..fe1cb0f2e 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -11,7 +11,7 @@ How to Build Taskwarrior
     $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
     $ git checkout 2.5.2                 # Latest dev branch
-    $ git submodule init                 # This is now done by cmake (beta)
+    $ git submodule init                 # This is now done by cmake as a test
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs

From be4ca80842c6c1d1063ff1c2e52da3e1420538c9 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Tue, 14 Feb 2017 15:18:44 +0100
Subject: [PATCH 390/879] build: Fix linking problem on non-OS-X platforms

---
 src/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5b55a450..ed953a7d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,10 +52,10 @@ add_executable (task_executable main.cpp)
 add_executable (calc_executable calc.cpp)
 add_executable (lex_executable lex.cpp)
 
-# Yes, 'task' is included twice, otherwise linking fails on assorted OSes.
-target_link_libraries (task_executable task commands columns libshared task ${TASK_LIBRARIES})
-target_link_libraries (calc_executable task commands columns libshared task ${TASK_LIBRARIES})
-target_link_libraries (lex_executable  task commands columns libshared task ${TASK_LIBRARIES})
+# Yes, 'task' (and hence libshared) is included twice, otherwise linking fails on assorted OSes.
+target_link_libraries (task_executable task commands columns libshared task libshared ${TASK_LIBRARIES})
+target_link_libraries (calc_executable task commands columns libshared task libshared ${TASK_LIBRARIES})
+target_link_libraries (lex_executable  task commands columns libshared task libshared ${TASK_LIBRARIES})
 
 set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task")
 

From f2177e12542c02181627c01016a491631ce8eda1 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Wed, 15 Feb 2017 14:40:14 +0100
Subject: [PATCH 391/879] docs: Update the build toolchain requirements

---
 DEVELOPER | 2 +-
 INSTALL   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index fe1cb0f2e..bddfa4320 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -1,7 +1,7 @@
 How to Build Taskwarrior
 
   Satisfy the Requirements:
-    - gcc 4.9 or later, clang 3.3 or later or equivalent. This is because C++11
+    - gcc 4.9 or later, clang 3.4 or later or equivalent. This is because C++11
       is now used throughout the source.
     - libuuid
     - gnutls (optional)
diff --git a/INSTALL b/INSTALL
index 0c4ec138c..dd70e9fa9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,8 +15,8 @@ You will also need:
   - make
 
 You will need a C++ compiler that supports full C++11, which includes:
-  - gcc 4.7   (released 2012-03-23)
-  - clang 3.3 (released 2013-01-07)
+  - gcc 4.9   (released 2014-04-22)
+  - clang 3.4 (released 2014-01-02)
 
 You will need the following libraries:
   - libuuid (not needed for OSX)

From 4a27ba8bce0585d03231683622f66d24d0345a83 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 18 Feb 2017 20:19:03 +0100
Subject: [PATCH 392/879] TLSClient: Free error data after extracting error
 message

---
 src/TLSClient.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 4bf9026be..b82407d21 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -292,10 +292,11 @@ void TLSClient::connect (const std::string& host, const std::string& port)
       auto status = gnutls_session_get_verify_cert_status (_session); // 3.4.6
       gnutls_datum_t out;
       gnutls_certificate_verification_status_print (status, type, &out, 0);  // 3.1.4
-      gnutls_free (out.data); // All
 
       std::string error {(const char*) out.data};
-      throw format ("Handshake failed.  {1}", error);
+      gnutls_free (out.data); // All
+
+      throw format ("Handshake failed.  {1}", error); // All
     }
 #else
     throw format ("Handshake failed.  {1}", gnutls_strerror (ret)); // All

From 0907fbf906a7e329f4d6de5a1cf5d9644abf06af Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 18 Feb 2017 20:20:37 +0100
Subject: [PATCH 393/879] style: Remove doubled spaces in the error message

---
 src/TLSClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index b82407d21..822bdafeb 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -296,10 +296,10 @@ void TLSClient::connect (const std::string& host, const std::string& port)
       std::string error {(const char*) out.data};
       gnutls_free (out.data); // All
 
-      throw format ("Handshake failed.  {1}", error); // All
+      throw format ("Handshake failed. {1}", error); // All
     }
 #else
-    throw format ("Handshake failed.  {1}", gnutls_strerror (ret)); // All
+    throw format ("Handshake failed. {1}", gnutls_strerror (ret)); // All
 #endif
   }
 

From 4f28f2662622e2bcf1a36927502380ee3a76558a Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 18 Feb 2017 20:21:30 +0100
Subject: [PATCH 394/879] TLSClient: Respect 'allow all' and 'ignore hostname'
 trust settings

---
 src/TLSClient.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 822bdafeb..88e450ff0 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -208,7 +208,11 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 
   int ret;
 #if GNUTLS_VERSION_NUMBER >= 0x030406
-  gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
+  // For _trust == TLSClient::allow_all we perform no action
+  if (_trust == TLSClient::ignore_hostname)
+    gnutls_session_set_verify_cert (_session, NULL, 0); // 3.4.6
+  else if (_trust == TLSClient::strict)
+    gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
 #endif
 
   // SNI.  Only permitted when _host is a DNS name, not an IPv4/6 address.

From 5c243b6c4cfe48dd9d9ba34464fdd458043a8484 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Sat, 18 Feb 2017 20:30:59 +0100
Subject: [PATCH 395/879] TLSClient: Improve diagnostics

Task now correctly distinguishes the situation where CA file is present,
but not valid in some sense (empty file, not valid PEM, ..). In this
case the gnutls_certificate_set_x509_trust_file returns 0, as the number
of certificates detected in the file.

The method returns negative numbers for other errors, such as the CA
file itself missing.

Also clarify that when validating client cert/key pair, each of them can
be the source of the problem, not only the cliet certificate file.
---
 src/TLSClient.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 88e450ff0..ea16987bc 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -157,15 +157,24 @@ void TLSClient::init (
     throw format ("Bad System Trust. {1}", gnutls_strerror (ret)); // All
 #endif
 
-  if (_ca != "" &&
-      (ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // All
-    throw format ("Bad CA file. {1}", gnutls_strerror (ret)); // All
+  if (_ca != "")
+  {
+    // The gnutls_certificate_set_x509_key_file call returns number of
+    // certificates parsed on success (including 0, when no certificate was
+    // found) and negative values on error
+    ret = gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM); // All
+    if (ret == 0)
+      throw format ("CA file {1} contains no certificate.", _ca);
+    else if (ret < 0)
+      throw format ("Bad CA file: {1}", gnutls_strerror (ret)); // All
+
+  }
 
   // TODO This may need 0x030111 protection.
   if (_cert != "" &&
       _key != "" &&
       (ret = gnutls_certificate_set_x509_key_file (_credentials, _cert.c_str (), _key.c_str (), GNUTLS_X509_FMT_PEM)) < 0) // 3.1.11
-    throw format ("Bad CERT file. {1}", gnutls_strerror (ret)); // All
+    throw format ("Bad client CERT/KEY file. {1}", gnutls_strerror (ret)); // All
 
 #if GNUTLS_VERSION_NUMBER < 0x030406
 #if GNUTLS_VERSION_NUMBER >= 0x020a00

From a1abc46138bca4cd963724801721da16ea9b02bc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 18 Feb 2017 17:23:08 -0500
Subject: [PATCH 396/879] TW-1885: Task Sync does not send TLS SNI headers

- Thanks to Dan Callahan.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index af660ee4e..b81271d56 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -312,3 +312,4 @@ suggestions:
   eezewaek
   Hubert Toullec
   Eric Hymowitz
+  Dan Callahan
diff --git a/ChangeLog b/ChangeLog
index d31fd44da..98c08a260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,8 @@
           (thanks to Hubert Toullec).
 - TW-1881 default.scheduled seems not to work
           (thanks to Onion).
+- TW-1885 Task Sync does not send TLS SNI headers
+          (thanks to Dan Callahan).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 187ae4b938cb27bd631ada7db8f943b4d067a0ef Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 18:11:23 -0500
Subject: [PATCH 397/879] Docs: Update for testing flod2

---
 DEVELOPER | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index bddfa4320..fd47ba2e0 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -1,8 +1,8 @@
 How to Build Taskwarrior
 
   Satisfy the Requirements:
-    - gcc 4.9 or later, clang 3.4 or later or equivalent. This is because C++11
-      is now used throughout the source.
+    - gcc 4.9 or later, clang 3.4 or later, or a compiler with full C++11
+      support.
     - libuuid
     - gnutls (optional)
     - python 2.7 or 3 (optional, for running the test suite)

From 06f91ed4b9a7fe976b44f17a1aad1ea82257a413 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 18:56:35 -0500
Subject: [PATCH 398/879] Docs: Typo

---
 EXPOSITION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EXPOSITION b/EXPOSITION
index 68609d5c4..a7d4a03a5 100644
--- a/EXPOSITION
+++ b/EXPOSITION
@@ -117,7 +117,7 @@ Files
 
   The backlog.data file contains an accumulated set of changes that have not
   been transmitted to Taskserver. It grows unbounded between 'sync' commands.
-  If you do not use sync, it is fine to just delete this file to sae space.
+  If you do not use sync, it is fine to just delete this file to save space.
 
 
 Filter

From a190fb447d2e32b1ce3f993990daf94954909089 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:00:14 -0500
Subject: [PATCH 399/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 98c08a260..36234f402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -261,7 +261,7 @@
 - TW-1488 You have more urgent tasks (thanks to Stefan Betz, Denis Kasak).
 - TW-1496 Translation manuals are outdated/miss information (thanks to Jens
           Erat).
-- TW-1499 Invalid due date produces jump to beggining of the unix epoch (thanks
+- TW-1499 Invalid due date produces jump to beginning of the unix epoch (thanks
           to Tomas Babej).
 - TW-1511 Project titles not properly parsed if they contain hyphens (thanks to
           Leon Feng, Blake Sweeney, Dylan Mikus).

From 89fffbb4da14f488e8cd26b052197f7fff9ca7eb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:00:29 -0500
Subject: [PATCH 400/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 36234f402..7d25728ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -315,7 +315,7 @@
           John Reeder).
 - TW-1630 "Due" parsing behavior seems inconsistent (thanks to Jim B).
 - TW-1632 Japanese translation for Taskwarrior(150713) (thanks to ribbon).
-- TW-1634 due.not:<date> excludes only tasks scheduled at mitnight (thanks to
+- TW-1634 due.not:<date> excludes only tasks scheduled at midnight (thanks to
           Tomas Babej).
 - TW-1635 Running "task anystringatall" does not filter anything (thanks to
           Tomas Babej).

From 5125bb840d1f6416db30708adb7aaa2b603f26d6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:08 -0500
Subject: [PATCH 401/879] Docs: Typo

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6a011fafd..19ffb9bbb 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ New Configuration Options in Taskwarrior 2.5.2
 
   - New 'relative' column format for 'date' type columns does what 'remaining'
     and 'countdown' do, but in one format.
-  - The 'default.scheduled' date/duraiton works just like 'default.due'.
+  - The 'default.scheduled' date/duration works just like 'default.due'.
   - The 'report.timesheet.filter' setting controls the tasks shown by the
     'timesheet' command.
 

From 95ca400826c7e2e9adfd5a47adba29ef711dda56 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:20 -0500
Subject: [PATCH 402/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7d25728ef..46705a86b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -526,7 +526,7 @@
           Babej).
 - TW-1505 completely ignore mis-named hook scripts (thanks to Tomas Babej,
           David Patrick).
-- TW-1509 Hooks modifications performed on sync not sycning back (thanks to
+- TW-1509 Hooks modifications performed on sync not syncing back (thanks to
           Tomas Babej).
 - TW-1510 Task can save empty value in the data backlog (thanks to Tomas Babej).
 - TW-1517 Hook performance should be measured individually for each hook (thanks

From c5e0577aeee3c022a395ea13b3a51fbd417749a4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:30 -0500
Subject: [PATCH 403/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 46705a86b..6ca041a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -634,7 +634,7 @@
          "Description ( Information)".
 - TW-248 Substitute text doesn't work with forward slash (thanks to Jostein
          Berntsen).
-- TW-249 Report filters don't allow parantheses (thanks to Philipp Woelfel).
+- TW-249 Report filters don't allow parentheses (thanks to Philipp Woelfel).
 - TW-250 Opening parenthesis in description gets padded in task 2.0.0 bet 2
          (thanks to Michelle Crane).
 - TW-251 extra spaces added after ( and / (thanks to Andy Spiegl).

From 3fb591714a41168b691e9aa96c057ee65d887f2d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:37 -0500
Subject: [PATCH 404/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6ca041a04..b79df581b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -909,7 +909,7 @@ Bugs
   .taskrc file (thanks to Haitham Gad).
 - #1247 Tests now create a local dir, rather than use the insecure /tmp dir
   (thanks to Jakub Wilk).
-- #1248 Merge tests no longer connect to takwarrior.org (thank to Jakub Wilk).
+- #1248 Merge tests no longer connect to taskwarrior.org (thank to Jakub Wilk).
 - #1249 Build system now recognizes GNU/Hurd and GNU/kFreeBSD (thanks to Jakub
   Wilk).
 - #1263 The 'waiting' report properly lists only pending tasks with a wait date

From fd45b7f93ffaf1546d86cb2987cf374f1269dfc5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:44 -0500
Subject: [PATCH 405/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b79df581b..4b6027f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -975,7 +975,7 @@ Features
 - Stop consider new tasks after quitting a bulk change.
 - Removed deprecated 'fg:' and 'bg:' attributes.
 - The 'diagnostics' command now reports libuuid details.
-- New characters for parsing and formating dates ('n', 's' and 'v').
+- New characters for parsing and formatting dates ('n', 's' and 'v').
 - Virtual tags (BLOCKED, UNBLOCKED, BLOCKING, DUE, DUETODAY, OVERDUE, TODAY,
   ACTIVE, SCHEDULED, CHILD, UNTIL, WAITING and ANNOTATED).
 - New 'modified' attribute, which contains the most recent modification date,

From 29ec7d6bf3f2818e6f08db9509d05afd5ab526d1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:52 -0500
Subject: [PATCH 406/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4b6027f58..91ba49ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1441,7 +1441,7 @@ Bugs
   Michelle Crane).
 - Fixed bug #823, so that recurring task change propagations are now always
   confirmed (thanks to Miguel de Val Borro).
-- Fixed bug #824, which caused probles when completing recurring tasks (thanks
+- Fixed bug #824, which caused problems when completing recurring tasks (thanks
   to Matt Kraai).
 - Fixed bug #831, which prevented some date fields from being properly parsed.
 - Fixed bug #835, which prevented hierarchical projects from being recognized.

From 6d1857c2538a90e13cc82318123f7e7134526d7e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Feb 2017 19:05:58 -0500
Subject: [PATCH 407/879] Docs: Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 91ba49ea1..0cfd3318f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1520,7 +1520,7 @@ Bugs
   (thanks to Michal Vyskocil).
 - Fixed problem where update-holidays.pl did not properly handle UTF8 JSON
   data.
-- Fixed problem where update-holidays.pl did not use the YYYYMMDD date foramt.
+- Fixed problem where update-holidays.pl did not use the YYYYMMDD date format.
 - Fixed problem where urgency was not properly calculated for waiting tasks.
 - Fixed problem where 'project' was not supported as a verbosity token (thanks
   to Adam Gibbins).

From 6641ca13a1aaa2c0676c5d4779374c371d6ef5e1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Feb 2017 09:52:41 -0500
Subject: [PATCH 408/879] DOM: Typo

---
 src/DOM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 4f9be1621..bcca43e9c 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -171,7 +171,7 @@ bool getDOM (const std::string& name, Variant& value)
 //   annotations.<N>.entry
 //   annotations.<N>.description
 //
-// This code emphasizes speed, hence 'id' and 'urgecny' being evaluated first
+// This code emphasizes speed, hence 'id' and 'urgency' being evaluated first
 // as special cases.
 bool getDOM (const std::string& name, const Task& task, Variant& value)
 {

From 3a69609ffd2a5cdb8a3b6598ddf483b9cb9cb59e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 19:21:24 -0500
Subject: [PATCH 409/879] DOM: New references: tw.syncneeded, tw.program,
 tw.args, tw.width, tw.height

- And deprecating context.program, context.args, context.width, context.height
---
 ChangeLog     |  1 +
 NEWS          |  6 ++++-
 src/DOM.cpp   | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---
 src/Lexer.cpp | 20 +++++++++++----
 4 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cfd3318f..56742f0e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,7 @@
 - Added 'history.weekly', 'history.daily', 'ghistory.weekly', 'ghistory.daily'
   report variations, with code refactoring.
           (thanks to Lukas Barth).
+- New DOM references: annotations.count, tw.syncneeded.
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index 19ffb9bbb..332a7593e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,8 @@ New Features in Taskwarrior 2.5.2
   - The 'help' command now takes a 'usage' argument, which displays only the
     command usage.
   - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
-  - New DOM reference: annotations.count.
+  - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
+    tw.width, tw.height.
   - Renovated 'timesheet' command with a more compact report that accepts a
     filter, and has a default filter showing the last four weeks of completed
     and started tasks.
@@ -33,6 +34,9 @@ Newly Deprecated Features in Taskwarrior 2.5.2
   - The use of alternate Boolean configuration settings is deprecated. Use values
     "0" for off, and "1" for on.  Avoid used of "on", "off", "true", "t",
     "false", "f", "yes", "y", "no", "n".
+  - The 'context.program', 'context.args', 'context.width' and 'context.height'
+    DOM references are deprecated, replaced by similarly-named 'tw.xxx'
+    references.
 
 Removed Features in 2.5.2
 
diff --git a/src/DOM.cpp b/src/DOM.cpp
index bcca43e9c..c4f1acd88 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -47,11 +47,18 @@ extern Context context;
 // Configuration:
 //   rc.<name>
 //
+// Taskwarrior:
+//   tw.syncneeded
+//   tw.program
+//   tw.args
+//   tw.width
+//   tw.height
+//
 // System:
-//   context.program
-//   context.args
-//   context.width
-//   context.height
+//   context.program         // 2017-02-25 Deprecated in 2.6.0
+//   context.args            // 2017-02-25 Deprecated in 2.6.0
+//   context.width           // 2017-02-25 Deprecated in 2.6.0
+//   context.height          // 2017-02-25 Deprecated in 2.6.0
 //   system.version
 //   system.os
 //
@@ -78,6 +85,61 @@ bool getDOM (const std::string& name, Variant& value)
     return false;
   }
 
+  // tw.*
+  if (len > 3 &&
+      ! name.compare (0, 3, "tw.", 3))
+  {
+    if (name == "tw.syncneeded")
+    {
+      value = Variant (false);
+      for (const auto& line : context.tdb2.backlog.get_lines ())
+      {
+        if (line[0] == '{')
+        {
+          value = Variant (true);
+          break;
+        }
+      }
+
+      return true;
+    }
+    else if (name == "tw.program")
+    {
+      value = Variant (context.cli2.getBinary ());
+      return true;
+    }
+    else if (name == "tw.args")
+    {
+      std::string commandLine;
+      for (auto& arg : context.cli2._original_args)
+      {
+        if (commandLine != "")
+           commandLine += ' ';
+
+        commandLine += arg.attribute("raw");
+      }
+
+      value = Variant (commandLine);
+      return true;
+    }
+    else if (name == "tw.width")
+    {
+      value = Variant (static_cast<int> (context.terminal_width
+                                           ? context.terminal_width
+                                           : context.getWidth ()));
+      return true;
+    }
+    else if (name == "tw.height")
+    {
+      value = Variant (static_cast<int> (context.terminal_height
+                                           ? context.terminal_height
+                                           : context.getHeight ()));
+      return true;
+    }
+    else
+      throw format (STRING_DOM_UNREC, name);
+  }
+
   // context.*
   if (len > 8 &&
       ! name.compare (0, 8, "context.", 8))
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 486229499..376f40fc7 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1132,10 +1132,15 @@ bool Lexer::isOperator (std::string& token, Lexer::Type& type)
 //   rc.<name>
 //
 // System:
-//   context.program
-//   context.args
-//   context.width
-//   context.height
+//   tw.syncneeded
+//   tw.program
+//   tw.args
+//   tw.width
+//   tw.height
+//   context.program      // 2017-02-25 Deprecated in 2.6.0
+//   context.args         // 2017-02-25 Deprecated in 2.6.0
+//   context.width        // 2017-02-25 Deprecated in 2.6.0
+//   context.height       // 2017-02-25 Deprecated in 2.6.0
 //   system.version
 //   system.os
 //
@@ -1179,7 +1184,12 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
   else
     _cursor = marker;
 
-  if (isOneOf ({"context.program",
+  if (isOneOf ({"tw.syncneeded",
+                "tw.program",
+                "tw.args",
+                "tw.width",
+                "tw.height",
+                "context.program",
                 "context.args",
                 "context.width",
                 "context.height",

From e458c17f4f41ca2fce57271841093bed9ba13c53 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 19:23:43 -0500
Subject: [PATCH 410/879] Tests: Added new DOM reference tests

---
 test/dom.t | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/test/dom.t b/test/dom.t
index ed084f4bd..00276381c 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -184,6 +184,30 @@ class TestDOM(TestCase):
         self.assertEqual(len(out) > 4, True)
         self.assertNotIn("<unknown>", out)
 
+    def test_dom_tw_program(self):
+        """ DOM tw.program """
+        code, out, err = self.t("_get tw.program")
+        self.assertEqual(code, 0)
+        self.assertIn("task", out)
+
+    def test_dom_tw_args(self):
+        """ DOM tw.args """
+        code, out, err = self.t("_get tw.args")
+        self.assertEqual(code, 0)
+        self.assertIn("task _get tw.args", out)
+
+    def test_dom_tw_width(self):
+        """ DOM tw.width """
+        code, out, err = self.t("_get tw.width")
+        self.assertEqual(code, 0)
+        self.assertRegexpMatches(out, r"\d+")
+
+    def test_dom_tw_height(self):
+        """ DOM tw.height """
+        code, out, err = self.t("_get tw.height")
+        self.assertEqual(code, 0)
+        self.assertRegexpMatches(out, r"\d+")
+
     def test_dom_context_program(self):
         """ DOM context.program """
         code, out, err = self.t("_get context.program")
@@ -249,6 +273,30 @@ class TestDOM(TestCase):
         code, out, err = self.t("_get 4.ticketdate.year")
         self.assertEqual("2015\n", out)
 
+class TestDOMSync(TestCase):
+    """
+    This class verifies that the 'tw.syncneeded' DOM reference properly
+    evaluates whether sync is needed based on data in backlog.data contents.
+    """
+
+    def setUp(self):
+        self.t = Task()
+
+    def test_dom_tw_syncneeded_false(self):
+        """ DOM tw.syncneeded --> false """
+        code, out, err = self.t("_get tw.syncneeded")
+        self.assertEqual(code, 0)
+        self.assertIn("false", out)
+        self.assertNotIn("true", out)
+
+    def test_dom_tw_syncneeded_true(self):
+        """ DOM tw.syncneeded --> true """
+        self.t("add foo")
+        code, out, err = self.t("_get tw.syncneeded")
+        self.assertEqual(code, 0)
+        self.assertNotIn("false", out)
+        self.assertIn("true", out)
+
 
 class TestDOMDirectReferencesOnAddition(TestCase):
     """

From 22105285811cf6372500d85474e799b1e53f296e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 19:23:54 -0500
Subject: [PATCH 411/879] Docs: Updated test platform list

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 332a7593e..a3706e3ce 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ Taskwarrior has been built and tested on the following configurations:
   * Debian
   * Arch
   * FreeBSD
+  * CentOS
 
 ---
 

From bc517cecf30fdeade514dea49718c0c31bd3c595 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 20:26:41 -0500
Subject: [PATCH 412/879] libshared: Updated to
 d009b1de631c576510841593c85b257e96371b40

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 6aa2b315c..d009b1de6 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 6aa2b315c476bac3fdb7bf2bc259af55eee89f83
+Subproject commit d009b1de631c576510841593c85b257e96371b40

From 3eff3d27045ae7e140cc4f3b4387416f5f0ad208 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 22:13:16 -0500
Subject: [PATCH 413/879] Config: Removed unused ::clear method

- This was used back when shadow file support needed to reset CLI parsing.
---
 src/Config.cpp | 6 ------
 src/Config.h   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 5fa2ab79c..bfecfb381 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -552,12 +552,6 @@ void Config::setDefaults ()
   parse (_defaults);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-void Config::clear ()
-{
-  std::map <std::string, std::string>::clear ();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Config::has (const std::string& key)
 {
diff --git a/src/Config.h b/src/Config.h
index 745493a8e..08507ec08 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -45,7 +45,6 @@ public:
   void createDefaultRC (const std::string&, const std::string&);
   void createDefaultData (const std::string&);
   void setDefaults ();
-  void clear ();
 
   bool        has        (const std::string&);
   std::string get        (const std::string&);

From e2271f9a03073787bfdf2815074559b2e52bb37c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Feb 2017 23:40:21 -0500
Subject: [PATCH 414/879] Docs: Updated man page for DOM ref changes

---
 doc/man/task.1.in | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 1196554a4..387d7bc77 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -633,11 +633,16 @@ Accesses and displays the DOM reference(s).  Used to extract individual values
 from tasks, or the system.  Supported DOM references are:
 
   rc.<name>
-  context.program
-  context.args
-  context.width
-  context.height
-  system.version
+  tw.syncneeded
+  tw.program
+  tw.args
+  tw.width
+  tw.height
+  context.program    (Deprecated in 2.6.0)
+  context.args       (Deprecated in 2.6.0)
+  context.width      (Deprecated in 2.6.0)
+  context.height     (Deprecated in 2.6.0)
+  system.versio
   system.os
   <id>.<attribute>
   <uuid>.<attribute>

From 00bbca275ce1f4468f60d0f697a80e1aa5017e5f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 10:22:39 -0500
Subject: [PATCH 415/879] Config: Separated configuration from defaults

---
 src/Config.cpp           | 416 +--------------------------------------
 src/Config.h             |   4 -
 src/Context.cpp          | 394 +++++++++++++++++++++++++++++++++++-
 src/commands/CmdShow.cpp |   3 +-
 test/view.t.cpp          |   3 +-
 5 files changed, 397 insertions(+), 423 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index bfecfb381..da33196b2 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -45,350 +45,6 @@
 #include <util.h>
 #include <i18n.h>
 
-////////////////////////////////////////////////////////////////////////////////
-// This string is used in two ways:
-// 1) It is used to create a new .taskrc file, by copying it directly to disk.
-// 2) It is parsed and used as default values for all Config.get calls.
-std::string Config::_defaults =
-  "# Taskwarrior program configuration file.\n"
-  "# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',\n"
-  "# 'man task-sync' or 'man taskrc'\n"
-  "\n"
-  "# Here is an example of entries that use the default, override and blank values\n"
-  "#   variable=foo   -- By specifying a value, this overrides the default\n"
-  "#   variable=      -- By specifying no value, this means no default\n"
-  "#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default\n"
-  "\n"
-  "# Use the command 'task show' to see all defaults and overrides\n"
-  "\n"
-  "# Files\n"
-  "data.location=~/.task\n"
-  "locking=1                                      # Use file-level locking\n"
-  "gc=1                                           # Garbage-collect data files - DO NOT CHANGE unless you are sure\n"
-  "exit.on.missing.db=0                           # Whether to exit if ~/.task is not found\n"
-  "hooks=1                                        # Master control switch for hooks\n"
-  "\n"
-  "# Terminal\n"
-  "detection=1                                    # Detects terminal width\n"
-  "defaultwidth=80                                # Without detection, assumed width\n"
-  "defaultheight=24                               # Without detection, assumed height\n"
-  "avoidlastcolumn=0                              # Fixes Cygwin width problem\n"
-  "hyphenate=1                                    # Hyphenates lines wrapped on non-word-breaks\n"
-  "#editor=vi                                     # Preferred text editor\n"
-  "reserved.lines=1                               # Assume a 1-line prompt\n"
-  "\n"
-  "# Miscellaneous\n"
-  "#                                              # Comma-separated list.  May contain any subset of:\n"
-  "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,recur\n"
-  "confirmation=1                                 # Confirmation on delete, big changes\n"
-  "recurrence=1                                   # Enable recurrence\n"
-  "recurrence.confirmation=prompt                 # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
-  "allow.empty.filter=1                           # An empty filter gets a warning and requires confirmation\n"
-  "indent.annotation=2                            # Indent spaces for annotations\n"
-  "indent.report=0                                # Indent spaces for whole report\n"
-  "row.padding=0                                  # Left and right padding for each row of report\n"
-  "column.padding=1                               # Spaces between each column in a report\n"
-  "bulk=3                                         # 3 or more tasks considered a bulk change and is confirmed\n"
-  "nag=You have more urgent tasks.                # Nag message to keep you honest\n"                      // TODO
-  "search.case.sensitive=1                        # Setting to no allows case insensitive searches\n"
-  "active.indicator=*                             # What to show as an active task indicator\n"
-  "tag.indicator=+                                # What to show as a tag indicator\n"
-  "dependency.indicator=D                         # What to show as a dependency indicator\n"
-  "recurrence.indicator=R                         # What to show as a task recurrence indicator\n"
-  "recurrence.limit=1                             # Number of future recurring pending tasks\n"
-  "undo.style=side                                # Undo style - can be 'side', or 'diff'\n"
-  "regex=1                                        # Assume all search/filter strings are regexes\n"
-  "xterm.title=0                                  # Sets xterm title for some commands\n"
-  "expressions=infix                              # Prefer infix over postfix expressions\n"
-  "json.array=1                                   # Enclose JSON output in [ ]\n"
-  "json.depends.array=0                           # Encode dependencies as a JSON array\n"
-  "abbreviation.minimum=2                         # Shortest allowed abbreviation\n"
-  "\n"
-  "# Dates\n"
-  "dateformat=Y-M-D                               # Preferred input and display date format\n"
-  "dateformat.holiday=YMD                         # Preferred input date format for holidays\n"
-  "dateformat.edit=Y-M-D H:N:S                    # Preferred display date format when editing\n"
-  "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"
-  "date.iso=1                                     # Enable ISO date support\n"
-  "weekstart="
-             STRING_DATE_SUNDAY
-                  "                               # Sunday or Monday only\n"
-  "displayweeknumber=1                            # Show week numbers on calendar\n"
-  "due=7                                          # Task is considered due in 7 days\n"
-  "\n"
-  "# Calendar controls\n"
-  "calendar.legend=1                              # Display the legend on calendar\n"
-  "calendar.details=sparse                        # Calendar shows information for tasks w/due dates: full, sparse or none\n"
-  "calendar.details.report=list                   # Report to use when showing task information in cal\n"
-  "calendar.offset=0                              # Apply an offset value to control the first month of the calendar\n"
-  "calendar.offset.value=-1                       # The number of months the first month of the calendar is moved\n"
-  "calendar.holidays=none                         # Show public holidays on calendar:full, sparse or none\n"
-  "#monthsperline=3                               # Number of calendar months on a line\n"
-  "\n"
-  "# Journal controls\n"
-  "journal.time=0                                 # Record start/stop commands as annotation\n"
-  "journal.time.start.annotation=Started task     # Annotation description for the start journal entry\n"
-  "journal.time.stop.annotation=Stopped task      # Annotation description for the stop  journal entry\n"
-  "journal.info=1                                 # Display task journal with info command\n"
-  "\n"
-  "# Dependency controls\n"
-  "dependency.reminder=1                          # Nags on dependency chain violations\n"
-  "dependency.confirmation=1                      # Should dependency chain repair be confirmed?\n"
-  "\n"
-  "# Urgency Coefficients\n"
-  "urgency.user.tag.next.coefficient=15.0         # Urgency coefficient for 'next' special tag\n"
-  "urgency.due.coefficient=12.0                   # Urgency coefficient for due dates\n"
-  "urgency.blocking.coefficient=8.0               # Urgency coefficient for blocking tasks\n"
-  "urgency.active.coefficient=4.0                 # Urgency coefficient for active tasks\n"
-  "urgency.scheduled.coefficient=5.0              # Urgency coefficient for scheduled tasks\n"
-  "urgency.age.coefficient=2.0                    # Urgency coefficient for age\n"
-  "urgency.annotations.coefficient=1.0            # Urgency coefficient for annotations\n"
-  "urgency.tags.coefficient=1.0                   # Urgency coefficient for tags\n"
-  "urgency.project.coefficient=1.0                # Urgency coefficient for projects\n"
-  "urgency.blocked.coefficient=-5.0               # Urgency coefficient for blocked tasks\n"
-  "urgency.waiting.coefficient=-3.0               # Urgency coefficient for waiting status\n"
-  "urgency.inherit=0                              # Recursively inherit highest urgency value from blocked tasks\n"
-  "urgency.age.max=365                            # Maximum age in days\n"
-  "\n"
-  "#urgency.user.project.foo.coefficient=5.0      # Urgency coefficients for 'foo' project\n"
-  "#urgency.user.tag.foo.coefficient=5.0          # Urgency coefficients for 'foo' tag\n"
-  "#urgency.uda.foo.coefficient=5.0               # Urgency coefficients for UDA 'foo'\n"
-  "\n"
-  "# Color controls.\n"
-  "color=1                                        # Enable color\n"
-  "\n"
-  "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
-  "\n"
-  "# General decoration\n"
-  "rule.color.merge=1\n"
-  "color.label=\n"
-  "color.label.sort=\n"
-  "color.alternate=on gray2\n"
-  "color.header=color3\n"
-  "color.footnote=color3\n"
-  "color.warning=bold red\n"
-  "color.error=white on red\n"
-  "color.debug=color4\n"
-  "\n"
-  "# Task state\n"
-  "color.completed=\n"
-  "color.deleted=\n"
-  "color.active=rgb555 on rgb410\n"
-  "color.recurring=rgb013\n"
-  "color.scheduled=on rgb001\n"
-  "color.until=\n"
-  "color.blocked=white on color8\n"
-  "color.blocking=black on color15\n"
-  "\n"
-  "# Project\n"
-  "color.project.none=\n"
-  "\n"
-  "# Priority UDA\n"
-  "color.uda.priority.H=color255\n"
-  "color.uda.priority.L=color245\n"
-  "color.uda.priority.M=color250\n"
-  "\n"
-  "# Tags\n"
-  "color.tag.next=rgb440\n"
-  "color.tag.none=\n"
-  "color.tagged=rgb031\n"
-  "\n"
-  "# Due\n"
-  "color.due.today=rgb400\n"
-  "color.due=color1\n"
-  "color.overdue=color9\n"
-  "\n"
-  "# Report: burndown\n"
-  "color.burndown.done=on rgb010\n"
-  "color.burndown.pending=on color9\n"
-  "color.burndown.started=on color11\n"
-  "\n"
-  "# Report: history\n"
-  "color.history.add=color0 on rgb500\n"
-  "color.history.delete=color0 on rgb550\n"
-  "color.history.done=color0 on rgb050\n"
-  "\n"
-  "# Report: summary\n"
-  "color.summary.background=white on color0\n"
-  "color.summary.bar=black on rgb141\n"
-  "\n"
-  "# Command: calendar\n"
-  "color.calendar.due.today=color15 on color1\n"
-  "color.calendar.due=color0 on color1\n"
-  "color.calendar.holiday=color0 on color11\n"
-  "color.calendar.overdue=color0 on color9\n"
-  "color.calendar.today=color15 on rgb013\n"
-  "color.calendar.weekend=on color235\n"
-  "color.calendar.weeknumber=rgb013\n"
-  "\n"
-  "# Command: sync\n"
-  "color.sync.added=rgb010\n"
-  "color.sync.changed=color11\n"
-  "color.sync.rejected=color9\n"
-  "\n"
-  "# Command: undo\n"
-  "color.undo.after=color2\n"
-  "color.undo.before=color1\n"
-  "\n"
-  "# UDA priority\n"
-  "uda.priority.type=string                       # UDA priority is a string type\n"
-  "uda.priority.label=Priority                    # UDA priority has a display label'\n"
-  "uda.priority.values=H,M,L,                     # UDA priority values are 'H', 'M', 'L' or ''\n"
-  "                                               # UDA priority sorting is 'H' > 'M' > 'L' > '' (highest to lowest)\n"
-  "#uda.priority.default=M                        # UDA priority default value of 'M'\n"
-  "urgency.uda.priority.H.coefficient=6.0         # UDA priority coefficient for value 'H'\n"
-  "urgency.uda.priority.M.coefficient=3.9         # UDA priority coefficient for value 'M'\n"
-  "urgency.uda.priority.L.coefficient=1.8         # UDA priority coefficient for value 'L'\n"
-  "\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=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
-  "\n"
-  "#default.project=foo                           # Default project for 'add' command\n"
-  "#default.due=eom                               # Default due date for 'add' command\n"
-  "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"
-  "default.command=next                           # When no arguments are specified\n"
-  "default.timesheet.filter=( +PENDING and start.after:now-4wks ) or ( +COMPLETED and end.after:now-4wks )\n"
-  "\n"
-  "_forcecolor=0                                  # Forces color to be on, even for non TTY output\n"
-  "complete.all.tags=0                            # Include old tag names in '_ags' command\n"
-  "list.all.projects=0                            # Include old project names in 'projects' command\n"
-  "summary.all.projects=0                         # Include old project names in 'summary' command\n"
-  "list.all.tags=0                                # Include old tag names in 'tags' command\n"
-  "print.empty.columns=0                          # Print columns which have no data for any task\n"
-  "debug=0                                        # Display diagnostics\n"
-  "debug.tls=0                                    # Sync diagnostics\n"
-  "sugar=1                                        # Syntactic sugar\n"
-  "obfuscate=0                                    # Obfuscate data for error reporting\n"
-  "fontunderline=1                                # Uses underlines rather than -------\n"
-  "\n"
-  "# WARNING: Please read the documentation (man task-sync) before setting up\n"
-  "#          Taskwarrior for Taskserver synchronization.\n"
-  "#taskd.ca=<certificate file>\n"
-  "#taskd.certificate=<certificate file>\n"
-  "#taskd.credentials=<organization>/<name>/<password>\n"
-  "#taskd.server=<server>:<port>\n"
-  "taskd.trust=strict\n"
-  "#taskd.trust=ignore hostname\n"
-  "#taskd.trust=allow all\n"
-  "taskd.ciphers=NORMAL\n"
-  "\n"
-  "# Aliases - alternate names for commands\n"
-  "alias.rm=delete                                # Alias for the delete command\n"
-  "alias.history=history.monthly                  # Prefer monthly over annual history reports\n"
-  "alias.ghistory=ghistory.monthly                # Prefer monthly graphical over annual history reports\n"
-  "alias.burndown=burndown.weekly                 # Prefer the weekly burndown chart\n"
-  "alias.shell=exec tasksh                        # Alias old shell command to new shell\n"
-  "\n"
-  "# Reports\n"
-  "\n"
-  "report.long.description=All details of tasks\n"
-  "report.long.labels=ID,A,Created,Mod,Deps,P,Project,Tags,Recur,Wait,Sched,Due,Until,Description\n"
-  "report.long.columns=id,start.active,entry,modified.age,depends,priority,project,tags,recur,wait.remaining,scheduled,due,until,description\n"
-  "report.long.filter=status:pending\n"
-  "report.long.sort=modified-\n"
-  "\n"
-  "report.list.description=Most details of tasks\n"
-  "report.list.labels=ID,Active,Age,D,P,Project,Tags,R,Sch,Due,Until,Description,Urg\n"
-  "report.list.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due,until.remaining,description.count,urgency\n"
-  "report.list.filter=status:pending\n"
-  "report.list.sort=start-,due+,project+,urgency-\n"
-  "\n"
-  "report.ls.description=Few details of tasks\n"
-  "report.ls.labels=ID,A,D,Project,Tags,R,Wait,S,Due,Until,Description\n"
-  "report.ls.columns=id,start.active,depends.indicator,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due.countdown,until.countdown,description.count\n"
-  "report.ls.filter=status:pending\n"
-  "report.ls.sort=start-,description+\n"
-  "\n"
-  "report.minimal.description=Minimal details of tasks\n"
-  "report.minimal.labels=ID,Project,Tags,Description\n"
-  "report.minimal.columns=id,project,tags.count,description.count\n"
-  "report.minimal.filter=status:pending or status:waiting\n"
-  "report.minimal.sort=project+/,description+\n"
-  "\n"
-  "report.newest.description=Newest tasks\n"
-  "report.newest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
-  "report.newest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n"
-  "report.newest.filter=status:pending or status:waiting\n"
-  "report.newest.sort=entry-\n"
-  "\n"
-  "report.oldest.description=Oldest tasks\n"
-  "report.oldest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
-  "report.oldest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n"
-  "report.oldest.filter=status:pending or status:waiting\n"
-  "report.oldest.sort=entry+\n"
-  "\n"
-  "report.overdue.description=Overdue tasks\n"
-  "report.overdue.labels=ID,Active,Age,Deps,P,Project,Tag,R,S,Due,Until,Description,Urg\n"
-  "report.overdue.columns=id,start.age,entry.age,depends,priority,project,tags,recur.indicator,scheduled.countdown,due,until,description,urgency\n"
-  "report.overdue.filter=(status:pending or status:waiting) and +OVERDUE\n"
-  "report.overdue.sort=urgency-,due+\n"
-  "\n"
-  "report.active.description=Active tasks\n"
-  "report.active.labels=ID,Started,Active,Age,D,P,Project,Tags,Recur,W,Sch,Due,Until,Description\n"
-  "report.active.columns=id,start,start.age,entry.age,depends.indicator,priority,project,tags,recur,wait,scheduled.remaining,due,until,description\n"
-  "report.active.filter=status:pending and +ACTIVE\n"
-  "report.active.sort=project+,start+\n"
-  "\n"
-  "report.completed.description=Completed tasks\n"
-  "report.completed.labels=ID,UUID,Created,Completed,Age,Deps,P,Project,Tags,R,Due,Description\n"
-  "report.completed.columns=id,uuid.short,entry,end,entry.age,depends,priority,project,tags,recur.indicator,due,description\n"
-  "report.completed.filter=status:completed\n"
-  "report.completed.sort=end+\n"
-  "\n"
-  "report.recurring.description=Recurring Tasks\n"
-  "report.recurring.labels=ID,Active,Age,D,P,Project,Tags,Recur,Sch,Due,Until,Description,Urg\n"
-  "report.recurring.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur,scheduled.countdown,due,until.remaining,description,urgency\n"
-  "report.recurring.filter=(status:pending or status:waiting) and (+PARENT or +CHILD)\n"
-  "report.recurring.sort=due+,urgency-,entry+\n"
-  "\n"
-  "report.waiting.description=Waiting (hidden) tasks\n"
-  "report.waiting.labels=ID,A,Age,D,P,Project,Tags,R,Wait,Remaining,Sched,Due,Until,Description\n"
-  "report.waiting.columns=id,start.active,entry.age,depends.indicator,priority,project,tags,recur.indicator,wait,wait.remaining,scheduled,due,until,description\n"
-  "report.waiting.filter=+WAITING\n"
-  "report.waiting.sort=due+,wait+,entry+\n"
-  "\n"
-  "report.all.description=All tasks\n"
-  "report.all.labels=ID,St,UUID,A,Age,Done,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
-  "report.all.columns=id,status.short,uuid.short,start.active,entry.age,end.age,depends.indicator,priority,project.parent,tags.count,recur.indicator,wait.remaining,scheduled.remaining,due,until.remaining,description\n"
-  "report.all.sort=entry-\n"
-  "\n"
-  "report.next.description=Most urgent tasks\n"
-  "report.next.labels=ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg\n"
-  "report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency\n"
-  "report.next.filter=status:pending limit:page\n"
-  "report.next.sort=urgency-\n"
-  "\n"
-  "report.ready.description=Most urgent actionable tasks\n"
-  "report.ready.labels=ID,Active,Age,D,P,Project,Tags,R,S,Due,Until,Description,Urg\n"
-  "report.ready.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due.countdown,until.remaining,description,urgency\n"
-  "report.ready.filter=+READY\n"
-  "report.ready.sort=start-,urgency-\n"
-  "\n"
-  "report.blocked.description=Blocked tasks\n"
-  "report.blocked.columns=id,depends,project,priority,due,start.active,entry.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=Unblocked tasks\n"
-  "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.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=Blocking tasks\n"
-  "report.blocking.labels=ID,UUID,A,Deps,Project,Tags,R,W,Sch,Due,Until,Description,Urg\n"
-  "report.blocking.columns=id,uuid.short,start.active,depends,project,tags,recur,wait,scheduled.remaining,due.relative,until.remaining,description.count,urgency\n"
-  "report.blocking.sort=urgency-,due+,entry+\n"
-  "report.blocking.filter=status:pending +BLOCKING\n"
-  "\n"
-  "report.timesheet.filter=(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)\n"
-  "\n";
-
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -419,12 +75,8 @@ void Config::load (const std::string& file, int nest /* = 1 */)
   if (nest > 10)
     throw std::string (STRING_CONFIG_OVERNEST);
 
-  // First time in, load the default values.
-  if (nest == 1)
-  {
-    setDefaults ();
-    _original_file = File (file);
-  }
+  // Capture the original name.
+  _original_file = File (file);
 
   // Read the file, then parse the contents.
   std::string contents;
@@ -488,70 +140,6 @@ void Config::parse (const std::string& input, int nest /* = 1 */)
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-void Config::createDefaultRC (const std::string& rc, const std::string& data)
-{
-  // Override data.location in the defaults.
-  auto loc = _defaults.find ("data.location=~/.task");
-  //                                      loc+0^          +14^   +21^
-
-  Datetime now;
-  std::stringstream contents;
-  contents << "# [Created by "
-           << PACKAGE_STRING
-           << ' '
-           << now.toString ("m/d/Y H:N:S")
-           << "]\n"
-           << _defaults.substr (0, loc + 14)
-           << data
-           << "\n\n# Color theme (uncomment one to use)\n"
-           << "#include " << TASK_RCDIR << "/light-16.theme\n"
-           << "#include " << TASK_RCDIR << "/light-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-16.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-red-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-green-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-blue-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-violets-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-yellow-green.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-gray-256.theme\n"
-           << "#include " << TASK_RCDIR << "/dark-gray-blue-256.theme\n"
-           << "#include " << TASK_RCDIR << "/solarized-dark-256.theme\n"
-           << "#include " << TASK_RCDIR << "/solarized-light-256.theme\n"
-           << "#include " << TASK_RCDIR << "/no-color.theme\n"
-           << '\n';
-
-  // Write out the new file.
-  if (! File::write (rc, contents.str ()))
-    throw format (STRING_CONFIG_BAD_WRITE, rc);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::createDefaultData (const std::string& data)
-{
-  Directory d (data);
-  if (! d.exists ())
-  {
-    if (getBoolean ("exit.on.missing.db"))
-      throw std::string ("Error: rc.data.location does not exist - exiting according to rc.exit.on.missing.db setting.");
-
-    d.create ();
-
-    if (has ("hooks.location"))
-      d = Directory (get ("hooks.location"));
-    else
-      d += "hooks";
-
-    d.create ();
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::setDefaults ()
-{
-  parse (_defaults);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Config::has (const std::string& key)
 {
diff --git a/src/Config.h b/src/Config.h
index 08507ec08..408e9c8c1 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -42,10 +42,6 @@ public:
   void load (const std::string&, int nest = 1);
   void parse (const std::string&, int nest = 1);
 
-  void createDefaultRC (const std::string&, const std::string&);
-  void createDefaultData (const std::string&);
-  void setDefaults ();
-
   bool        has        (const std::string&);
   std::string get        (const std::string&);
   int         getInteger (const std::string&);
diff --git a/src/Context.cpp b/src/Context.cpp
index 949195d34..893bfaa1c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -56,6 +56,348 @@
 #include <sys/termios.h>
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+// This string is parsed and used as default values for configuration.
+std::string configurationDefaults =
+  "# Taskwarrior program configuration file.\n"
+  "# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',\n"
+  "# 'man task-sync' or 'man taskrc'\n"
+  "\n"
+  "# Here is an example of entries that use the default, override and blank values\n"
+  "#   variable=foo   -- By specifying a value, this overrides the default\n"
+  "#   variable=      -- By specifying no value, this means no default\n"
+  "#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default\n"
+  "\n"
+  "# Use the command 'task show' to see all defaults and overrides\n"
+  "\n"
+  "# Files\n"
+  "data.location=~/.task\n"
+  "locking=1                                      # Use file-level locking\n"
+  "gc=1                                           # Garbage-collect data files - DO NOT CHANGE unless you are sure\n"
+  "exit.on.missing.db=0                           # Whether to exit if ~/.task is not found\n"
+  "hooks=1                                        # Master control switch for hooks\n"
+  "\n"
+  "# Terminal\n"
+  "detection=1                                    # Detects terminal width\n"
+  "defaultwidth=80                                # Without detection, assumed width\n"
+  "defaultheight=24                               # Without detection, assumed height\n"
+  "avoidlastcolumn=0                              # Fixes Cygwin width problem\n"
+  "hyphenate=1                                    # Hyphenates lines wrapped on non-word-breaks\n"
+  "#editor=vi                                     # Preferred text editor\n"
+  "reserved.lines=1                               # Assume a 1-line prompt\n"
+  "\n"
+  "# Miscellaneous\n"
+  "#                                              # Comma-separated list.  May contain any subset of:\n"
+  "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,recur\n"
+  "confirmation=1                                 # Confirmation on delete, big changes\n"
+  "recurrence=1                                   # Enable recurrence\n"
+  "recurrence.confirmation=prompt                 # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
+  "allow.empty.filter=1                           # An empty filter gets a warning and requires confirmation\n"
+  "indent.annotation=2                            # Indent spaces for annotations\n"
+  "indent.report=0                                # Indent spaces for whole report\n"
+  "row.padding=0                                  # Left and right padding for each row of report\n"
+  "column.padding=1                               # Spaces between each column in a report\n"
+  "bulk=3                                         # 3 or more tasks considered a bulk change and is confirmed\n"
+  "nag=You have more urgent tasks.                # Nag message to keep you honest\n"                      // TODO
+  "search.case.sensitive=1                        # Setting to no allows case insensitive searches\n"
+  "active.indicator=*                             # What to show as an active task indicator\n"
+  "tag.indicator=+                                # What to show as a tag indicator\n"
+  "dependency.indicator=D                         # What to show as a dependency indicator\n"
+  "recurrence.indicator=R                         # What to show as a task recurrence indicator\n"
+  "recurrence.limit=1                             # Number of future recurring pending tasks\n"
+  "undo.style=side                                # Undo style - can be 'side', or 'diff'\n"
+  "regex=1                                        # Assume all search/filter strings are regexes\n"
+  "xterm.title=0                                  # Sets xterm title for some commands\n"
+  "expressions=infix                              # Prefer infix over postfix expressions\n"
+  "json.array=1                                   # Enclose JSON output in [ ]\n"
+  "json.depends.array=0                           # Encode dependencies as a JSON array\n"
+  "abbreviation.minimum=2                         # Shortest allowed abbreviation\n"
+  "\n"
+  "# Dates\n"
+  "dateformat=Y-M-D                               # Preferred input and display date format\n"
+  "dateformat.holiday=YMD                         # Preferred input date format for holidays\n"
+  "dateformat.edit=Y-M-D H:N:S                    # Preferred display date format when editing\n"
+  "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"
+  "date.iso=1                                     # Enable ISO date support\n"
+  "weekstart="
+             STRING_DATE_SUNDAY
+                  "                               # Sunday or Monday only\n"
+  "displayweeknumber=1                            # Show week numbers on calendar\n"
+  "due=7                                          # Task is considered due in 7 days\n"
+  "\n"
+  "# Calendar controls\n"
+  "calendar.legend=1                              # Display the legend on calendar\n"
+  "calendar.details=sparse                        # Calendar shows information for tasks w/due dates: full, sparse or none\n"
+  "calendar.details.report=list                   # Report to use when showing task information in cal\n"
+  "calendar.offset=0                              # Apply an offset value to control the first month of the calendar\n"
+  "calendar.offset.value=-1                       # The number of months the first month of the calendar is moved\n"
+  "calendar.holidays=none                         # Show public holidays on calendar:full, sparse or none\n"
+  "#monthsperline=3                               # Number of calendar months on a line\n"
+  "\n"
+  "# Journal controls\n"
+  "journal.time=0                                 # Record start/stop commands as annotation\n"
+  "journal.time.start.annotation=Started task     # Annotation description for the start journal entry\n"
+  "journal.time.stop.annotation=Stopped task      # Annotation description for the stop  journal entry\n"
+  "journal.info=1                                 # Display task journal with info command\n"
+  "\n"
+  "# Dependency controls\n"
+  "dependency.reminder=1                          # Nags on dependency chain violations\n"
+  "dependency.confirmation=1                      # Should dependency chain repair be confirmed?\n"
+  "\n"
+  "# Urgency Coefficients\n"
+  "urgency.user.tag.next.coefficient=15.0         # Urgency coefficient for 'next' special tag\n"
+  "urgency.due.coefficient=12.0                   # Urgency coefficient for due dates\n"
+  "urgency.blocking.coefficient=8.0               # Urgency coefficient for blocking tasks\n"
+  "urgency.active.coefficient=4.0                 # Urgency coefficient for active tasks\n"
+  "urgency.scheduled.coefficient=5.0              # Urgency coefficient for scheduled tasks\n"
+  "urgency.age.coefficient=2.0                    # Urgency coefficient for age\n"
+  "urgency.annotations.coefficient=1.0            # Urgency coefficient for annotations\n"
+  "urgency.tags.coefficient=1.0                   # Urgency coefficient for tags\n"
+  "urgency.project.coefficient=1.0                # Urgency coefficient for projects\n"
+  "urgency.blocked.coefficient=-5.0               # Urgency coefficient for blocked tasks\n"
+  "urgency.waiting.coefficient=-3.0               # Urgency coefficient for waiting status\n"
+  "urgency.inherit=0                              # Recursively inherit highest urgency value from blocked tasks\n"
+  "urgency.age.max=365                            # Maximum age in days\n"
+  "\n"
+  "#urgency.user.project.foo.coefficient=5.0      # Urgency coefficients for 'foo' project\n"
+  "#urgency.user.tag.foo.coefficient=5.0          # Urgency coefficients for 'foo' tag\n"
+  "#urgency.uda.foo.coefficient=5.0               # Urgency coefficients for UDA 'foo'\n"
+  "\n"
+  "# Color controls.\n"
+  "color=1                                        # Enable color\n"
+  "\n"
+  "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
+  "\n"
+  "# General decoration\n"
+  "rule.color.merge=1\n"
+  "color.label=\n"
+  "color.label.sort=\n"
+  "color.alternate=on gray2\n"
+  "color.header=color3\n"
+  "color.footnote=color3\n"
+  "color.warning=bold red\n"
+  "color.error=white on red\n"
+  "color.debug=color4\n"
+  "\n"
+  "# Task state\n"
+  "color.completed=\n"
+  "color.deleted=\n"
+  "color.active=rgb555 on rgb410\n"
+  "color.recurring=rgb013\n"
+  "color.scheduled=on rgb001\n"
+  "color.until=\n"
+  "color.blocked=white on color8\n"
+  "color.blocking=black on color15\n"
+  "\n"
+  "# Project\n"
+  "color.project.none=\n"
+  "\n"
+  "# Priority UDA\n"
+  "color.uda.priority.H=color255\n"
+  "color.uda.priority.L=color245\n"
+  "color.uda.priority.M=color250\n"
+  "\n"
+  "# Tags\n"
+  "color.tag.next=rgb440\n"
+  "color.tag.none=\n"
+  "color.tagged=rgb031\n"
+  "\n"
+  "# Due\n"
+  "color.due.today=rgb400\n"
+  "color.due=color1\n"
+  "color.overdue=color9\n"
+  "\n"
+  "# Report: burndown\n"
+  "color.burndown.done=on rgb010\n"
+  "color.burndown.pending=on color9\n"
+  "color.burndown.started=on color11\n"
+  "\n"
+  "# Report: history\n"
+  "color.history.add=color0 on rgb500\n"
+  "color.history.delete=color0 on rgb550\n"
+  "color.history.done=color0 on rgb050\n"
+  "\n"
+  "# Report: summary\n"
+  "color.summary.background=white on color0\n"
+  "color.summary.bar=black on rgb141\n"
+  "\n"
+  "# Command: calendar\n"
+  "color.calendar.due.today=color15 on color1\n"
+  "color.calendar.due=color0 on color1\n"
+  "color.calendar.holiday=color0 on color11\n"
+  "color.calendar.overdue=color0 on color9\n"
+  "color.calendar.today=color15 on rgb013\n"
+  "color.calendar.weekend=on color235\n"
+  "color.calendar.weeknumber=rgb013\n"
+  "\n"
+  "# Command: sync\n"
+  "color.sync.added=rgb010\n"
+  "color.sync.changed=color11\n"
+  "color.sync.rejected=color9\n"
+  "\n"
+  "# Command: undo\n"
+  "color.undo.after=color2\n"
+  "color.undo.before=color1\n"
+  "\n"
+  "# UDA priority\n"
+  "uda.priority.type=string                       # UDA priority is a string type\n"
+  "uda.priority.label=Priority                    # UDA priority has a display label'\n"
+  "uda.priority.values=H,M,L,                     # UDA priority values are 'H', 'M', 'L' or ''\n"
+  "                                               # UDA priority sorting is 'H' > 'M' > 'L' > '' (highest to lowest)\n"
+  "#uda.priority.default=M                        # UDA priority default value of 'M'\n"
+  "urgency.uda.priority.H.coefficient=6.0         # UDA priority coefficient for value 'H'\n"
+  "urgency.uda.priority.M.coefficient=3.9         # UDA priority coefficient for value 'M'\n"
+  "urgency.uda.priority.L.coefficient=1.8         # UDA priority coefficient for value 'L'\n"
+  "\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=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
+  "\n"
+  "#default.project=foo                           # Default project for 'add' command\n"
+  "#default.due=eom                               # Default due date for 'add' command\n"
+  "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"
+  "default.command=next                           # When no arguments are specified\n"
+  "default.timesheet.filter=( +PENDING and start.after:now-4wks ) or ( +COMPLETED and end.after:now-4wks )\n"
+  "\n"
+  "_forcecolor=0                                  # Forces color to be on, even for non TTY output\n"
+  "complete.all.tags=0                            # Include old tag names in '_ags' command\n"
+  "list.all.projects=0                            # Include old project names in 'projects' command\n"
+  "summary.all.projects=0                         # Include old project names in 'summary' command\n"
+  "list.all.tags=0                                # Include old tag names in 'tags' command\n"
+  "print.empty.columns=0                          # Print columns which have no data for any task\n"
+  "debug=0                                        # Display diagnostics\n"
+  "debug.tls=0                                    # Sync diagnostics\n"
+  "sugar=1                                        # Syntactic sugar\n"
+  "obfuscate=0                                    # Obfuscate data for error reporting\n"
+  "fontunderline=1                                # Uses underlines rather than -------\n"
+  "\n"
+  "# WARNING: Please read the documentation (man task-sync) before setting up\n"
+  "#          Taskwarrior for Taskserver synchronization.\n"
+  "#taskd.ca=<certificate file>\n"
+  "#taskd.certificate=<certificate file>\n"
+  "#taskd.credentials=<organization>/<name>/<password>\n"
+  "#taskd.server=<server>:<port>\n"
+  "taskd.trust=strict\n"
+  "#taskd.trust=ignore hostname\n"
+  "#taskd.trust=allow all\n"
+  "taskd.ciphers=NORMAL\n"
+  "\n"
+  "# Aliases - alternate names for commands\n"
+  "alias.rm=delete                                # Alias for the delete command\n"
+  "alias.history=history.monthly                  # Prefer monthly over annual history reports\n"
+  "alias.ghistory=ghistory.monthly                # Prefer monthly graphical over annual history reports\n"
+  "alias.burndown=burndown.weekly                 # Prefer the weekly burndown chart\n"
+  "alias.shell=exec tasksh                        # Alias old shell command to new shell\n"
+  "\n"
+  "# Reports\n"
+  "\n"
+  "report.long.description=All details of tasks\n"
+  "report.long.labels=ID,A,Created,Mod,Deps,P,Project,Tags,Recur,Wait,Sched,Due,Until,Description\n"
+  "report.long.columns=id,start.active,entry,modified.age,depends,priority,project,tags,recur,wait.remaining,scheduled,due,until,description\n"
+  "report.long.filter=status:pending\n"
+  "report.long.sort=modified-\n"
+  "\n"
+  "report.list.description=Most details of tasks\n"
+  "report.list.labels=ID,Active,Age,D,P,Project,Tags,R,Sch,Due,Until,Description,Urg\n"
+  "report.list.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due,until.remaining,description.count,urgency\n"
+  "report.list.filter=status:pending\n"
+  "report.list.sort=start-,due+,project+,urgency-\n"
+  "\n"
+  "report.ls.description=Few details of tasks\n"
+  "report.ls.labels=ID,A,D,Project,Tags,R,Wait,S,Due,Until,Description\n"
+  "report.ls.columns=id,start.active,depends.indicator,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due.countdown,until.countdown,description.count\n"
+  "report.ls.filter=status:pending\n"
+  "report.ls.sort=start-,description+\n"
+  "\n"
+  "report.minimal.description=Minimal details of tasks\n"
+  "report.minimal.labels=ID,Project,Tags,Description\n"
+  "report.minimal.columns=id,project,tags.count,description.count\n"
+  "report.minimal.filter=status:pending or status:waiting\n"
+  "report.minimal.sort=project+/,description+\n"
+  "\n"
+  "report.newest.description=Newest tasks\n"
+  "report.newest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
+  "report.newest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n"
+  "report.newest.filter=status:pending or status:waiting\n"
+  "report.newest.sort=entry-\n"
+  "\n"
+  "report.oldest.description=Oldest tasks\n"
+  "report.oldest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
+  "report.oldest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n"
+  "report.oldest.filter=status:pending or status:waiting\n"
+  "report.oldest.sort=entry+\n"
+  "\n"
+  "report.overdue.description=Overdue tasks\n"
+  "report.overdue.labels=ID,Active,Age,Deps,P,Project,Tag,R,S,Due,Until,Description,Urg\n"
+  "report.overdue.columns=id,start.age,entry.age,depends,priority,project,tags,recur.indicator,scheduled.countdown,due,until,description,urgency\n"
+  "report.overdue.filter=(status:pending or status:waiting) and +OVERDUE\n"
+  "report.overdue.sort=urgency-,due+\n"
+  "\n"
+  "report.active.description=Active tasks\n"
+  "report.active.labels=ID,Started,Active,Age,D,P,Project,Tags,Recur,W,Sch,Due,Until,Description\n"
+  "report.active.columns=id,start,start.age,entry.age,depends.indicator,priority,project,tags,recur,wait,scheduled.remaining,due,until,description\n"
+  "report.active.filter=status:pending and +ACTIVE\n"
+  "report.active.sort=project+,start+\n"
+  "\n"
+  "report.completed.description=Completed tasks\n"
+  "report.completed.labels=ID,UUID,Created,Completed,Age,Deps,P,Project,Tags,R,Due,Description\n"
+  "report.completed.columns=id,uuid.short,entry,end,entry.age,depends,priority,project,tags,recur.indicator,due,description\n"
+  "report.completed.filter=status:completed\n"
+  "report.completed.sort=end+\n"
+  "\n"
+  "report.recurring.description=Recurring Tasks\n"
+  "report.recurring.labels=ID,Active,Age,D,P,Project,Tags,Recur,Sch,Due,Until,Description,Urg\n"
+  "report.recurring.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur,scheduled.countdown,due,until.remaining,description,urgency\n"
+  "report.recurring.filter=(status:pending or status:waiting) and (+PARENT or +CHILD)\n"
+  "report.recurring.sort=due+,urgency-,entry+\n"
+  "\n"
+  "report.waiting.description=Waiting (hidden) tasks\n"
+  "report.waiting.labels=ID,A,Age,D,P,Project,Tags,R,Wait,Remaining,Sched,Due,Until,Description\n"
+  "report.waiting.columns=id,start.active,entry.age,depends.indicator,priority,project,tags,recur.indicator,wait,wait.remaining,scheduled,due,until,description\n"
+  "report.waiting.filter=+WAITING\n"
+  "report.waiting.sort=due+,wait+,entry+\n"
+  "\n"
+  "report.all.description=All tasks\n"
+  "report.all.labels=ID,St,UUID,A,Age,Done,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n"
+  "report.all.columns=id,status.short,uuid.short,start.active,entry.age,end.age,depends.indicator,priority,project.parent,tags.count,recur.indicator,wait.remaining,scheduled.remaining,due,until.remaining,description\n"
+  "report.all.sort=entry-\n"
+  "\n"
+  "report.next.description=Most urgent tasks\n"
+  "report.next.labels=ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg\n"
+  "report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency\n"
+  "report.next.filter=status:pending limit:page\n"
+  "report.next.sort=urgency-\n"
+  "\n"
+  "report.ready.description=Most urgent actionable tasks\n"
+  "report.ready.labels=ID,Active,Age,D,P,Project,Tags,R,S,Due,Until,Description,Urg\n"
+  "report.ready.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due.countdown,until.remaining,description,urgency\n"
+  "report.ready.filter=+READY\n"
+  "report.ready.sort=start-,urgency-\n"
+  "\n"
+  "report.blocked.description=Blocked tasks\n"
+  "report.blocked.columns=id,depends,project,priority,due,start.active,entry.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=Unblocked tasks\n"
+  "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.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=Blocking tasks\n"
+  "report.blocking.labels=ID,UUID,A,Deps,Project,Tags,R,W,Sch,Due,Until,Description,Urg\n"
+  "report.blocking.columns=id,uuid.short,start.active,depends,project,tags,recur,wait,scheduled.remaining,due.relative,until.remaining,description.count,urgency\n"
+  "report.blocking.sort=urgency-,due+,entry+\n"
+  "report.blocking.filter=status:pending +BLOCKING\n"
+  "\n"
+  "report.timesheet.filter=(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)\n"
+  "\n";
+
 // Supported modifiers, synonyms on the same line.
 static const char* modifierNames[] =
 {
@@ -113,7 +455,7 @@ int Context::initialize (int argc, const char** argv)
       header (format (STRING_CONTEXT_RC_OVERRIDE, rc_file._data));
     }
 
-    config.clear ();
+    config.parse (configurationDefaults);
     config.load (rc_file);
     CLI2::applyOverrides (argc, argv);
 
@@ -747,11 +1089,57 @@ 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._original);
+    // Override data.location in the defaults.
+    auto loc = configurationDefaults.find ("data.location=~/.task");
+    //                                 loc+0^          +14^   +21^
+
+    Datetime now;
+    std::stringstream contents;
+    contents << "# [Created by "
+             << PACKAGE_STRING
+             << ' '
+             << now.toString ("m/d/Y H:N:S")
+             << "]\n"
+             << configurationDefaults.substr (0, loc + 14)
+             << data_dir._original
+             << "\n\n# Color theme (uncomment one to use)\n"
+             << "#include " << TASK_RCDIR << "/light-16.theme\n"
+             << "#include " << TASK_RCDIR << "/light-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-16.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-red-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-green-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-blue-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-violets-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-yellow-green.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-gray-256.theme\n"
+             << "#include " << TASK_RCDIR << "/dark-gray-blue-256.theme\n"
+             << "#include " << TASK_RCDIR << "/solarized-dark-256.theme\n"
+             << "#include " << TASK_RCDIR << "/solarized-light-256.theme\n"
+             << "#include " << TASK_RCDIR << "/no-color.theme\n"
+             << '\n';
+
+    // Write out the new file.
+    if (! File::write (rc_file._data, contents.str ()))
+      throw format (STRING_CONFIG_BAD_WRITE, rc_file._data);
   }
 
   // Create data location, if necessary.
-  config.createDefaultData (data_dir);
+  Directory d (data_dir);
+  if (! d.exists ())
+  {
+    if (config.getBoolean ("exit.on.missing.db"))
+      throw std::string ("Error: rc.data.location does not exist - exiting according to rc.exit.on.missing.db setting.");
+
+    d.create ();
+
+    if (config.has ("hooks.location"))
+      d = Directory (config.get ("hooks.location"));
+    else
+      d += "hooks";
+
+    d.create ();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 9a286be5b..bb61d67bd 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -37,6 +37,7 @@
 #include <Table.h>
 
 extern Context context;
+extern std::string configurationDefaults;
 
 ////////////////////////////////////////////////////////////////////////////////
 CmdShow::CmdShow ()
@@ -253,7 +254,7 @@ int CmdShow::execute (std::string& output)
   // Find all the values that match the defaults, for highlighting.
   std::vector <std::string> default_values;
   Config default_config;
-  default_config.setDefaults ();
+  default_config.parse (configurationDefaults);
 
   for (auto& i : context.config)
     if (i.second != default_config.get (i.first))
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 7dcb11300..d3b66a874 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -37,6 +37,7 @@
 #include <main.h>
 
 Context context;
+extern std::string configurationDefaults;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
@@ -50,7 +51,7 @@ int main (int, char**)
   try
   {
     // Set up configuration.
-    context.config.setDefaults ();
+    context.config.parse (configurationDefaults);
     context.config.set ("fontunderline", true);
     context.config.set ("tag.indicator", "+");
     context.config.set ("dependency.indicator", "D");

From b57a7346254821091102733f01c4737f30254461 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 10:46:51 -0500
Subject: [PATCH 416/879] Config: Migrated to libshared Configuration

---
 src/CMakeLists.txt              |   2 +-
 src/Context.cpp                 |   4 +-
 src/Context.h                   |   4 +-
 src/commands/CmdConfig.cpp      |  13 ++---
 src/commands/CmdDiagnostics.cpp |   9 +--
 src/commands/CmdShow.cpp        |   9 +--
 test/.gitignore                 |   1 -
 test/CMakeLists.txt             |   2 +-
 test/config.t.cpp               | 100 --------------------------------
 9 files changed, 19 insertions(+), 125 deletions(-)
 delete mode 100644 test/config.t.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed953a7d2..6a70d4d90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 add_library (task CLI2.cpp CLI2.h
-                  Config.cpp Config.h
                   Context.cpp Context.h
                   DOM.cpp DOM.h
                   Dates.cpp Dates.h
@@ -32,6 +31,7 @@ add_library (task CLI2.cpp CLI2.h
                   util.cpp util.h)
 
 add_library (libshared libshared/src/Color.cpp         libshared/src/Color.h
+                       libshared/src/Configuration.cpp libshared/src/Configuration.h
                        libshared/src/Datetime.cpp      libshared/src/Datetime.h
                        libshared/src/Duration.cpp      libshared/src/Duration.h
                        libshared/src/FS.cpp            libshared/src/FS.h
diff --git a/src/Context.cpp b/src/Context.cpp
index 893bfaa1c..b45ab2145 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1071,9 +1071,7 @@ void Context::staticInitialization ()
   Task::urgencyAgeMax                 = config.getReal ("urgency.age.max");
 
   // Tag- and project-specific coefficients.
-  std::vector <std::string> all;
-  config.all (all);
-  for (auto& var : all)
+  for (auto& var : config.all ())
     if (var.substr (0, 13) == "urgency.user." ||
         var.substr (0, 12) == "urgency.uda.")
       Task::coefficients[var] = config.getReal (var);
diff --git a/src/Context.h b/src/Context.h
index 64257d661..670481bf4 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -29,7 +29,7 @@
 
 #include <Command.h>
 #include <Column.h>
-#include <Config.h>
+#include <Configuration.h>
 #include <Task.h>
 #include <TDB2.h>
 #include <Hooks.h>
@@ -81,7 +81,7 @@ public:
   std::string                         home_dir            {};
   File                                rc_file             {"~/.taskrc"};
   Path                                data_dir            {"~/.task"};
-  Config                              config              {};
+  Configuration                       config              {};
   TDB2                                tdb2                {};
   Hooks                               hooks               {};
   bool                                determine_color_use {true};
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 0ccdc1529..b0c83836d 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -60,7 +60,7 @@ bool CmdConfig::setConfigVariable (
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
-  File::read (context.config._original_file, contents);
+  File::read (context.config.file (), contents);
 
   auto found = false;
   auto change = false;
@@ -99,7 +99,7 @@ bool CmdConfig::setConfigVariable (
   }
 
   if (change)
-    File::write (context.config._original_file, contents);
+    File::write (context.config.file (), contents);
 
   return change;
 }
@@ -109,7 +109,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
-  File::read (context.config._original_file, contents);
+  File::read (context.config.file (), contents);
 
   auto found = false;
   auto change = false;
@@ -144,7 +144,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
   }
 
   if (change)
-    File::write (context.config._original_file, contents);
+    File::write (context.config.file (), contents);
 
   if (change && found)
     return 0;
@@ -216,7 +216,7 @@ int CmdConfig::execute (std::string& output)
       if (change)
       {
         out << format (STRING_CMD_CONFIG_FILE_MOD,
-                       context.config._original_file._data)
+                       context.config.file ())
             << '\n';
       }
       else
@@ -252,8 +252,7 @@ CmdCompletionConfig::CmdCompletionConfig ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionConfig::execute (std::string& output)
 {
-  std::vector <std::string> configs;
-  context.config.all (configs);
+  auto configs = context.config.all ();
   std::sort (configs.begin (), configs.end ());
 
   for (const auto& config : configs)
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 3950c6429..27e93cdb3 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -163,16 +163,17 @@ int CmdDiagnostics::execute (std::string& output)
       << "\n\n";
 
   // Config: .taskrc found, readable, writable
+  File rcFile (context.config.file ());
   out << bold.colorize (STRING_CMD_DIAG_CONFIG)
       << '\n'
-      << "       File: " << context.config._original_file._data << ' '
-      << (context.config._original_file.exists ()
+      << "       File: " << rcFile._data << ' '
+      << (rcFile.exists ()
            ? STRING_CMD_DIAG_FOUND
            : STRING_CMD_DIAG_MISSING)
-      << ", " << context.config._original_file.size () << ' ' << "bytes"
+      << ", " << rcFile.size () << ' ' << "bytes"
       << ", mode "
       << std::setbase (8)
-      << context.config._original_file.mode ()
+      << rcFile.mode ()
       << '\n';
 
   // Config: data.location found, readable, writable
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index bb61d67bd..55212224a 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -253,7 +253,7 @@ int CmdShow::execute (std::string& output)
 
   // Find all the values that match the defaults, for highlighting.
   std::vector <std::string> default_values;
-  Config default_config;
+  Configuration default_config;
   default_config.parse (configurationDefaults);
 
   for (auto& i : context.config)
@@ -411,11 +411,8 @@ CmdShowRaw::CmdShowRaw ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdShowRaw::execute (std::string& output)
 {
-  // Get all the settings.
-  std::vector <std::string> all;
-  context.config.all (all);
-
-  // Sort alphabetically by name.
+  // Get all the settings and sort alphabetically by name.
+  auto all = context.config.all ();
   std::sort (all.begin (), all.end ());
 
   // Display them all.
diff --git a/test/.gitignore b/test/.gitignore
index b4d38ccdd..70082a941 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,7 +4,6 @@
 *.log
 *.runlog
 col.t
-config.t
 dates.t
 eval.t
 iso8601d.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e9bd0b7cd..2de4e7697 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t config.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/config.t.cpp b/test/config.t.cpp
deleted file mode 100644
index a3a7d74f9..000000000
--- a/test/config.t.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <Context.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (11);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  Config c;
-
-  // void set (const std::string&, const std::string&);
-  // const std::string get (const std::string&);
-  c.set ("str1", "one");
-  t.is (c.get ("str1"), "one", "Config::set/get std::string");
-
-  c.set ("str1", "");
-  t.is (c.get ("str1"), "", "Config::set/get std::string");
-
-  // void set (const std::string&, const int);
-  // const int getInteger (const std::string&);
-  c.set ("int1", 1);
-  t.is (c.getInteger ("int1"), 1, "Config::set/get int");
-
-  c.set ("int2", 3);
-  t.is (c.getInteger ("int2"), 3, "Config::set/get int");
-
-  c.set ("int3", -9);
-  t.is (c.getInteger ("int3"), -9, "Config::set/get int");
-
-  // void set (const std::string&, const double);
-  // const double getReal (const std::string&);
-  c.set ("double1", 1.0);
-  t.is (c.getReal ("double1"), 1.0, "Config::set/get double");
-
-  c.set ("double2", 3.0);
-  t.is (c.getReal ("double2"), 3.0, "Config::set/get double");
-
-  c.set ("double3", -9.0);
-  t.is (c.getReal ("double3"), -9.0, "Config::set/get double");
-
-  // void set (const std::string&, const bool);
-  // const bool getBoolean (const std::string&);
-  c.set ("bool1", false);
-  t.is (c.getBoolean ("bool1"), false, "Config::set/get bool");
-
-  c.set ("bool1", true);
-  t.is (c.getBoolean ("bool1"), true, "Config::set/get bool");
-
-  // void all (std::vector <std::string>&);
-  std::vector <std::string> all;
-  c.all (all);
-
-  // 8 created in this test program.
-  // 22 default report setting created in Config::Config.
-  t.ok (all.size () >= 8, "Config::all");
-
-  // TODO Test includes
-  // TODO Test included nesting limit
-  // TODO Test included absolute vs relative
-  // TODO Test included missing file
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 1751bbaea6acf725ad23014130aa1f1b1fe0cd48 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 10:47:17 -0500
Subject: [PATCH 417/879] Context: Added local config load timing

---
 src/Context.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index b45ab2145..54db88b8d 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -455,8 +455,14 @@ int Context::initialize (int argc, const char** argv)
       header (format (STRING_CONTEXT_RC_OVERRIDE, rc_file._data));
     }
 
-    config.parse (configurationDefaults);
-    config.load (rc_file);
+    // Artificial scope for timing purposes.
+    {
+      Timer timer;
+      config.parse (configurationDefaults);
+      config.load (rc_file._data);
+      debugTiming (format ("Config::load ({1})", rc_file._data), timer);
+    }
+
     CLI2::applyOverrides (argc, argv);
 
     ////////////////////////////////////////////////////////////////////////////

From f28b68661df95b27f23fd0222faacaea0b66d0a3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 11:08:15 -0500
Subject: [PATCH 418/879] Docs: Removed references to $TERM, which is
 irrelevant anyway

---
 doc/man/task-color.5.in         | 19 +++----------------
 src/commands/CmdDiagnostics.cpp |  9 +++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 25c96de51..d52b8bce9 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -4,22 +4,9 @@
 task-color \- A color tutorial for the Taskwarrior command line todo manager.
 
 .SH SETUP
-The first thing you need is a terminal program that supports color.  All
-terminal programs support color, but only a few support lots of colors.  First
-tell your terminal program to use color by specifying the TERM environment
-variable like this:
-
-    TERM=xterm-color
-
-In this example, xterm-color is used - a common value, and one that doesn't
-require that you use xterm.  This works for most setups.  This setting belongs
-in your shell profile (~/.bash_profile, ~/.bashrc, ~/.cshrc etc, depending on
-which shell you use).  If this is a new setting, you will need to either run
-that profile script, or close and reopen the terminal window (which does the
-same thing).
-
-Now tell Taskwarrior that you want to use color.  This is the default for
-Taskwarrior, so the following step may be unnecessary.
+The first thing you need is make sure you tell Taskwarrior that you want to use
+color.  This is the default for Taskwarrior, so the following step may be
+unnecessary.
 
     $ task config color on
 
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 27e93cdb3..bcc0f431e 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -398,15 +398,12 @@ int CmdDiagnostics::execute (std::string& output)
   out << bold.colorize (STRING_CMD_DIAG_TESTS)
       << '\n';
 
-  // Determine terminal details.
-  const char* term = getenv ("TERM");
-  out << "      $TERM: "
-      << (term ? term : STRING_CMD_DIAG_NONE)
-      << " ("
+  // Report terminal dimensions.
+  out << "   Terminal: "
       << context.getWidth ()
       << 'x'
       << context.getHeight ()
-      << ")\n";
+      << '\n';
 
   // Scan tasks for duplicate UUIDs.
   auto all = context.tdb2.all_tasks ();

From 18c8b41f3f3011b7def19415e66d177f7ea2514e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 17:37:21 -0500
Subject: [PATCH 419/879] Config: Eliminated

---
 src/Config.cpp | 233 -------------------------------------------------
 src/Config.h   |  65 --------------
 2 files changed, 298 deletions(-)
 delete mode 100644 src/Config.cpp
 delete mode 100644 src/Config.h

diff --git a/src/Config.cpp b/src/Config.cpp
deleted file mode 100644
index da33196b2..000000000
--- a/src/Config.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Config.h>
-#include <Context.h>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <algorithm>
-#include <sys/stat.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <Datetime.h>
-#include <FS.h>
-#include <Timer.h>
-#include <JSON.h>
-#include <Lexer.h>
-#include <shared.h>
-#include <format.h>
-#include <util.h>
-#include <i18n.h>
-
-extern Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-// DO NOT CALL Config::setDefaults.
-//
-// This is a default constructor, and as such is only used to:
-//   a) initialize a default Context constructor
-//   b) run unit tests
-//
-// In all real use cases, Config::load is called.
-Config::Config ()
-: _original_file ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Read the Configuration file and populate the *this map.  The file format is
-// simply lines with name=value pairs.  Whitespace between name, = and value is
-// not tolerated, but blank lines and comments starting with # are allowed.
-//
-// Nested files are now supported, with the following construct:
-//   include /absolute/path/to/file
-//
-void Config::load (const std::string& file, int nest /* = 1 */)
-{
-  Timer timer;
-
-  if (nest > 10)
-    throw std::string (STRING_CONFIG_OVERNEST);
-
-  // Capture the original name.
-  _original_file = File (file);
-
-  // Read the file, then parse the contents.
-  std::string contents;
-  if (File::read (file, contents) && contents.length ())
-    parse (contents, nest);
-
-  context.debugTiming (format ("Config::load ({1})", file), timer);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::parse (const std::string& input, int nest /* = 1 */)
-{
-  // Shortcut case for default constructor.
-  if (input.length () == 0)
-    return;
-
-  // Split the input into lines.
-  auto lines = split (input, '\n');
-
-  // Parse each line.
-  for (auto& line : lines)
-  {
-    // Remove comments.
-    auto pound = line.find ("#"); // no i18n
-    if (pound != std::string::npos)
-      line = line.substr (0, pound);
-
-    line = Lexer::trim (line, " \t"); // no i18n
-
-    // Skip empty lines.
-    if (line.length () > 0)
-    {
-      auto equal = line.find ("="); // no i18n
-      if (equal != std::string::npos)
-      {
-        std::string key   = Lexer::trim (line.substr (0, equal), " \t"); // no i18n
-        std::string value = Lexer::trim (line.substr (equal+1, line.length () - equal), " \t"); // no i18n
-
-        (*this)[key] = json::decode (value);
-      }
-      else
-      {
-        auto include = line.find ("include"); // no i18n.
-        if (include != std::string::npos)
-        {
-          Path included (Lexer::trim (line.substr (include + 7), " \t"));
-          if (included.is_absolute ())
-          {
-            if (included.readable ())
-              this->load (included, nest + 1);
-            else
-              throw format (STRING_CONFIG_READ_INCLUDE, included._data);
-          }
-          else
-            throw format (STRING_CONFIG_INCLUDE_PATH, included._data);
-        }
-        else
-          throw format (STRING_CONFIG_BAD_ENTRY, line);
-      }
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Config::has (const std::string& key)
-{
-  return (*this).find (key) != (*this).end ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Return the configuration value given the specified key.
-std::string Config::get (const std::string& key)
-{
-  auto found = find (key);
-  if (found != end ())
-    return found->second;
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Config::getInteger (const std::string& key)
-{
-  auto found = find (key);
-  if (found != end ())
-    return strtoimax (found->second.c_str (), nullptr, 10);
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-double Config::getReal (const std::string& key)
-{
-  //NOTE: Backwards compatible handling of next coefficient.
-  //TODO: Remove.
-  if (key == "urgency.user.tag.next.coefficient" and has ("urgency.next.coefficient"))
-    return getReal ("urgency.next.coefficient");
-
-  auto found = find (key);
-  if (found != end ())
-    return strtod (found->second.c_str (), nullptr);
-
-  return 0.0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Config::getBoolean (const std::string& key)
-{
-  auto found = find (key);
-  if (found != end ())
-  {
-    std::string value = Lexer::lowerCase ((*this)[key]);
-    if (value == "t"      ||  // TODO Deprecate
-        value == "true"   ||  // TODO Deprecate
-        value == "1"      ||
-        value == "+"      ||  // TODO Deprecate
-        value == "y"      ||  // TODO Deprecate
-        value == "yes"    ||  // TODO Deprecate
-        value == "on"     ||  // TODO Deprecate
-        value == "enable" ||  // TODO Deprecate
-        value == "enabled")   // TODO Deprecate
-      return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::set (const std::string& key, const int value)
-{
-  (*this)[key] = format (value);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::set (const std::string& key, const double value)
-{
-  (*this)[key] = format (value, 1, 8);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Config::set (const std::string& key, const std::string& value)
-{
-  (*this)[key] = value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Provide a vector of all configuration keys.
-void Config::all (std::vector<std::string>& items) const
-{
-  for (auto& it : *this)
-    items.push_back (it.first);
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Config.h b/src/Config.h
deleted file mode 100644
index 408e9c8c1..000000000
--- a/src/Config.h
+++ /dev/null
@@ -1,65 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_CONFIG
-#define INCLUDED_CONFIG
-
-#include <map>
-#include <vector>
-#include <string>
-#include <FS.h>
-
-class Config : public std::map <std::string, std::string>
-{
-public:
-  Config ();
-  Config (const Config&);
-  Config& operator= (const Config&);
-
-  void load (const std::string&, int nest = 1);
-  void parse (const std::string&, int nest = 1);
-
-  bool        has        (const std::string&);
-  std::string get        (const std::string&);
-  int         getInteger (const std::string&);
-  double      getReal    (const std::string&);
-  bool        getBoolean (const std::string&);
-
-  void set (const std::string&, const int);
-  void set (const std::string&, const double);
-  void set (const std::string&, const std::string&);
-  void all (std::vector <std::string>&) const;
-
-public:
-  File _original_file;
-
-private:
-  static std::string _defaults;
-};
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////

From 65c351f50eb1f1ef5c81ce594218449c28073de5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Feb 2017 23:39:14 -0500
Subject: [PATCH 420/879] Docs: Updated dev file

---
 DEVELOPER  |  59 +++++++-------
 EXPOSITION | 232 -----------------------------------------------------
 README.md  |   5 +-
 3 files changed, 29 insertions(+), 267 deletions(-)
 delete mode 100644 EXPOSITION

diff --git a/DEVELOPER b/DEVELOPER
index fd47ba2e0..639dc84c6 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -35,9 +35,7 @@ How to Build Taskwarrior
 General Statement
   This file is intended to convey the current efforts, priorities and needs of
   the codebase. It is for anyone looking for a way to start contributing.
-  While this is biased towards developers, anyone can contribute, and everyone
-  is encouraged to do so. Here are many ways to contribute that may not be
-  immediately obvious to you:
+  Here are many ways to contribute that may not be obvious:
 
   - Use Taskwarrior, become familiar with it, and make suggestions. There are
     always ongoing discussions about new features and changes to existing
@@ -55,7 +53,7 @@ General Statement
     so on, and these may contain errors, or they may not convey ideas in the
     best way. Perhaps you can help improve it. Contact us - documentation is
     a separate effort from the codebase, and includes all web sites, and all
-    are available using git.
+    are available as git repositories.
 
   - Take a look at the bug database, and help triage the bug list. This is a
     review process that involves confirming bugs, providing additional data,
@@ -66,10 +64,10 @@ General Statement
   - Review the source code, and point out inefficiencies, problems, unreadable
     functions, bugs and assumptions.
 
-  - Fix a bug. For this you'll need C++ and Git skills, but this is one of
-    the largest ways you can contribute. We welcome all bug fixes, provided
-    the work is done well and doesn't create other problems or introduce new
-    dependencies. We recommend talking to us before starting. Seriously.
+  - Fix a bug. For this you'll need C++ and Git skills. We welcome all bug
+    fixes, provided the work is done well and doesn't create other problems or
+    introduce new dependencies. We recommend talking to us before starting.
+    Seriously.
 
   - Add unit tests. Unit tests are possibly the most useful contributions of
     all, because they not only improve the quality of the code, but prevent
@@ -88,11 +86,6 @@ 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://central.tasktools.org. Ask us about running a
-    Flod satellite, we're always looking for exotic platforms to test on.
-
   - Spread the word. Help others become more effective at managing tasks.
 
   - Encouragement. Tell us what works for you, and what doesn't. Tell us about
@@ -102,25 +95,6 @@ General Statement
     missing from the software, but gives us insights into how you use it.
     Plus, you might get your feature implemented.
 
-  Next are some specific areas that need attention.
-
-
-New Code Needs
-  This is code that needs to be written.
-
-  - Need an external script that can locate and correct duplicate UUIDs in the
-    data file, as found by 'task diag'. This should check to see if there is
-    a suitable UUID generator installed. This should also be careful to
-    properly handle recurring tasks.
-  - Take a look at:
-
-      https://bug.tasktools.org/browse/EX
-
-    This 'extension' release is a collection of all the requested features that
-    lie outside of the core product, and will be implemented as external scripts
-    by anyone who wishes to participate.
-
-
 Unit Tests Needed
   There are always more unit tests needed. More specifically, better unit tests
   are always needed. The convention is that there are four types of unit test:
@@ -150,6 +124,27 @@ Unit Tests Needed
 
   Note that all new unit tests should follow the test/template.t standard.
 
+Patches
+  Patches are encouraged and welcomed. Either attach them to the appropriate
+  Jira issue, or send them to support@taskwarrior.org. A good patch:
+
+    - Maintains the MIT license, and does not contain code lifted from other
+      sources. You will have written 100% of the code in the patch, otherwise
+      we cannot maintain the license.
+    - Precisely addresses one issue only.
+    - Doesn't break unit tests.
+    - Doesn't introduce dependencies.
+    - Is accompanied by unit tests, where appropriate.
+    - Is accompanied by documentation changes, where appropriate.
+    - Conforms to the prevailing coding standards - in other words, it should
+      fit right in with the existing code.
+
+  A patch may be rejected for violating any of the above rules, and more.
+  Bad patches may be accepted and modified depending on work load and mood. It
+  is possible that a patch may be rejected because it conflicts in some way with
+  plans or upcoming changes. Check with us first, before sinking time and effort
+  into a patch.
+
 Current Codebase Condition
 
   'master' branch:
diff --git a/EXPOSITION b/EXPOSITION
deleted file mode 100644
index a7d4a03a5..000000000
--- a/EXPOSITION
+++ /dev/null
@@ -1,232 +0,0 @@
-Startup
-  On startup, main creates a global Context object, then calls the
-  Context::initialize and Context::run methods.
-
-  Context is a large object that holds all task information, both in terms of
-  the task data, and intermediate run-time data. Having one global Context
-  object means we don't have 50 global variables. Context is therefore just a
-  big global bucket of data.
-
-  Context::initialize sets up all the data and processes the command line. The
-  initialization process is a big chicken-and-egg problem, because the command
-  line depends on configuration (aliases) and the command line can force a
-  reload of configuration (rc:foo). This is solved by look-ahead: the command
-  line is scanned for 'rc:xxx' and 'rc.data.location:xxx' arguments, then later
-  for overrides.
-
-  The Context::run method handles all the debug output and exceptions. Its
-  main purpose is to set up exception handling and call Context::dispatch.
-
-
-Command Line Parsing
-  Command line parsing is difficult because of lots ambiguity. The solution is
-  to make multiple passes over the command line. For example, the command
-  determines whether subsequent arguments are interpreted as part of a filter or
-  set of modifications.
-
-  The CLI2 object is fed command line arguments, then through a succession of
-  calls builds and annotates a parse tree. To help with this, the Lexer is
-  used to break up strings into tokens.
-
-  The object of the command line parsing is to expand all syntactic sugar to
-  use the low-level syntax, and expand the boolean logic in filters and create
-  a well-formed algebraic expression. For example, this command line:
-
-    task 1-10 +foo lis
-
-  is expanded internally to something like this:
-
-    task ( ( id >= 1 and id <= 10 ) and tags._hastag_ foo ) list
-
-  Note that there are concerns with id ranges, operator precedence, tag
-  checking, and the expansion of the command name. The arguments are then
-  tagged to indicate what part of the command line іt represents, such as a
-  filter, operator, or command.
-
-  The CLI2 object will be replaced by a generalized parser and grammar.
-
-
-Dispatch
-  Dispatch is simple: once the command line is parsed, the command is used to
-  look up a command object, then a call is made to the Command::execute method.
-
-  Context stores an associative map of command object pointers indexed by a
-  string. This means the 'done' string is an index to the CmdDone object that
-  implements the functionality.
-
-
-Command Objects
-  Every task command is implemented by a command object. The command object
-  provides metadata, usage and one-line help in addition to the ::execute method
-  that implements the command. The Command base class implements common
-  functionality.
-
-
-Column Objects
-  There is a 1:1 correspondence between attributes stored in the data files and
-  the columns that may be reported. These are represented by column objects,
-  which are responsible for validating input, measuring space needed according
-  to various formats, and for rendering data for reports. There is a
-  ColDescription object that inherits from a Column base class.
-
-
-TDB2
-  The TDB2 object is a layered, transactioned I/O manager. Its purpose is to
-  isolate code from file I/O, locking and parsing details. It is also
-  responsible for minimizing reads, writes and parsing of data files.
-
-  All input is assumed to be UTF8. All stored data is treated as UTF8.
-
-
-GC
-  Garbage Collection is the process that moves tasks between the pending.data
-  and completed.data files. It is also responsible for waking tasks out of the
-  wait state.
-
-  Every command that displays task IDs will cause a GC to be run first, which
-  minimizes the number of changes necessary to the task IDs. This means that
-  when a report shows task IDs, those IDs will remain valid while subsequent
-  write commands are issued. The next report run may show different IDs.
-
-  Minimizing the size of pending.data is important for performance, because it
-  is the file that is accessed most.
-
-
-Files
-  The data files used are all kept in the rc.data.location directory, which
-  defaults to ~/.task. The files are:
-
-    pending.data
-    completed.data
-    undo.data
-    backlog.data
-
-  The pending.data file aspires to contain only pending, waiting and recurring
-  tasks, but this is only correct after a GC, and before any tasks are modified.
-  This file tends to be relatively stable in size, reflecting the length of the
-  task list.
-
-  The completed.data file accumulates data over time, and grows unbounded.
-
-  The undo.data file accumulates changes over time, and grows unbounded. It
-  provides all the necessary metadata to support the 'undo' command. Deleting
-  this file has two effects which are to remove the undo capability, and remove
-  the ability for the 'info' command to show a change history. The undo file
-  can grow quite large, and it can be argued that only the last N transactions
-  are worth keeping, where N is about 10.
-
-  The backlog.data file contains an accumulated set of changes that have not
-  been transmitted to Taskserver. It grows unbounded between 'sync' commands.
-  If you do not use sync, it is fine to just delete this file to save space.
-
-
-Filter
-  A filter is simply a set of command line arguments, but is only a subset of
-  the complete command line. These arguments are extracted from the parse tree
-  according to whether the command found is a read or write command.
-
-  There is a Filter::subset method for applying a filter to a set of tasks,
-  yielding a result set. It does this by creating an expression from the
-  parse tree using the Eval object, then evaluating the expression for each task,
-  such that the result set contains only tasks for which the expression evaluates
-  to Boolean true.
-
-
-Eval & Variant
-  The Eval class evaluates expressions, provided in string form, using the
-  Variant class to represent data elements. Variant implements all operators
-  for all Variant types.
-
-
-Sorting
-  Sorting is performed on a set of tasks. More specifically, the list that is
-  sorted is a set of numeric indexes to tasks that are stored in a separate
-  list. This minimizes the amount of data copying involved to just integers
-  rather than Task objects, but at the expense of one level of indirection.
-  Memory fragmentation is a bigger problem than the performance of vector
-  indexing.
-
-  The actual sorting is performed by std::stable_sort, but the compare function
-  is custom.
-
-
-Render
-  There are two rendering objects, ViewTask and Table. These both have the
-  same tabular grid rendering capabilities. Table maintains a 2D vector of
-  strings to contain the data to be rendered, so it is used for things like the
-  help command output. ViewTask does not copy data, but assumes all data is
-  stored externally in a vector of Tasks, which minimizes data copying.
-
-  ViewTask contains projection data in the form of a set of Column objects that
-  represent the X axis. The Y axis is represented by a vector of tasks.
-
-  The rendering process is complex. It involves dynamically setting column
-  widths based on (1) available terminal width, (2) the columns to be included
-  in the output, (3) ability to wrap text for certain columns and (4) the size
-  of the data to be rendered, which involves added complexity when UTF8 is used.
-
-  The Column objects determine minimum width for a column and the maximum width
-  which then allows ViewT* to make choices.
-
-
-Test Suite
-  A strong and diverse test suite is critical to the successful release of any
-  software. With the complex command set and its many permutations, a test suite
-  is the only way to ensure quality levels, and guarantee that big changes are
-  robust.
-
-  It is intended that the test suite continues growing, mostly feature tests.
-  The test are mostly written in Python. Some tests are written in C++ and all
-  tests generate TAP output.
-
-  There are currently about 8,000 unit tests, that take only a few seconds to
-  run on a multi-core machine.
-
-  Taskwarrior uses flod software to automate continuous integration across many
-  platforms. Code changes are automatically detected, propagated, built and
-  tested on a variety of participating platforms. Grid testing results are here:
-
-    http://central.tasktools.org/
-
-  When making code changes, it is important that the test suite be run to verify
-  that functionality was not broken.
-
-
-Debugging
-  The 'rc.debug=on' override provides the following additional information which
-  is useful during debugging:
-
-    - Timing of various components (used to generate the data for the charts at
-      http://tasktools.org/performance).
-    - Data load times.
-    - Terminal size, color capabilities.
-    - Command line parse tree.
-    - TDB2 layer and I/O information.
-
-  Additionally, there are other settings (see 'man taskrc' for full details) that
-  may also be helpful: 'rc.hooks=on|off', 'rc.debug.parser=0|1|2|3',
-  'rc.debug.hooks=0|1|2', 'rc.debug.tls=0|1|2|3...'.
-
-
-Patches
-  Patches are encouraged and welcomed. Either attach them to the appropriate
-  Jira issue, or send them to support@taskwarrior.org. A good patch:
-
-    - Maintains the MIT license, and does not contain code lifted from other
-      sources. You will have written 100% of the code in the patch, otherwise
-      we cannot maintain the license.
-    - Precisely addresses one issue only.
-    - Doesn't break unit tests.
-    - Doesn't introduce dependencies.
-    - Is accompanied by unit tests, where appropriate.
-    - Is accompanied by documentation changes, where appropriate.
-    - Conforms to the prevailing coding standards - in other words, it should
-      fit right in with the existing code.
-
-  A patch may be rejected for violating any of the above rules, and more.
-  Bad patches may be accepted and modified depending on work load and mood. It
-  is possible that a patch may be rejected because it conflicts in some way with
-  plans or upcoming changes. Check with us first, before sinking time and effort
-  into a patch.
-
----
diff --git a/README.md b/README.md
index 1bf742bb5..c3331309c 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,11 @@ Thank you for taking a look at Taskwarrior!
 
 Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
-Source project. Taskwarrior has binary distributions, online documentation,
-demonstration movies, and you'll find all the details at:
+Source project. Take a look at the site:
 
     http://taskwarrior.org
 
-At the site you'll find online documentation, downloads, news and more.
+There you'll find online documentation, downloads, news and more.
 
 Your contributions are especially welcome. Whether it comes in the form of
 code patches, ideas, discussion, bug reports, encouragement or criticism, your

From 146a72b331feb77427a8febbc3256d862d8370ae Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 27 Feb 2017 07:46:54 -0500
Subject: [PATCH 421/879] DOM: Partial DOM match is no longer an error

---
 src/DOM.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index c4f1acd88..dd97384a2 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -136,8 +136,8 @@ bool getDOM (const std::string& name, Variant& value)
                                            : context.getHeight ()));
       return true;
     }
-    else
-      throw format (STRING_DOM_UNREC, name);
+
+    return false;
   }
 
   // context.*
@@ -177,8 +177,8 @@ bool getDOM (const std::string& name, Variant& value)
                                            : context.getHeight ()));
       return true;
     }
-    else
-      throw format (STRING_DOM_UNREC, name);
+
+    return false;
   }
 
   // system. --> Implement locally.
@@ -198,8 +198,8 @@ bool getDOM (const std::string& name, Variant& value)
       value = Variant (osName ());
       return true;
     }
-    else
-      throw format (STRING_DOM_UNREC, name);
+
+    return false;
   }
 
   // Empty string if nothing is found.

From 60e5c488ac5650c904d40e36da624ea1d2b14c56 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 27 Feb 2017 07:51:29 -0500
Subject: [PATCH 422/879] DOM: tw.syncneeded should be 0/1, not false/true

---
 src/DOM.cpp | 4 ++--
 test/dom.t  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index dd97384a2..8fd8c7274 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -91,12 +91,12 @@ bool getDOM (const std::string& name, Variant& value)
   {
     if (name == "tw.syncneeded")
     {
-      value = Variant (false);
+      value = Variant (0);
       for (const auto& line : context.tdb2.backlog.get_lines ())
       {
         if (line[0] == '{')
         {
-          value = Variant (true);
+          value = Variant (1);
           break;
         }
       }
diff --git a/test/dom.t b/test/dom.t
index 00276381c..92f4651fe 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -286,16 +286,16 @@ class TestDOMSync(TestCase):
         """ DOM tw.syncneeded --> false """
         code, out, err = self.t("_get tw.syncneeded")
         self.assertEqual(code, 0)
-        self.assertIn("false", out)
-        self.assertNotIn("true", out)
+        self.assertIn("0", out)
+        self.assertNotIn("1k", out)
 
     def test_dom_tw_syncneeded_true(self):
         """ DOM tw.syncneeded --> true """
         self.t("add foo")
         code, out, err = self.t("_get tw.syncneeded")
         self.assertEqual(code, 0)
-        self.assertNotIn("false", out)
-        self.assertIn("true", out)
+        self.assertNotIn("0", out)
+        self.assertIn("1", out)
 
 
 class TestDOMDirectReferencesOnAddition(TestCase):

From e2e972581259247fbc259221fb6bff02a293d303 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 27 Feb 2017 08:28:45 -0500
Subject: [PATCH 423/879] Variant: Reduced dependence on ISO8601

---
 src/Variant.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index 69b9aadb3..7e8b38d42 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1002,8 +1002,8 @@ bool Variant::operator_partial (const Variant& other) const
     case type_date:
       {
         left.cast (type_date);
-        ISO8601d left_date (left._date);
-        ISO8601d right_date (right._date);
+        Datetime left_date (left._date);
+        Datetime right_date (right._date);
         return left_date.sameDay (right_date);
       }
 
@@ -1023,8 +1023,8 @@ bool Variant::operator_partial (const Variant& other) const
     case type_date:
       {
         left.cast (type_date);
-        ISO8601d left_date (left._date);
-        ISO8601d right_date (right._date);
+        Datetime left_date (left._date);
+        Datetime right_date (right._date);
         return left_date.sameDay (right_date);
       }
 
@@ -1049,8 +1049,8 @@ bool Variant::operator_partial (const Variant& other) const
     case type_date:
       {
         left.cast (type_date);
-        ISO8601d left_date (left._date);
-        ISO8601d right_date (right._date);
+        Datetime left_date (left._date);
+        Datetime right_date (right._date);
         return left_date.sameDay (right_date);
       }
 
@@ -1095,8 +1095,8 @@ bool Variant::operator_partial (const Variant& other) const
           return false;
 
         left.cast (type_date);
-        ISO8601d left_date (left._date);
-        ISO8601d right_date (right._date);
+        Datetime left_date (left._date);
+        Datetime right_date (right._date);
         return left_date.sameDay (right_date);
       }
 
@@ -1121,8 +1121,8 @@ bool Variant::operator_partial (const Variant& other) const
     case type_duration:
       {
         right.cast (type_date);
-        ISO8601d left_date (left._date);
-        ISO8601d right_date (right._date);
+        Datetime left_date (left._date);
+        Datetime right_date (right._date);
         return left_date.sameDay (right_date);
       }
     }
@@ -1886,7 +1886,7 @@ void Variant::cast (const enum type new_type)
         if (isop.parse (_string, pos) &&
             pos == _string.length ())
         {
-          _date = ISO8601d ().toEpoch () + isop.toTime_t ();
+          _date = Datetime ().toEpoch () + isop.toTime_t ();
           break;
         }
 

From de8d9d88ffb2017438b4b3252d4f77ea584285c4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 27 Feb 2017 08:41:03 -0500
Subject: [PATCH 424/879] Lexer: Typo

---
 src/Lexer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 376f40fc7..08771272f 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -572,7 +572,7 @@ bool Lexer::isDate (std::string& token, Lexer::Type& type)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::duration
-//   <ISO8106p> | <Duration>
+//   <ISO8601p> | <Duration>
 bool Lexer::isDuration (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;

From 2297b2d3a1417fbc40555bd09452266c55df3731 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 00:10:15 -0500
Subject: [PATCH 425/879] Feedback: Sync message now indicates how many local
 changes will be synced

---
 ChangeLog          |  2 ++
 NEWS               |  2 ++
 src/feedback.cpp   | 11 +++++------
 src/l10n/deu-DEU.h |  2 +-
 src/l10n/eng-USA.h |  2 +-
 src/l10n/epo-RUS.h |  2 +-
 src/l10n/esp-ESP.h |  2 +-
 src/l10n/fra-FRA.h |  2 +-
 src/l10n/ita-ITA.h |  2 +-
 src/l10n/jpn-JPN.h |  2 +-
 src/l10n/pol-POL.h |  2 +-
 src/l10n/por-PRT.h |  2 +-
 12 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56742f0e1..bb2522afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,8 @@
   report variations, with code refactoring.
           (thanks to Lukas Barth).
 - New DOM references: annotations.count, tw.syncneeded.
+- The message telling you to sync now indicates how many local changes will be
+  synced.
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index a3706e3ce..e48504186 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ New Features in Taskwarrior 2.5.2
   - Renovated 'timesheet' command with a more compact report that accepts a
     filter, and has a default filter showing the last four weeks of completed
     and started tasks.
+  - The message telling you to sync now indicates how many local changes will be
+    synced.
 
 New Commands in Taskwarrior 2.5.2
 
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 913ab7c26..2c5cc67e3 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -413,15 +413,14 @@ void feedback_backlog ()
   if (context.config.get ("taskd.server") != "" &&
       context.verbose ("sync"))
   {
+    int count = 0;
     std::vector <std::string> lines = context.tdb2.backlog.get_lines ();
     for (auto& line : lines)
-    {
       if ((line)[0] == '{')
-      {
-        context.footnote (STRING_FEEDBACK_BACKLOG);
-        break;
-      }
-    }
+        ++count;
+
+    if (count)
+      context.footnote (format (STRING_FEEDBACK_BACKLOG, count));
   }
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d91be078a..d31b1ecb0 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -742,7 +742,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Aufgabe {1} '{2}' entsperrt."
 #define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
-#define STRING_FEEDBACK_BACKLOG      "Lokale Änderungen.  Datenabgleich erforderlich."
+#define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 470ed4822..6e7db41a8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -740,7 +740,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c44047d28..4a362468f 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -742,7 +742,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Malblokis {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
-#define STRING_FEEDBACK_BACKLOG      "Estas lokaj ŝanĝoj. Sinkronigo devita."
+#define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index bc2858286..d13e2cb9f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -754,7 +754,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas."
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
-#define STRING_FEEDBACK_BACKLOG      "Hay modificaciones locales.  Se require una sincronización."
+#define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 069c40709..19e794611 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -744,7 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
-#define STRING_FEEDBACK_BACKLOG      "Il y a des changements locaux.  Synchronisation requise."
+#define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f82c565e5..f3febb5fe 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -743,7 +743,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Sbloccato {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
-#define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 1602c9617..87c066869 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -744,7 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG      "There are local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index cad499ecd..f3f61d924 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -744,7 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Odblokowane {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
-#define STRING_FEEDBACK_BACKLOG      "Wykryto lokalne zmiany. Wymagana synchronizacja."
+#define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 0ca564656..3127e340e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -744,7 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
-#define STRING_FEEDBACK_BACKLOG      "Há modificações locais. Necessário sincronizar (sync)."
+#define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

From e7d9aaec4eb9793ff6348bf2873c2320ebfdb7c3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:14:46 -0500
Subject: [PATCH 426/879] Docs: Updated requirements

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index 639dc84c6..1231a4f8d 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -3,7 +3,7 @@ How to Build Taskwarrior
   Satisfy the Requirements:
     - gcc 4.9 or later, clang 3.4 or later, or a compiler with full C++11
       support.
-    - libuuid
+    - libuuid (if not on macOS)
     - gnutls (optional)
     - python 2.7 or 3 (optional, for running the test suite)
 

From 16ac2c70ab8912deb3dd05c61d468a69236c54b9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:15:24 -0500
Subject: [PATCH 427/879] Docs: Updated build parallelism

---
 DEVELOPER | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index 1231a4f8d..57ce1d7c2 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -14,8 +14,8 @@ How to Build Taskwarrior
     $ git submodule init                 # This is now done by cmake as a test
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
-    $ make VERBOSE=1 -j8                 # Shows details, builds using 8 jobs
-                                         # Alternately 'export MAKEFLAGS=-j 8'
+    $ make VERBOSE=1 -j4                 # Shows details, builds using 4 jobs
+                                         # Alternately 'export MAKEFLAGS=-j 4'
 
   Running Test Suite:
     $ cd tests

From 4dab89f7e629984029176516bdc7c9e31f656371 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:19:48 -0500
Subject: [PATCH 428/879] Docs: Typo

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index 57ce1d7c2..b232c5757 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -34,7 +34,7 @@ How to Build Taskwarrior
 
 General Statement
   This file is intended to convey the current efforts, priorities and needs of
-  the codebase. It is for anyone looking for a way to start contributing.
+  the code base. It is for anyone looking for a way to start contributing.
   Here are many ways to contribute that may not be obvious:
 
   - Use Taskwarrior, become familiar with it, and make suggestions. There are

From 6dffdaa471906161306263fc719e0a121cf53763 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:20:01 -0500
Subject: [PATCH 429/879] Docs: Typo

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index b232c5757..a11a0deab 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -52,7 +52,7 @@ General Statement
   - Review documentation: there are man pages, online articles, tutorials and
     so on, and these may contain errors, or they may not convey ideas in the
     best way. Perhaps you can help improve it. Contact us - documentation is
-    a separate effort from the codebase, and includes all web sites, and all
+    a separate effort from the code base, and includes all web sites, and all
     are available as git repositories.
 
   - Take a look at the bug database, and help triage the bug list. This is a

From eb6cc1fa775f632c696227fed56aa0f2fb29382c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:20:31 -0500
Subject: [PATCH 430/879] Docs: Typo

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index a11a0deab..af643d1c3 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -145,7 +145,7 @@ Patches
   plans or upcoming changes. Check with us first, before sinking time and effort
   into a patch.
 
-Current Codebase Condition
+Current Code Base Condition
 
   'master' branch:
     - 2.5.1 Current release, locked.

From ecd0646f41eb415ef32a738ae0e44f685c2e252c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:20:38 -0500
Subject: [PATCH 431/879] Docs: Typo


From 37d65a6296cbe1c5cde719198f8d2681896b88ec Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:51:46 -0500
Subject: [PATCH 432/879] Docs: Typo

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index af643d1c3..53516f694 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -122,7 +122,7 @@ Unit Tests Needed
     many issues, open and closed, have the "needsTest" label. These are things
     that we would like to see in the test suite, as regression tests.
 
-  Note that all new unit tests should follow the test/template.t standard.
+  All new unit tests should follow the test/template.t standard.
 
 Patches
   Patches are encouraged and welcomed. Either attach them to the appropriate

From 113358fa50b2796650633aec6e91b0a92c1a464d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 28 Feb 2017 18:52:18 -0500
Subject: [PATCH 433/879] Docs: Typo

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index 53516f694..fd1cf592a 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -137,7 +137,7 @@ Patches
     - Is accompanied by unit tests, where appropriate.
     - Is accompanied by documentation changes, where appropriate.
     - Conforms to the prevailing coding standards - in other words, it should
-      fit right in with the existing code.
+      fit in with the existing code.
 
   A patch may be rejected for violating any of the above rules, and more.
   Bad patches may be accepted and modified depending on work load and mood. It

From 180e018a361b05222153f5f8b953eef9f4d765b7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 2 Mar 2017 18:28:35 -0500
Subject: [PATCH 434/879] util: Removed unused header

---
 src/util.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/util.cpp b/src/util.cpp
index fa51defcb..090ecf188 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -48,7 +48,6 @@
 #include <string.h>
 #include <signal.h>
 #include <pwd.h>
-#include <errno.h>
 #include <signal.h>
 #include <sys/select.h>
 

From 4cbbaec833f7324bcc2d2e168f6d211f4156c56f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 2 Mar 2017 18:29:42 -0500
Subject: [PATCH 435/879] CmdEdit: Properly captures an unmodified errno

---
 src/commands/CmdEdit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 0658284c0..748844ebd 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -770,13 +770,14 @@ ARE_THESE_REALLY_HARMFUL:
   // Launch the editor.
   std::cout << format (STRING_EDIT_LAUNCHING, editor) << '\n';
   int exitcode = system (editor.c_str ());
+  auto captured_errno = errno;
   if (0 == exitcode)
     std::cout << STRING_EDIT_COMPLETE << '\n';
   else
   {
     std::cout << format (STRING_EDIT_FAILED, exitcode) << '\n';
     if (-1 == exitcode)
-      std::cout << std::strerror (errno) << '\n';
+      std::cout << std::strerror (captured_errno) << '\n';
     return CmdEdit::editResult::error;
   }
 

From 42e0c17de75faa088fb1b7752e70276a91679cc2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 2 Mar 2017 20:30:02 -0500
Subject: [PATCH 436/879] sort: Greater use of auto

---
 src/sort.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/sort.cpp b/src/sort.cpp
index 454676264..9ffd6a7b4 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -118,8 +118,8 @@ static bool sort_compare (int left, int right)
              field == "imask"       ||
              field == "mask")
     {
-      const std::string& left_string  = (*global_data)[left].get_ref  (field);
-      const std::string& right_string = (*global_data)[right].get_ref (field);
+      auto left_string  = (*global_data)[left].get_ref  (field);
+      auto right_string = (*global_data)[right].get_ref (field);
 
       if (left_string == right_string)
         continue;
@@ -138,8 +138,8 @@ static bool sort_compare (int left, int right)
              field == "modified" ||
              field == "scheduled")
     {
-      const std::string& left_string  = (*global_data)[left].get_ref  (field);
-      const std::string& right_string = (*global_data)[right].get_ref (field);
+      auto left_string  = (*global_data)[left].get_ref  (field);
+      auto right_string = (*global_data)[right].get_ref (field);
 
       if (left_string != "" && right_string == "")
         return true;
@@ -158,8 +158,8 @@ static bool sort_compare (int left, int right)
     else if (field == "depends")
     {
       // Raw data is a comma-separated list of uuids
-      const std::string& left_string  = (*global_data)[left].get_ref  (field);
-      const std::string& right_string = (*global_data)[right].get_ref (field);
+      auto left_string  = (*global_data)[left].get_ref  (field);
+      auto right_string = (*global_data)[right].get_ref (field);
 
       if (left_string == right_string)
         continue;
@@ -184,8 +184,8 @@ static bool sort_compare (int left, int right)
     // Duration.
     else if (field == "recur")
     {
-      const std::string& left_string  = (*global_data)[left].get_ref  (field);
-      const std::string& right_string = (*global_data)[right].get_ref (field);
+      auto left_string  = (*global_data)[left].get_ref  (field);
+      auto right_string = (*global_data)[right].get_ref (field);
 
       if (left_string == right_string)
         continue;
@@ -202,8 +202,8 @@ static bool sort_compare (int left, int right)
       std::string type = column->type ();
       if (type == "numeric")
       {
-        const float left_real  = strtof (((*global_data)[left].get_ref  (field)).c_str (), NULL);
-        const float right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL);
+        auto left_real  = strtof (((*global_data)[left].get_ref  (field)).c_str (), NULL);
+        auto right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL);
 
         if (left_real == right_real)
           continue;
@@ -213,8 +213,8 @@ static bool sort_compare (int left, int right)
       }
       else if (type == "string")
       {
-        const std::string left_string = (*global_data)[left].get_ref (field);
-        const std::string right_string = (*global_data)[right].get_ref (field);
+        auto left_string = (*global_data)[left].get_ref (field);
+        auto right_string = (*global_data)[right].get_ref (field);
 
         if (left_string == right_string)
           continue;
@@ -243,8 +243,8 @@ static bool sort_compare (int left, int right)
 
       else if (type == "date")
       {
-        const std::string& left_string  = (*global_data)[left].get_ref  (field);
-        const std::string& right_string = (*global_data)[right].get_ref (field);
+        auto left_string  = (*global_data)[left].get_ref  (field);
+        auto right_string = (*global_data)[right].get_ref (field);
 
         if (left_string != "" && right_string == "")
           return true;
@@ -260,8 +260,8 @@ static bool sort_compare (int left, int right)
       }
       else if (type == "duration")
       {
-        const std::string& left_string  = (*global_data)[left].get_ref  (field);
-        const std::string& right_string = (*global_data)[right].get_ref (field);
+        auto left_string  = (*global_data)[left].get_ref  (field);
+        auto right_string = (*global_data)[right].get_ref (field);
 
         if (left_string == right_string)
           continue;

From 88968af20ba7332b2de29c3c39e5cafe97a3f127 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 2 Mar 2017 20:56:19 -0500
Subject: [PATCH 437/879] dependency: CPP Core Guidlines compliance

---
 src/dependency.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index 6c91a470f..2836bddaf 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -57,8 +57,8 @@ std::vector <Task> dependencyGetBlocked (const Task& task)
 std::vector <Task> dependencyGetBlocking (const Task& task)
 {
   auto depends = task.get ("depends");
-  std::vector <Task> blocking;
 
+  std::vector <Task> blocking;
   if (depends != "")
     for (auto& it : context.tdb2.pending.get_tasks ())
       if (it.getStatus () != Task::completed &&
@@ -80,9 +80,9 @@ bool dependencyIsCircular (const Task& task)
     auto task_uuid = task.get ("uuid");
 
     std::stack <Task> s;
-    std::unordered_set <std::string> visited;
-
     s.push (task);
+
+    std::unordered_set <std::string> visited;
     visited.insert (task_uuid);
 
     while (! s.empty ())
@@ -164,7 +164,7 @@ void dependencyChainOnComplete (Task& task)
       std::cout << format (STRING_DEPEND_BLOCKED, task.identifier ())
                 << '\n';
 
-      for (auto& b : blocking)
+      for (const auto& b : blocking)
         std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
     }
 
@@ -176,7 +176,7 @@ void dependencyChainOnComplete (Task& task)
         std::cout << STRING_DEPEND_BLOCKING
                   << '\n';
 
-        for (auto& b : blocked)
+        for (const auto& b : blocked)
           std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
       }
 
@@ -189,7 +189,7 @@ void dependencyChainOnComplete (Task& task)
         {
           left.removeDependency (task.id);
 
-          for (auto& right : blocking)
+          for (const auto& right : blocking)
             left.addDependency (right.id);
         }
 
@@ -218,7 +218,7 @@ void dependencyChainOnStart (Task& task)
       std::cout << format (STRING_DEPEND_BLOCKED, task.identifier ())
                 << '\n';
 
-      for (auto& b : blocking)
+      for (const auto& b : blocking)
         std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
     }
   }

From 3421f5bc18cc10c375fedc250cbd1768a888ffa7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 20:50:39 -0500
Subject: [PATCH 438/879] libshared: Updated to
 0dbe6c2818d4dc99f5d0089d6afb1559ed05ebf7

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index d009b1de6..0dbe6c281 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit d009b1de631c576510841593c85b257e96371b40
+Subproject commit 0dbe6c2818d4dc99f5d0089d6afb1559ed05ebf7

From e20fb95a4378473453dea533fa9db1ac207df91f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 20:53:16 -0500
Subject: [PATCH 439/879] Lexer: Migrated from ISO8601d to Datetime

---
 src/Lexer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 08771272f..76a2f1b28 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -28,6 +28,7 @@
 #include <Lexer.h>
 #include <algorithm>
 #include <ctype.h>
+#include <Datetime.h>
 #include <ISO8601.h>
 #include <utf8.h>
 
@@ -553,12 +554,12 @@ bool Lexer::isString (std::string& token, Lexer::Type& type, const std::string&
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::date
-//   <ISO8601d>
+//   <Datetime>
 bool Lexer::isDate (std::string& token, Lexer::Type& type)
 {
   // Try an ISO date parse.
   std::size_t iso_i = 0;
-  ISO8601d iso;
+  Datetime iso;
   if (iso.parse (_text.substr (_cursor), iso_i, Lexer::dateFormat))
   {
     type = Lexer::Type::date;

From 1571981b576c10c29b8904c8a1cddc653cdcada6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 21:43:43 -0500
Subject: [PATCH 440/879] Lexer: Migrated from ISO8601p to Duration

---
 src/Lexer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 76a2f1b28..bce96212c 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include <Datetime.h>
-#include <ISO8601.h>
+#include <Duration.h>
 #include <utf8.h>
 
 static const std::string uuid_pattern = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
@@ -573,21 +573,21 @@ bool Lexer::isDate (std::string& token, Lexer::Type& type)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::duration
-//   <ISO8601p> | <Duration>
+//   <Duration>
 bool Lexer::isDuration (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
 
   std::string extractedToken;
   Lexer::Type extractedType;
-  if (isOperator(extractedToken, extractedType))
+  if (isOperator (extractedToken, extractedType))
   {
     _cursor = marker;
     return false;
   }
 
   marker = 0;
-  ISO8601p iso;
+  Duration iso;
   if (iso.parse (_text.substr (_cursor), marker))
   {
     type = Lexer::Type::duration;

From dfde9ba4b8a16896960da080bbf3dd4746c0beda Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 21:44:07 -0500
Subject: [PATCH 441/879] Variant: Migraded from ISO8601d to Datetime

---
 src/Variant.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index 7e8b38d42..b955c1f9f 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -31,7 +31,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <Variant.h>
-#include <ISO8601.h>
 #include <Datetime.h>
 #include <Duration.h>
 #include <Lexer.h>
@@ -1872,7 +1871,7 @@ void Variant::cast (const enum type new_type)
     case type_date:
       {
         _date = 0;
-        ISO8601d iso;
+        Datetime iso;
         std::string::size_type pos = 0;
         if (iso.parse (_string, pos, dateFormat) &&
             pos == _string.length ())
@@ -1892,7 +1891,7 @@ void Variant::cast (const enum type new_type)
 
         if (dateFormat != "")
         {
-          _date = ISO8601d (_string, dateFormat).toEpoch ();
+          _date = Datetime (_string, dateFormat).toEpoch ();
           break;
         }
       }

From 6f727d3a391b8da36b1bf320c352e77c09ed0d1f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 21:46:05 -0500
Subject: [PATCH 442/879] Context: Eliminated ISO8601

---
 src/Context.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 54db88b8d..9c8713c2f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -39,7 +39,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Datetime.h>
-#include <ISO8601.h>
 #include <shared.h>
 #include <format.h>
 #include <main.h>
@@ -1030,7 +1029,6 @@ void Context::staticInitialization ()
 {
   CLI2::minimumMatchLength     = config.getInteger ("abbreviation.minimum");
   Lexer::minimumMatchLength    = config.getInteger ("abbreviation.minimum");
-  ISO8601d::minimumMatchLength = config.getInteger ("abbreviation.minimum");
 
   Task::defaultProject      = config.get ("default.project");
   Task::defaultDue          = config.get ("default.due");
@@ -1039,12 +1037,10 @@ void Context::staticInitialization ()
   Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
   Task::regex               = Variant::searchUsingRegex    = config.getBoolean ("regex");
   Lexer::dateFormat         = Variant::dateFormat          = config.get ("dateformat");
-  Datetime::isoEnabled      = ISO8601d::isoEnabled         = config.getBoolean ("date.iso");
+  Datetime::isoEnabled      = config.getBoolean ("date.iso");
 
   TDB2::debug_mode          = config.getBoolean ("debug");
 
-  ISO8601d::weekstart       = config.get ("weekstart");
-
   for (auto& rc : config)
   {
     if (rc.first.substr (0, 4) == "uda." &&

From c488e1d45cb638499f4769f644c1f3fe75d000eb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 21:49:38 -0500
Subject: [PATCH 443/879] Tests: Eliminated ISO8601p tests

---
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/iso8601p.t.cpp | 301 --------------------------------------------
 3 files changed, 1 insertion(+), 303 deletions(-)
 delete mode 100644 test/iso8601p.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 70082a941..ba11bf843 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -7,7 +7,6 @@ col.t
 dates.t
 eval.t
 iso8601d.t
-iso8601p.t
 lexer.t
 nibbler.t
 t.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2de4e7697..555c47a84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/iso8601p.t.cpp b/test/iso8601p.t.cpp
deleted file mode 100644
index 788528db7..000000000
--- a/test/iso8601p.t.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2017, Göteborg Bit Factory.
-//
-// 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <time.h>
-#include <test.h>
-#include <ISO8601.h>
-#include <Context.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-void testParse (
-  UnitTest& t,
-  const std::string& input,
-  int in_start,
-  int in_year,
-  int in_month,
-  int in_day,
-  int in_hours,
-  int in_minutes,
-  int in_seconds,
-  time_t in_period,
-  const std::string& output,
-  const std::string& vague)
-{
-  std::string label = std::string ("parse (\"") + input + "\") --> ";
-
-  ISO8601p iso;
-  std::string::size_type start = 0;
-
-  t.ok (iso.parse (input, start),                 label + "true");
-  t.is ((int) start,          in_start,           label + "[]");
-  t.is (iso._year,            in_year,            label + "_year");
-  t.is (iso._month,           in_month,           label + "_month");
-  t.is (iso._day,             in_day,             label + "_day");
-  t.is (iso._hours,           in_hours,           label + "_hours");
-  t.is (iso._minutes,         in_minutes,         label + "_minutes");
-  t.is (iso._seconds,         in_seconds,         label + "_seconds");
-  t.is ((size_t) iso._period, (size_t) in_period, label + "_period");
-  t.is (iso.format (),        output,             label + " format");
-  t.is (iso.formatVague (),   vague,              label + " formatVague");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (1487);
-
-  ISO8601p iso;
-  std::string::size_type start = 0;
-  t.notok (iso.parse ("foo", start), "foo --> false");
-  t.is ((int)start, 0,               "foo[0]");
-
-  t.notok (iso.parse ("P", start),   "P --> false");
-  t.is ((int)start, 0,               "P[0]");
-
-  t.notok (iso.parse ("PT", start),  "PT --> false");
-  t.is ((int)start, 0,               "PT[0]");
-
-  t.notok (iso.parse ("P1", start),  "P1 --> false");
-  t.is ((int)start, 0,               "P1[0]");
-
-  t.notok (iso.parse ("P1T", start), "P1T --> false");
-  t.is ((int)start, 0,               "P1T[0]");
-
-  t.notok (iso.parse ("PT1", start), "PT1 --> false");
-  t.is ((int)start, 0,               "PT1[0]");
-
-  int year  = 365 * 86400;
-  int month =  30 * 86400;
-  int day   =       86400;
-  int h     =        3600;
-  int m     =          60;
-
-  // Designated.
-  //            input              i  Year  Mo   Da  Ho  Mi         Se                           time_t           format     vague
-  testParse (t, "P1Y",             3,    1,  0,   0,  0,  0,         0,                            year,          "P365D",   "1.0y");
-  testParse (t, "P1M",             3,    0,  1,   0,  0,  0,         0,                           month,           "P30D",     "4w");
-  testParse (t, "P1D",             3,    0,  0,   1,  0,  0,         0,                             day,            "P1D",     "1d");
-  testParse (t, "P1Y1M",           5,    1,  1,   0,  0,  0,         0,                    year + month,          "P395D",   "1.1y");
-  testParse (t, "P1Y1D",           5,    1,  0,   1,  0,  0,         0,                      year + day,          "P366D",   "1.0y");
-  testParse (t, "P1M1D",           5,    0,  1,   1,  0,  0,         0,                     month + day,           "P31D",     "4w");
-  testParse (t, "P1Y1M1D",         7,    1,  1,   1,  0,  0,         0,              year + month + day,          "P396D",   "1.1y");
-  testParse (t, "PT1H",            4,    0,  0,   0,  1,  0,         0,                               h,           "PT1H",     "1h");
-  testParse (t, "PT1M",            4,    0,  0,   0,  0,  1,         0,                               m,           "PT1M",   "1min");
-  testParse (t, "PT1S",            4,    0,  0,   0,  0,  0,         1,                               1,           "PT1S",     "1s");
-  testParse (t, "PT1H1M",          6,    0,  0,   0,  1,  1,         0,                           h + m,         "PT1H1M",     "1h");
-  testParse (t, "PT1H1S",          6,    0,  0,   0,  1,  0,         1,                           h + 1,         "PT1H1S",     "1h");
-  testParse (t, "PT1M1S",          6,    0,  0,   0,  0,  1,         1,                           m + 1,         "PT1M1S",   "1min");
-  testParse (t, "PT1H1M1S",        8,    0,  0,   0,  1,  1,         1,                       h + m + 1,       "PT1H1M1S",     "1h");
-  testParse (t, "P1Y1M1DT1H1M1S", 14,    1,  1,   1,  1,  1,         1,  year + month + day + h + m + 1,   "P396DT1H1M1S",   "1.1y");
-  testParse (t, "PT24H",           5,    0,  0,   0, 24,  0,         0,                             day,            "P1D",     "1d");
-  testParse (t, "PT40000000S",    11,    0,  0,   0,  0,  0,  40000000,                        40000000, "P462DT23H6M40S",   "1.3y");
-  testParse (t, "PT3600S",         7,    0,  0,   0,  0,  0,      3600,                               h,           "PT1H",     "1h");
-  testParse (t, "PT60M",           5,    0,  0,   0,  0, 60,         0,                               h,           "PT1H",     "1h");
-
-  testParse (t, "0seconds",        8,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 seconds",       9,    0,  0,   0,  0,  0,         0,                               2,           "PT2S",     "2s");
-  testParse (t, "10seconds",       9,    0,  0,   0,  0,  0,         0,                              10,          "PT10S",    "10s");
-  testParse (t, "1.5seconds",     10,    0,  0,   0,  0,  0,         0,                               1,           "PT1S",     "1s");
-
-  testParse (t, "0second",         7,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 second",        8,    0,  0,   0,  0,  0,         0,                               2,           "PT2S",     "2s");
-  testParse (t, "10second",        8,    0,  0,   0,  0,  0,         0,                              10,          "PT10S",    "10s");
-  testParse (t, "1.5second",       9,    0,  0,   0,  0,  0,         0,                               1,           "PT1S",     "1s");
-
-  testParse (t, "0s",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 s",             3,    0,  0,   0,  0,  0,         0,                               2,           "PT2S",     "2s");
-  testParse (t, "10s",             3,    0,  0,   0,  0,  0,         0,                              10,          "PT10S",    "10s");
-  testParse (t, "1.5s",            4,    0,  0,   0,  0,  0,         0,                               1,           "PT1S",     "1s");
-
-  testParse (t, "0minutes",        8,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 minutes",       9,    0,  0,   0,  0,  0,         0,                           2 * m,           "PT2M",   "2min");
-  testParse (t, "10minutes",       9,    0,  0,   0,  0,  0,         0,                          10 * m,          "PT10M",  "10min");
-  testParse (t, "1.5minutes",     10,    0,  0,   0,  0,  0,         0,                          m + 30,        "PT1M30S",   "1min");
-
-  testParse (t, "0minute",         7,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 minute",        8,    0,  0,   0,  0,  0,         0,                           2 * m,           "PT2M",   "2min");
-  testParse (t, "10minute",        8,    0,  0,   0,  0,  0,         0,                          10 * m,          "PT10M",  "10min");
-  testParse (t, "1.5minute",       9,    0,  0,   0,  0,  0,         0,                          m + 30,        "PT1M30S",   "1min");
-
-  testParse (t, "0min",            4,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 min",           5,    0,  0,   0,  0,  0,         0,                           2 * m,           "PT2M",   "2min");
-  testParse (t, "10min",           5,    0,  0,   0,  0,  0,         0,                          10 * m,          "PT10M",  "10min");
-  testParse (t, "1.5min",          6,    0,  0,   0,  0,  0,         0,                          m + 30,        "PT1M30S",   "1min");
-
-  testParse (t, "0hours",          6,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 hours",         7,    0,  0,   0,  0,  0,         0,                           2 * h,           "PT2H",     "2h");
-  testParse (t, "10hours",         7,    0,  0,   0,  0,  0,         0,                          10 * h,          "PT10H",    "10h");
-  testParse (t, "1.5hours",        8,    0,  0,   0,  0,  0,         0,                      h + 30 * m,        "PT1H30M",     "1h");
-
-  testParse (t, "0hour",           5,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 hour",          6,    0,  0,   0,  0,  0,         0,                           2 * h,           "PT2H",     "2h");
-  testParse (t, "10hour",          6,    0,  0,   0,  0,  0,         0,                          10 * h,          "PT10H",    "10h");
-  testParse (t, "1.5hour",         7,    0,  0,   0,  0,  0,         0,                      h + 30 * m,        "PT1H30M",     "1h");
-
-  testParse (t, "0h",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 h",             3,    0,  0,   0,  0,  0,         0,                           2 * h,           "PT2H",     "2h");
-  testParse (t, "10h",             3,    0,  0,   0,  0,  0,         0,                          10 * h,          "PT10H",    "10h");
-  testParse (t, "1.5h",            4,    0,  0,   0,  0,  0,         0,                      h + 30 * m,        "PT1H30M",     "1h");
-
-  testParse (t, "weekdays",        8,    0,  0,   0,  0,  0,         0,                             day,            "P1D",     "1d");
-
-  testParse (t, "daily",           5,    0,  0,   0,  0,  0,         0,                             day,            "P1D",     "1d");
-
-  testParse (t, "0days",           5,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 days",          6,    0,  0,   0,  0,  0,         0,                         2 * day,            "P2D",     "2d");
-  testParse (t, "10days",          6,    0,  0,   0,  0,  0,         0,                        10 * day,           "P10D",    "10d");
-  testParse (t, "1.5days",         7,    0,  0,   0,  0,  0,         0,                    day + 12 * h,        "P1DT12H",     "1d");
-
-  testParse (t, "0day",            4,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 day",           5,    0,  0,   0,  0,  0,         0,                         2 * day,            "P2D",     "2d");
-  testParse (t, "10day",           5,    0,  0,   0,  0,  0,         0,                        10 * day,           "P10D",    "10d");
-  testParse (t, "1.5day",          6,    0,  0,   0,  0,  0,         0,                    day + 12 * h,        "P1DT12H",     "1d");
-
-  testParse (t, "0d",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 d",             3,    0,  0,   0,  0,  0,         0,                         2 * day,            "P2D",     "2d");
-  testParse (t, "10d",             3,    0,  0,   0,  0,  0,         0,                        10 * day,           "P10D",    "10d");
-  testParse (t, "1.5d",            4,    0,  0,   0,  0,  0,         0,                    day + 12 * h,        "P1DT12H",     "1d");
-
-  testParse (t, "weekly",          6,    0,  0,   0,  0,  0,         0,                         7 * day,            "P7D",     "7d");
-
-  testParse (t, "0weeks",          6,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 weeks",         7,    0,  0,   0,  0,  0,         0,                        14 * day,           "P14D",     "2w");
-  testParse (t, "10weeks",         7,    0,  0,   0,  0,  0,         0,                        70 * day,           "P70D",    "10w");
-  testParse (t, "1.5weeks",        8,    0,  0,   0,  0,  0,         0,               10 * day + 12 * h,       "P10DT12H",    "10d");
-
-  testParse (t, "0week",           5,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 week",          6,    0,  0,   0,  0,  0,         0,                        14 * day,           "P14D",     "2w");
-  testParse (t, "10week",          6,    0,  0,   0,  0,  0,         0,                        70 * day,           "P70D",    "10w");
-  testParse (t, "1.5week",         7,    0,  0,   0,  0,  0,         0,               10 * day + 12 * h,       "P10DT12H",    "10d");
-
-  testParse (t, "0w",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 w",             3,    0,  0,   0,  0,  0,         0,                        14 * day,           "P14D",     "2w");
-  testParse (t, "10w",             3,    0,  0,   0,  0,  0,         0,                        70 * day,           "P70D",    "10w");
-  testParse (t, "1.5w",            4,    0,  0,   0,  0,  0,         0,               10 * day + 12 * h,       "P10DT12H",    "10d");
-
-  testParse (t, "monthly",         7,    0,  0,   0,  0,  0,         0,                        30 * day,           "P30D",     "4w");
-
-  testParse (t, "0months",         7,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 months",        8,    0,  0,   0,  0,  0,         0,                        60 * day,           "P60D",     "8w");
-  testParse (t, "10months",        8,    0,  0,   0,  0,  0,         0,                       300 * day,          "P300D",   "10mo");
-  testParse (t, "1.5months",       9,    0,  0,   0,  0,  0,         0,                        45 * day,           "P45D",     "6w");
-
-  testParse (t, "0month",          6,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 month",         7,    0,  0,   0,  0,  0,         0,                        60 * day,           "P60D",     "8w");
-  testParse (t, "10month",         7,    0,  0,   0,  0,  0,         0,                       300 * day,          "P300D",   "10mo");
-  testParse (t, "1.5month",        8,    0,  0,   0,  0,  0,         0,                        45 * day,           "P45D",     "6w");
-
-  testParse (t, "0mo",             3,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 mo",            4,    0,  0,   0,  0,  0,         0,                        60 * day,           "P60D",     "8w");
-  testParse (t, "10mo",            4,    0,  0,   0,  0,  0,         0,                       300 * day,          "P300D",   "10mo");
-  testParse (t, "1.5mo",           5,    0,  0,   0,  0,  0,         0,                        45 * day,           "P45D",     "6w");
-
-  testParse (t, "quarterly",       9,    0,  0,   0,  0,  0,         0,                        91 * day,           "P91D",    "3mo");
-
-  testParse (t, "0quarters",       9,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 quarters",     10,    0,  0,   0,  0,  0,         0,                       182 * day,          "P182D",    "6mo");
-  testParse (t, "10quarters",     10,    0,  0,   0,  0,  0,         0,                       910 * day,          "P910D",   "2.5y");
-  testParse (t, "1.5quarters",    11,    0,  0,   0,  0,  0,         0,              136 * day + 12 * h,      "P136DT12H",    "4mo");
-
-  testParse (t, "0quarter",        8,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 quarter",       9,    0,  0,   0,  0,  0,         0,                       182 * day,          "P182D",    "6mo");
-  testParse (t, "10quarter",       9,    0,  0,   0,  0,  0,         0,                       910 * day,          "P910D",   "2.5y");
-  testParse (t, "1.5quarter",     10,    0,  0,   0,  0,  0,         0,              136 * day + 12 * h,      "P136DT12H",    "4mo");
-
-  testParse (t, "0q",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 q",             3,    0,  0,   0,  0,  0,         0,                       182 * day,          "P182D",    "6mo");
-  testParse (t, "10q",             3,    0,  0,   0,  0,  0,         0,                       910 * day,          "P910D",   "2.5y");
-  testParse (t, "1.5q",            4,    0,  0,   0,  0,  0,         0,              136 * day + 12 * h,      "P136DT12H",    "4mo");
-
-  testParse (t, "yearly",          6,    0,  0,   0,  0,  0,         0,                            year,          "P365D",   "1.0y");
-
-  testParse (t, "0years",          6,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 years",         7,    0,  0,   0,  0,  0,         0,                        2 * year,          "P730D",   "2.0y");
-  testParse (t, "10years",         7,    0,  0,   0,  0,  0,         0,                       10 * year,         "P3650D",  "10.0y");
-  testParse (t, "1.5years",        8,    0,  0,   0,  0,  0,         0,              547 * day + 12 * h,      "P547DT12H",   "1.5y");
-
-  testParse (t, "0year",           5,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 year",          6,    0,  0,   0,  0,  0,         0,                        2 * year,          "P730D",   "2.0y");
-  testParse (t, "10year",          6,    0,  0,   0,  0,  0,         0,                       10 * year,         "P3650D",  "10.0y");
-  testParse (t, "1.5year",         7,    0,  0,   0,  0,  0,         0,              547 * day + 12 * h,      "P547DT12H",   "1.5y");
-
-  testParse (t, "0y",              2,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 y",             3,    0,  0,   0,  0,  0,         0,                        2 * year,          "P730D",   "2.0y");
-  testParse (t, "10y",             3,    0,  0,   0,  0,  0,         0,                       10 * year,         "P3650D",  "10.0y");
-  testParse (t, "1.5y",            4,    0,  0,   0,  0,  0,         0,              547 * day + 12 * h,      "P547DT12H",   "1.5y");
-
-  testParse (t, "annual",          6,    0,  0,   0,  0,  0,         0,                            year,          "P365D",   "1.0y");
-  testParse (t, "biannual",        8,    0,  0,   0,  0,  0,         0,                        2 * year,          "P730D",   "2.0y");
-  testParse (t, "bimonthly",       9,    0,  0,   0,  0,  0,         0,                        61 * day,           "P61D",     "8w");
-  testParse (t, "biweekly",        8,    0,  0,   0,  0,  0,         0,                        14 * day,           "P14D",     "2w");
-  testParse (t, "biyearly",        8,    0,  0,   0,  0,  0,         0,                        2 * year,          "P730D",   "2.0y");
-  testParse (t, "fortnight",       9,    0,  0,   0,  0,  0,         0,                        14 * day,           "P14D",     "2w");
-  testParse (t, "semiannual",     10,    0,  0,   0,  0,  0,         0,                       183 * day,          "P183D",    "6mo");
-
-  testParse (t, "0sennight",       9,    0,  0,   0,  0,  0,         0,                               0,           "PT0S",       "");
-  testParse (t, "2 sennight",     10,    0,  0,   0,  0,  0,         0,                        28 * day,           "P28D",     "4w");
-  testParse (t, "10sennight",     10,    0,  0,   0,  0,  0,         0,                       140 * day,          "P140D",    "4mo");
-  testParse (t, "1.5sennight",    11,    0,  0,   0,  0,  0,         0,                        21 * day,           "P21D",     "3w");
-
-  ISO8601p left, right;
-
-  // operator<
-  left = ISO8601p ("1s");     right = ISO8601p ("2s");     t.ok (left < right, "iso8601p 1s < 2s");
-  left = ISO8601p ("-2s");    right = ISO8601p ("-1s");    t.ok (left < right, "iso8601p -2s < -1s");
-  left = ISO8601p ("1s");     right = ISO8601p ("1min");   t.ok (left < right, "iso8601p 1s < 1min");
-  left = ISO8601p ("1min");   right = ISO8601p ("1h");     t.ok (left < right, "iso8601p 1min < 1h");
-  left = ISO8601p ("1h");     right = ISO8601p ("1d");     t.ok (left < right, "iso8601p 1h < 1d");
-  left = ISO8601p ("1d");     right = ISO8601p ("1w");     t.ok (left < right, "iso8601p 1d < 1w");
-  left = ISO8601p ("1w");     right = ISO8601p ("1mo");    t.ok (left < right, "iso8601p 1w < 1mo");
-  left = ISO8601p ("1mo");    right = ISO8601p ("1q");     t.ok (left < right, "iso8601p 1mo < 1q");
-  left = ISO8601p ("1q");     right = ISO8601p ("1y");     t.ok (left < right, "iso8601p 1q < 1y");
-  left = ISO8601p ("-3s");    right = ISO8601p ("-6s");    t.ok (right < left, "iso8601p -6s < -3s");
-
-  // operator>
-  left = ISO8601p ("2s");     right = ISO8601p ("1s");     t.ok (left > right, "iso8601p 2s > 1s");
-  left = ISO8601p ("-1s");    right = ISO8601p ("-2s");    t.ok (left > right, "iso8601p -1s > -2s");
-  left = ISO8601p ("1min");   right = ISO8601p ("1s");     t.ok (left > right, "iso8601p 1min > 1s");
-  left = ISO8601p ("1h");     right = ISO8601p ("1min");   t.ok (left > right, "iso8601p 1h > 1min");
-  left = ISO8601p ("1d");     right = ISO8601p ("1h");     t.ok (left > right, "iso8601p 1d > 1h");
-  left = ISO8601p ("1w");     right = ISO8601p ("1d");     t.ok (left > right, "iso8601p 1w > 1d");
-  left = ISO8601p ("1mo");    right = ISO8601p ("1w");     t.ok (left > right, "iso8601p 1mo > 1w");
-  left = ISO8601p ("1q");     right = ISO8601p ("1mo");    t.ok (left > right, "iso8601p 1q > 1mo");
-  left = ISO8601p ("1y");     right = ISO8601p ("1q");     t.ok (left > right, "iso8601p 1y > 1q");
-  left = ISO8601p ("-3s");    right = ISO8601p ("-6s");    t.ok (left > right, "iso8601p -3s > -6s");
-
-  // operator<=
-  left = ISO8601p ("1s");     right = ISO8601p ("2s");     t.ok (left <= right, "iso8601p 1s <= 2s");
-  left = ISO8601p ("2s");     right = ISO8601p ("2s");     t.ok (left <= right, "iso8601p 1s <= 2s");
-  left = ISO8601p ("2s");     right = ISO8601p ("1s");     t.notok (left <= right, "iso8601p NOT 1s <= 2s");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From c5f5b4a1f0cde8dbabb53304daf368c59af2eed7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 22:16:36 -0500
Subject: [PATCH 444/879] Tests: Eliminated ISO8601d tests

---
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/iso8601d.t.cpp | 707 --------------------------------------------
 3 files changed, 1 insertion(+), 709 deletions(-)
 delete mode 100644 test/iso8601d.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index ba11bf843..46f48742b 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -6,7 +6,6 @@
 col.t
 dates.t
 eval.t
-iso8601d.t
 lexer.t
 nibbler.t
 t.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 555c47a84..56dd7cf96 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t iso8601d.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/iso8601d.t.cpp b/test/iso8601d.t.cpp
deleted file mode 100644
index efaa312f9..000000000
--- a/test/iso8601d.t.cpp
+++ /dev/null
@@ -1,707 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2017, Göteborg Bit Factory.
-//
-// 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <time.h>
-#include <test.h>
-#include <ISO8601.h>
-#include <Context.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-void testParse (
-  UnitTest& t,
-  const std::string& input,
-  int in_start,
-  int in_year,
-  int in_month,
-  int in_week,
-  int in_weekday,
-  int in_julian,
-  int in_day,
-  int in_seconds,
-  int in_offset,
-  bool in_utc,
-  time_t in_date)
-{
-  std::string label = std::string ("parse (\"") + input + "\") --> ";
-
-  ISO8601d iso;
-  std::string::size_type start = 0;
-
-  t.ok (iso.parse (input, start),             label + "true");
-  t.is ((int) start,        in_start,         label + "[]");
-  t.is (iso._year,          in_year,          label + "_year");
-  t.is (iso._month,         in_month,         label + "_month");
-  t.is (iso._week,          in_week,          label + "_week");
-  t.is (iso._weekday,       in_weekday,       label + "_weekday");
-  t.is (iso._julian,        in_julian,        label + "_julian");
-  t.is (iso._day,           in_day,           label + "_day");
-  t.is (iso._seconds,       in_seconds,       label + "_seconds");
-  t.is (iso._offset,        in_offset,        label + "_offset");
-  t.is (iso._utc,           in_utc,           label + "_utc");
-  t.is ((size_t) iso._date, (size_t) in_date, label + "_date");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-#ifdef PRODUCT_TASKWARRIOR
-  UnitTest t (1032);
-#else
-  UnitTest t (1003);
-#endif
-
-  ISO8601d iso;
-  std::string::size_type start = 0;
-  t.notok (iso.parse ("foo", start), "foo --> false");
-  t.is ((int)start, 0,               "foo[0]");
-
-  // Determine local and UTC time.
-  time_t now = time (NULL);
-  struct tm* local_now = localtime (&now);
-  int local_s = (local_now->tm_hour * 3600) +
-                (local_now->tm_min  * 60)   +
-                local_now->tm_sec;
-  local_now->tm_hour  = 0;
-  local_now->tm_min   = 0;
-  local_now->tm_sec   = 0;
-  local_now->tm_isdst = -1;
-  time_t local = mktime (local_now);
-  std::cout << "# local midnight today " << local << "\n";
-
-  local_now->tm_year  = 2013 - 1900;
-  local_now->tm_mon   = 12 - 1;
-  local_now->tm_mday  = 6;
-  local_now->tm_isdst = 0;
-  time_t local6 = mktime (local_now);
-  std::cout << "# local midnight 2013-12-06 " << local6 << "\n";
-
-  local_now->tm_year  = 2013 - 1900;
-  local_now->tm_mon   = 12 - 1;
-  local_now->tm_mday  = 1;
-  local_now->tm_isdst = 0;
-  time_t local1 = mktime (local_now);
-  std::cout << "# local midnight 2013-12-01 " << local1 << "\n";
-
-  struct tm* utc_now = gmtime (&now);
-  int utc_s = (utc_now->tm_hour * 3600) +
-              (utc_now->tm_min  * 60)   +
-              utc_now->tm_sec;
-  utc_now->tm_hour  = 0;
-  utc_now->tm_min   = 0;
-  utc_now->tm_sec   = 0;
-  utc_now->tm_isdst = -1;
-  time_t utc = timegm (utc_now);
-  std::cout << "# utc midnight today " << utc << "\n";
-
-  utc_now->tm_year  = 2013 - 1900;
-  utc_now->tm_mon   = 12 - 1;
-  utc_now->tm_mday  = 6;
-  utc_now->tm_isdst = 0;
-  time_t utc6 = timegm (utc_now);
-  std::cout << "# utc midnight 2013-12-06 " << utc6 << "\n";
-
-  utc_now->tm_year  = 2013 - 1900;
-  utc_now->tm_mon   = 12 - 1;
-  utc_now->tm_mday  = 1;
-  utc_now->tm_isdst = 0;
-  time_t utc1 = timegm (utc_now);
-  std::cout << "# utc midnight 2013-12-01 " << utc1 << "\n";
-
-  int hms = (12 * 3600) + (34 * 60) + 56; // The time 12:34:56 in seconds.
-  int hm  = (12 * 3600) + (34 * 60);      // The time 12:34:00 in seconds.
-  int z   = 3600;                         // TZ offset.
-
-  int ld = local_s > hms ? 86400 : 0;     // Local extra day if now > hms.
-  int ud = utc_s   > hms ? 86400 : 0;     // UTC extra day if now > hms.
-  std::cout << "# ld " << ld << "\n";
-  std::cout << "# ud " << ud << "\n";
-
-  // Aggregated.
-  //            input                         i  Year  Mo  Wk WD  Jul  Da   Secs     TZ    UTC      time_t
-  testParse (t, "12:34:56  ",                 8,    0,  0,  0, 0,   0,  0,   hms,     0, false, local+hms+ld );
-
-  // time-ext
-  //            input                         i  Year  Mo  Wk WD  Jul  Da   Secs     TZ    UTC      time_t
-  testParse (t, "12:34:56Z",                  9,    0,  0,  0, 0,   0,  0,   hms,     0,  true, utc+hms+ud   );
-  testParse (t, "12:34Z",                     6,    0,  0,  0, 0,   0,  0,    hm,     0,  true, utc+hm+ud    );
-  testParse (t, "12:34:56+01:00",            14,    0,  0,  0, 0,   0,  0,   hms,  3600, false, utc+hms-z+ud );
-  testParse (t, "12:34:56+01",               11,    0,  0,  0, 0,   0,  0,   hms,  3600, false, utc+hms-z+ud );
-  testParse (t, "12:34+01:00",               11,    0,  0,  0, 0,   0,  0,    hm,  3600, false, utc+hm-z+ud  );
-  testParse (t, "12:34+01",                   8,    0,  0,  0, 0,   0,  0,    hm,  3600, false, utc+hm-z+ud  );
-  testParse (t, "12:34:56",                   8,    0,  0,  0, 0,   0,  0,   hms,     0, false, local+hms+ld );
-  testParse (t, "12:34",                      5,    0,  0,  0, 0,   0,  0,    hm,     0, false, local+hm+ld  );
-
-  // datetime-ext
-  //            input                         i  Year  Mo  Wk WD  Jul  Da   Secs     TZ    UTC      time_t
-  testParse (t, "2013-12-06",                10, 2013, 12,  0, 0,   0,  6,     0,     0, false, local6    );
-  testParse (t, "2013-340",                   8, 2013,  0,  0, 0, 340,  0,     0,     0, false, local6    );
-  testParse (t, "2013-W49-5",                10, 2013,  0, 49, 5,   0,  0,     0,     0, false, local6    );
-  testParse (t, "2013-W49",                   8, 2013,  0, 49, 0,   0,  0,     0,     0, false, local1    );
-
-  testParse (t, "2013-12-06T12:34:56",       19, 2013, 12,  0, 0,   0,  6,   hms,     0, false, local6+hms);
-  testParse (t, "2013-12-06T12:34",          16, 2013, 12,  0, 0,   0,  6,    hm,     0, false, local6+hm );
-  testParse (t, "2013-340T12:34:56",         17, 2013,  0,  0, 0, 340,  0,   hms,     0, false, local6+hms);
-  testParse (t, "2013-340T12:34",            14, 2013,  0,  0, 0, 340,  0,    hm,     0, false, local6+hm );
-  testParse (t, "2013-W49-5T12:34:56",       19, 2013,  0, 49, 5,   0,  0,   hms,     0, false, local6+hms);
-  testParse (t, "2013-W49-5T12:34",          16, 2013,  0, 49, 5,   0,  0,    hm,     0, false, local6+hm );
-  testParse (t, "2013-W49T12:34:56",         17, 2013,  0, 49, 0,   0,  0,   hms,     0, false, local1+hms);
-  testParse (t, "2013-W49T12:34",            14, 2013,  0, 49, 0,   0,  0,    hm,     0, false, local1+hm );
-
-  testParse (t, "2013-12-06T12:34:56Z",      20, 2013, 12,  0, 0,   0,  6,   hms,     0,  true, utc6+hms  );
-  testParse (t, "2013-12-06T12:34Z",         17, 2013, 12,  0, 0,   0,  6,    hm,     0,  true, utc6+hm   );
-  testParse (t, "2013-340T12:34:56Z",        18, 2013,  0,  0, 0, 340,  0,   hms,     0,  true, utc6+hms  );
-  testParse (t, "2013-340T12:34Z",           15, 2013,  0,  0, 0, 340,  0,    hm,     0,  true, utc6+hm   );
-  testParse (t, "2013-W49-5T12:34:56Z",      20, 2013,  0, 49, 5,   0,  0,   hms,     0,  true, utc6+hms  );
-  testParse (t, "2013-W49-5T12:34Z",         17, 2013,  0, 49, 5,   0,  0,    hm,     0,  true, utc6+hm   );
-  testParse (t, "2013-W49T12:34:56Z",        18, 2013,  0, 49, 0,   0,  0,   hms,     0,  true, utc1+hms  );
-  testParse (t, "2013-W49T12:34Z",           15, 2013,  0, 49, 0,   0,  0,    hm,     0,  true, utc1+hm   );
-
-  testParse (t, "2013-12-06T12:34:56+01:00", 25, 2013, 12,  0, 0,   0,  6,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-12-06T12:34:56+01",    22, 2013, 12,  0, 0,   0,  6,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-12-06T12:34:56-01:00", 25, 2013, 12,  0, 0,   0,  6,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-12-06T12:34:56-01",    22, 2013, 12,  0, 0,   0,  6,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-12-06T12:34+01:00",    22, 2013, 12,  0, 0,   0,  6,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-12-06T12:34+01",       19, 2013, 12,  0, 0,   0,  6,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-12-06T12:34-01:00",    22, 2013, 12,  0, 0,   0,  6,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-12-06T12:34-01",       19, 2013, 12,  0, 0,   0,  6,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-340T12:34:56+01:00",   23, 2013,  0,  0, 0, 340,  0,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-340T12:34:56+01",      20, 2013,  0,  0, 0, 340,  0,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-340T12:34:56-01:00",   23, 2013,  0,  0, 0, 340,  0,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-340T12:34:56-01",      20, 2013,  0,  0, 0, 340,  0,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-340T12:34+01:00",      20, 2013,  0,  0, 0, 340,  0,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-340T12:34+01",         17, 2013,  0,  0, 0, 340,  0,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-340T12:34-01:00",      20, 2013,  0,  0, 0, 340,  0,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-340T12:34-01",         17, 2013,  0,  0, 0, 340,  0,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-W49-5T12:34:56+01:00", 25, 2013,  0, 49, 5,   0,  0,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-W49-5T12:34:56+01",    22, 2013,  0, 49, 5,   0,  0,   hms,  3600, false, utc6+hms-z);
-  testParse (t, "2013-W49-5T12:34:56-01:00", 25, 2013,  0, 49, 5,   0,  0,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-W49-5T12:34:56-01",    22, 2013,  0, 49, 5,   0,  0,   hms, -3600, false, utc6+hms+z);
-  testParse (t, "2013-W49-5T12:34+01:00",    22, 2013,  0, 49, 5,   0,  0,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-W49-5T12:34+01",       19, 2013,  0, 49, 5,   0,  0,    hm,  3600, false, utc6+hm-z );
-  testParse (t, "2013-W49-5T12:34-01:00",    22, 2013,  0, 49, 5,   0,  0,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-W49-5T12:34-01",       19, 2013,  0, 49, 5,   0,  0,    hm, -3600, false, utc6+hm+z );
-  testParse (t, "2013-W49T12:34:56+01:00",   23, 2013,  0, 49, 0,   0,  0,   hms,  3600, false, utc1+hms-z);
-  testParse (t, "2013-W49T12:34:56+01",      20, 2013,  0, 49, 0,   0,  0,   hms,  3600, false, utc1+hms-z);
-  testParse (t, "2013-W49T12:34:56-01:00",   23, 2013,  0, 49, 0,   0,  0,   hms, -3600, false, utc1+hms+z);
-  testParse (t, "2013-W49T12:34:56-01",      20, 2013,  0, 49, 0,   0,  0,   hms, -3600, false, utc1+hms+z);
-  testParse (t, "2013-W49T12:34+01:00",      20, 2013,  0, 49, 0,   0,  0,    hm,  3600, false, utc1+hm-z );
-  testParse (t, "2013-W49T12:34+01",         17, 2013,  0, 49, 0,   0,  0,    hm,  3600, false, utc1+hm-z );
-  testParse (t, "2013-W49T12:34-01:00",      20, 2013,  0, 49, 0,   0,  0,    hm, -3600, false, utc1+hm+z );
-  testParse (t, "2013-W49T12:34-01",         17, 2013,  0, 49, 0,   0,  0,    hm, -3600, false, utc1+hm+z );
-
-  // The only non-extended forms.
-  testParse (t, "20131206T123456Z",          16, 2013, 12,  0, 0,   0,  6,   hms,     0,  true, utc6+hms  );
-  testParse (t, "20131206T123456",           15, 2013, 12,  0, 0,   0,  6,   hms,     0, false, local6+hms);
-
-  try
-  {
-    ISO8601d now;
-    t.ok (now.toISO ().find ("1969") == std::string::npos, "'now' != 1969");
-
-    ISO8601d yesterday;
-    yesterday -= 86400;
-    ISO8601d tomorrow;
-    tomorrow += 86400;
-
-    t.ok    (yesterday <= now,       "yesterday <= now");
-    t.ok    (yesterday <  now,       "yesterday < now");
-    t.notok (yesterday == now,       "!(yesterday == now)");
-    t.ok    (yesterday != now,       "yesterday != now");
-    t.ok    (now       >= yesterday, "now >= yesterday");
-    t.ok    (now       >  yesterday, "now > yesterday");
-
-    t.ok    (tomorrow >= now,        "tomorrow >= now");
-    t.ok    (tomorrow >  now,        "tomorrow > now");
-    t.notok (tomorrow == now,        "!(tomorrow == now)");
-    t.ok    (tomorrow != now,        "tomorrow != now");
-    t.ok    (now      <= tomorrow,   "now <= tomorrow");
-    t.ok    (now      <  tomorrow,   "now < tomorrow");
-
-    // ctor ("now")
-    context.config.set ("weekstart", "monday");
-    ISO8601d relative_now;
-    t.ok (relative_now.sameHour (now),  "ISO8601d ().sameHour (ISO8601d (now))");
-    t.ok (relative_now.sameDay (now),   "ISO8601d ().sameDay (ISO8601d (now))");
-    t.ok (relative_now.sameWeek (now),  "ISO8601d ().sameWeek (ISO8601d (now))");
-    t.ok (relative_now.sameMonth (now), "ISO8601d ().sameMonth (ISO8601d (now))");
-    t.ok (relative_now.sameYear (now),  "ISO8601d ().sameYear (ISO8601d (now))");
-
-    // Loose comparisons.
-    ISO8601d left ("7/4/2008", "m/d/Y");
-    ISO8601d comp1 ("7/4/2008", "m/d/Y");
-    t.ok (left.sameDay     (comp1), "7/4/2008 is on the same day as 7/4/2008");
-    t.ok (left.sameWeek    (comp1), "7/4/2008 is on the same week as 7/4/2008");
-    t.ok (left.sameMonth   (comp1), "7/4/2008 is in the same month as 7/4/2008");
-    t.ok (left.sameQuarter (comp1), "7/4/2008 is in the same quarter as 7/4/2008");
-    t.ok (left.sameYear    (comp1), "7/4/2008 is in the same year as 7/4/2008");
-
-    ISO8601d comp2 ("7/5/2008", "m/d/Y");
-    t.notok (left.sameDay     (comp2), "7/4/2008 is not on the same day as 7/5/2008");
-    t.ok    (left.sameMonth   (comp2), "7/4/2008 is in the same month as 7/5/2008");
-    t.ok    (left.sameQuarter (comp2), "7/4/2008 is in the same quarter as 7/5/2008");
-    t.ok    (left.sameYear    (comp2), "7/4/2008 is in the same year as 7/5/2008");
-
-    ISO8601d comp3 ("8/4/2008", "m/d/Y");
-    t.notok (left.sameDay     (comp3), "7/4/2008 is not on the same day as 8/4/2008");
-    t.notok (left.sameWeek    (comp3), "7/4/2008 is not on the same week as 8/4/2008");
-    t.notok (left.sameMonth   (comp3), "7/4/2008 is not in the same month as 8/4/2008");
-    t.ok    (left.sameQuarter (comp3), "7/4/2008 is in the same quarter as 8/4/2008");
-    t.ok    (left.sameYear    (comp3), "7/4/2008 is in the same year as 8/4/2008");
-
-    ISO8601d comp4 ("7/4/2009", "m/d/Y");
-    t.notok (left.sameDay     (comp4), "7/4/2008 is not on the same day as 7/4/2009");
-    t.notok (left.sameWeek    (comp4), "7/4/2008 is not on the same week as 7/4/2009");
-    t.notok (left.sameMonth   (comp4), "7/4/2008 is not in the same month as 7/4/2009");
-    t.notok (left.sameQuarter (comp4), "7/4/2008 is not in the same quarter as 7/4/2009");
-    t.notok (left.sameYear    (comp4), "7/4/2008 is not in the same year as 7/4/2009");
-
-    // Validity.
-    t.ok    (ISO8601d::valid (2, 29, 2008), "valid: 2/29/2008");
-    t.notok (ISO8601d::valid (2, 29, 2007), "invalid: 2/29/2007");
-
-    t.ok    (ISO8601d::valid ("2/29/2008", "m/d/Y"), "valid: 2/29/2008");
-    t.notok (ISO8601d::valid ("2/29/2007", "m/d/Y"), "invalid: 2/29/2007");
-
-    t.ok    (ISO8601d::valid (366, 2008), "valid: 366 days in 2008");
-    t.notok (ISO8601d::valid (366, 2007), "invalid: 366 days in 2007");
-
-    // Time validity.
-    t.ok    (ISO8601d::valid (2, 28, 2010,  0,  0,  0), "valid 2/28/2010 0:00:00");
-    t.ok    (ISO8601d::valid (2, 28, 2010, 23, 59, 59), "valid 2/28/2010 23:59:59");
-    t.notok (ISO8601d::valid (2, 28, 2010, 24, 59, 59), "valid 2/28/2010 24:59:59");
-    t.notok (ISO8601d::valid (2, 28, 2010, -1,  0,  0), "valid 2/28/2010 -1:00:00");
-
-    // Leap year.
-    t.ok    (ISO8601d::leapYear (2008), "2008 is a leap year");
-    t.notok (ISO8601d::leapYear (2007), "2007 is not a leap year");
-    t.ok    (ISO8601d::leapYear (2000), "2000 is a leap year");
-    t.notok (ISO8601d::leapYear (1900), "1900 is not a leap year");
-
-    // Days in year.
-    t.is (ISO8601d::daysInYear (2016), 366, "366 days in 2016");
-    t.is (ISO8601d::daysInYear (2015), 365, "365 days in 2015");
-
-    // Days in month.
-    t.is (ISO8601d::daysInMonth (2, 2008), 29, "29 days in February 2008");
-    t.is (ISO8601d::daysInMonth (2, 2007), 28, "28 days in February 2007");
-
-    // Names.
-    t.is (ISO8601d::monthName (1),  "January",   "1 = January");
-    t.is (ISO8601d::monthName (2),  "February",  "2 = February");
-    t.is (ISO8601d::monthName (3),  "March",     "3 = March");
-    t.is (ISO8601d::monthName (4),  "April",     "4 = April");
-    t.is (ISO8601d::monthName (5),  "May",       "5 = May");
-    t.is (ISO8601d::monthName (6),  "June",      "6 = June");
-    t.is (ISO8601d::monthName (7),  "July",      "7 = July");
-    t.is (ISO8601d::monthName (8),  "August",    "8 = August");
-    t.is (ISO8601d::monthName (9),  "September", "9 = September");
-    t.is (ISO8601d::monthName (10), "October",   "10 = October");
-    t.is (ISO8601d::monthName (11), "November",  "11 = November");
-    t.is (ISO8601d::monthName (12), "December",  "12 = December");
-
-    // Names.
-    t.is (ISO8601d::monthNameShort (1),  "Jan", "1 = Jan");
-    t.is (ISO8601d::monthNameShort (2),  "Feb", "2 = Feb");
-    t.is (ISO8601d::monthNameShort (3),  "Mar", "3 = Mar");
-    t.is (ISO8601d::monthNameShort (4),  "Apr", "4 = Apr");
-    t.is (ISO8601d::monthNameShort (5),  "May", "5 = May");
-    t.is (ISO8601d::monthNameShort (6),  "Jun", "6 = Jun");
-    t.is (ISO8601d::monthNameShort (7),  "Jul", "7 = Jul");
-    t.is (ISO8601d::monthNameShort (8),  "Aug", "8 = Aug");
-    t.is (ISO8601d::monthNameShort (9),  "Sep", "9 = Sep");
-    t.is (ISO8601d::monthNameShort (10), "Oct", "10 = Oct");
-    t.is (ISO8601d::monthNameShort (11), "Nov", "11 = Nov");
-    t.is (ISO8601d::monthNameShort (12), "Dec", "12 = Dec");
-
-    // Names.
-    t.is (ISO8601d::monthOfYear ("January"),   1,  "January   =  1");
-    t.is (ISO8601d::monthOfYear ("February"),  2,  "February  =  2");
-    t.is (ISO8601d::monthOfYear ("March"),     3,  "March     =  3");
-    t.is (ISO8601d::monthOfYear ("April"),     4,  "April     =  4");
-    t.is (ISO8601d::monthOfYear ("May"),       5,  "May       =  5");
-    t.is (ISO8601d::monthOfYear ("June"),      6,  "June      =  6");
-    t.is (ISO8601d::monthOfYear ("July"),      7,  "July      =  7");
-    t.is (ISO8601d::monthOfYear ("August"),    8,  "August    =  8");
-    t.is (ISO8601d::monthOfYear ("September"), 9,  "September =  9");
-    t.is (ISO8601d::monthOfYear ("October"),   10, "October   = 10");
-    t.is (ISO8601d::monthOfYear ("November"),  11, "November  = 11");
-    t.is (ISO8601d::monthOfYear ("December"),  12, "December  = 12");
-
-    t.is (ISO8601d::dayName (0), "Sunday",    "0 == Sunday");
-    t.is (ISO8601d::dayName (1), "Monday",    "1 == Monday");
-    t.is (ISO8601d::dayName (2), "Tuesday",   "2 == Tuesday");
-    t.is (ISO8601d::dayName (3), "Wednesday", "3 == Wednesday");
-    t.is (ISO8601d::dayName (4), "Thursday",  "4 == Thursday");
-    t.is (ISO8601d::dayName (5), "Friday",    "5 == Friday");
-    t.is (ISO8601d::dayName (6), "Saturday",  "6 == Saturday");
-
-    t.is (ISO8601d::dayNameShort (0), "Sun",  "0 == Sun");
-    t.is (ISO8601d::dayNameShort (1), "Mon",  "1 == Mon");
-    t.is (ISO8601d::dayNameShort (2), "Tue",  "2 == Tue");
-    t.is (ISO8601d::dayNameShort (3), "Wed",  "3 == Wed");
-    t.is (ISO8601d::dayNameShort (4), "Thu",  "4 == Thu");
-    t.is (ISO8601d::dayNameShort (5), "Fri",  "5 == Fri");
-    t.is (ISO8601d::dayNameShort (6), "Sat",  "6 == Sat");
-
-    t.is (ISO8601d::dayOfWeek ("SUNDAY"),    0, "SUNDAY == 0");
-    t.is (ISO8601d::dayOfWeek ("sunday"),    0, "sunday == 0");
-    t.is (ISO8601d::dayOfWeek ("Sunday"),    0, "Sunday == 0");
-    t.is (ISO8601d::dayOfWeek ("Monday"),    1, "Monday == 1");
-    t.is (ISO8601d::dayOfWeek ("Tuesday"),   2, "Tuesday == 2");
-    t.is (ISO8601d::dayOfWeek ("Wednesday"), 3, "Wednesday == 3");
-    t.is (ISO8601d::dayOfWeek ("Thursday"),  4, "Thursday == 4");
-    t.is (ISO8601d::dayOfWeek ("Friday"),    5, "Friday == 5");
-    t.is (ISO8601d::dayOfWeek ("Saturday"),  6, "Saturday == 6");
-
-    ISO8601d happyNewYear (1, 1, 2008);
-    t.is (happyNewYear.dayOfWeek (), 2, "1/1/2008 == Tuesday");
-    t.is (happyNewYear.month (),     1, "1/1/2008 == January");
-    t.is (happyNewYear.day (),       1, "1/1/2008 == 1");
-    t.is (happyNewYear.year (),   2008, "1/1/2008 == 2008");
-
-    t.is (happyNewYear.toString (), "1/1/2008", "toString 1/1/2008");
-
-    int m, d, y;
-    happyNewYear.toMDY (m, d, y);
-    t.is (m, 1, "1/1/2008 == January");
-    t.is (d, 1, "1/1/2008 == 1");
-    t.is (y, 2008, "1/1/2008 == 2008");
-
-    ISO8601d epoch (9, 8, 2001);
-    t.ok ((int)epoch.toEpoch () < 1000000000, "9/8/2001 < 1,000,000,000");
-    epoch += 172800;
-    t.ok ((int)epoch.toEpoch () > 1000000000, "9/10/2001 > 1,000,000,000");
-
-    ISO8601d fromEpoch (epoch.toEpoch ());
-    t.is (fromEpoch.toString (), epoch.toString (), "ctor (time_t)");
-
-    ISO8601d iso (1000000000);
-    t.is (iso.toISO (), "20010909T014640Z", "1,000,000,000 -> 20010909T014640Z");
-
-    // Quantization.
-    ISO8601d quant (1234526400);
-    t.is (quant.startOfDay ().toString ("YMDHNS"),   "20090213000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/13/2009 0:00:00");
-    t.is (quant.startOfWeek ().toString ("YMDHNS"),  "20090208000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/8/2009 0:00:00");
-    t.is (quant.startOfMonth ().toString ("YMDHNS"), "20090201000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 2/1/2009 0:00:00");
-    t.is (quant.startOfYear ().toString ("YMDHNS"),  "20090101000000", "1234526400 -> 2/13/2009 12:00:00 UTC -> 1/1/2009 0:00:00");
-
-    // Format parsing.
-    ISO8601d fromString1 ("1/1/2008", "m/d/Y");
-    t.is (fromString1.month (),   1, "ctor (std::string) -> m");
-    t.is (fromString1.day (),     1, "ctor (std::string) -> d");
-    t.is (fromString1.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString2 ("20080101", "YMD");
-    t.is (fromString2.month (),   1, "ctor (std::string) -> m");
-    t.is (fromString2.day (),     1, "ctor (std::string) -> d");
-    t.is (fromString2.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString3 ("12/31/2007", "m/d/Y");
-    t.is (fromString3.month (),  12, "ctor (std::string) -> m");
-    t.is (fromString3.day (),    31, "ctor (std::string) -> d");
-    t.is (fromString3.year (), 2007, "ctor (std::string) -> y");
-
-    ISO8601d fromString4 ("01/01/2008", "m/d/Y");
-    t.is (fromString4.month (),   1, "ctor (std::string) -> m");
-    t.is (fromString4.day (),     1, "ctor (std::string) -> d");
-    t.is (fromString4.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString5 ("Tue 05 Feb 2008 (06)", "a D b Y (V)");
-    t.is (fromString5.month (),   2, "ctor (std::string) -> m");
-    t.is (fromString5.day (),     5, "ctor (std::string) -> d");
-    t.is (fromString5.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString6 ("Tuesday, February 5, 2008", "A, B d, Y");
-    t.is (fromString6.month (),   2, "ctor (std::string) -> m");
-    t.is (fromString6.day (),     5, "ctor (std::string) -> d");
-    t.is (fromString6.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString7 ("w01 Tue 2008-01-01", "wV a Y-M-D");
-    t.is (fromString7.month (),   1, "ctor (std::string) -> m");
-    t.is (fromString7.day (),     1, "ctor (std::string) -> d");
-    t.is (fromString7.year (), 2008, "ctor (std::string) -> y");
-
-    ISO8601d fromString8 ("6/7/2010 1:23:45",  "m/d/Y h:N:S");
-    t.is (fromString8.month (),     6, "ctor (std::string) -> m");
-    t.is (fromString8.day (),       7, "ctor (std::string) -> d");
-    t.is (fromString8.year (),   2010, "ctor (std::string) -> Y");
-    t.is (fromString8.hour (),      1, "ctor (std::string) -> h");
-    t.is (fromString8.minute (),   23, "ctor (std::string) -> N");
-    t.is (fromString8.second (),   45, "ctor (std::string) -> S");
-
-    ISO8601d fromString9 ("6/7/2010 01:23:45", "m/d/Y H:N:S");
-    t.is (fromString9.month (),     6, "ctor (std::string) -> m");
-    t.is (fromString9.day (),       7, "ctor (std::string) -> d");
-    t.is (fromString9.year (),   2010, "ctor (std::string) -> Y");
-    t.is (fromString9.hour (),      1, "ctor (std::string) -> h");
-    t.is (fromString9.minute (),   23, "ctor (std::string) -> N");
-    t.is (fromString9.second (),   45, "ctor (std::string) -> S");
-
-    ISO8601d fromString10 ("6/7/2010 12:34:56", "m/d/Y H:N:S");
-    t.is (fromString10.month (),     6, "ctor (std::string) -> m");
-    t.is (fromString10.day (),       7, "ctor (std::string) -> d");
-    t.is (fromString10.year (),   2010, "ctor (std::string) -> Y");
-    t.is (fromString10.hour (),     12, "ctor (std::string) -> h");
-    t.is (fromString10.minute (),   34, "ctor (std::string) -> N");
-    t.is (fromString10.second (),   56, "ctor (std::string) -> S");
-
-    // Day of year
-    t.is (ISO8601d ("1/1/2011",   "m/d/Y").dayOfYear (),   1, "dayOfYear (1/1/2011)   ->   1");
-    t.is (ISO8601d ("5/1/2011",   "m/d/Y").dayOfYear (), 121, "dayOfYear (5/1/2011)   -> 121");
-    t.is (ISO8601d ("12/31/2011", "m/d/Y").dayOfYear (), 365, "dayOfYear (12/31/2011) -> 365");
-
-#ifdef PRODUCT_TASKWARRIOR
-    // Relative dates.
-    ISO8601d r1 ("today");
-    t.ok (r1.sameDay (now), "today = now");
-
-    ISO8601d r4 ("sunday");
-    if (now.dayOfWeek () >= 0)
-      t.ok (r4.sameDay (now + (0 - now.dayOfWeek () + 7) * 86400), "next sunday");
-    else
-      t.ok (r4.sameDay (now + (0 - now.dayOfWeek ()) * 86400), "next sunday");;
-
-    ISO8601d r5 ("monday");
-    if (now.dayOfWeek () >= 1)
-      t.ok (r5.sameDay (now + (1 - now.dayOfWeek () + 7) * 86400), "next monday");
-    else
-      t.ok (r5.sameDay (now + (1 - now.dayOfWeek ()) * 86400), "next monday");;
-
-    ISO8601d r6 ("tuesday");
-    if (now.dayOfWeek () >= 2)
-      t.ok (r6.sameDay (now + (2 - now.dayOfWeek () + 7) * 86400), "next tuesday");
-    else
-      t.ok (r6.sameDay (now + (2 - now.dayOfWeek ()) * 86400), "next tuesday");;
-
-    ISO8601d r7 ("wednesday");
-    if (now.dayOfWeek () >= 3)
-      t.ok (r7.sameDay (now + (3 - now.dayOfWeek () + 7) * 86400), "next wednesday");
-    else
-      t.ok (r7.sameDay (now + (3 - now.dayOfWeek ()) * 86400), "next wednesday");;
-
-    ISO8601d r8 ("thursday");
-    if (now.dayOfWeek () >= 4)
-      t.ok (r8.sameDay (now + (4 - now.dayOfWeek () + 7) * 86400), "next thursday");
-    else
-      t.ok (r8.sameDay (now + (4 - now.dayOfWeek ()) * 86400), "next thursday");;
-
-    ISO8601d r9 ("friday");
-    if (now.dayOfWeek () >= 5)
-      t.ok (r9.sameDay (now + (5 - now.dayOfWeek () + 7) * 86400), "next friday");
-    else
-      t.ok (r9.sameDay (now + (5 - now.dayOfWeek ()) * 86400), "next friday");;
-
-    ISO8601d r10 ("saturday");
-    if (now.dayOfWeek () >= 6)
-      t.ok (r10.sameDay (now + (6 - now.dayOfWeek () + 7) * 86400), "next saturday");
-    else
-      t.ok (r10.sameDay (now + (6 - now.dayOfWeek ()) * 86400), "next saturday");;
-
-    ISO8601d r11 ("eow");
-    t.ok (r11 < now + (8 * 86400), "eow < 7 days away");
-
-    ISO8601d r12 ("eocw");
-    t.ok (r12 > now - (8 * 86400), "eocw < 7 days in the past");
-
-    ISO8601d r13 ("eom");
-    t.ok (r13.sameMonth (now), "eom in same month as now");
-    t.ok (r13.sameQuarter (now), "eom in same quarter as now");
-
-    ISO8601d r14 ("eocm");
-    t.ok (r14.sameMonth (now), "eocm in same month as now");
-
-    ISO8601d r15 ("eoy");
-    t.ok (r15.sameYear (now), "eoy in same year as now");
-
-    ISO8601d r16 ("sow");
-    t.ok (r16 < now + (8 * 86400), "sow < 7 days away");
-
-    ISO8601d r23 ("socw");
-    t.ok (r23 > now - (8 * 86400), "sow < 7 days in the past");
-
-    ISO8601d r17 ("som");
-    t.notok (r17.sameMonth (now), "som not in same month as now");
-
-    ISO8601d r18 ("socm");
-    t.ok (r18.sameMonth (now), "socm in same month as now");
-    t.ok (r18.sameQuarter (now), "socm in same quarter as now");
-
-    ISO8601d r19 ("soy");
-    t.notok (r19.sameYear (now), "soy not in same year as now");
-
-    ISO8601d first ("1st");
-    t.notok (first.sameMonth (now), "1st not in same month as now");
-    t.is (first.day (),   1, "1st day is 1");
-
-    ISO8601d later ("later");
-    t.is (later.month (),   1, "later -> m = 1");
-    t.is (later.day (),    18, "later -> d = 18");
-    t.is (later.year (), 2038, "later -> y = 2038");
-
-    // Quarters
-    ISO8601d soq ("soq");
-    ISO8601d eoq ("eoq");
-    t.is (soq.day (),  1,      "soq is the first day of a month");
-    t.is (eoq.day () / 10,  3, "eoq is the 30th or 31th of a month");
-    t.is (soq.month () % 3, 1, "soq month is 1, 4, 7 or 10");
-    t.is (eoq.month () % 3, 0, "eoq month is 3, 6, 9 or 12");
-
-    // Note: these fail during the night of daylight savings end.
-    t.ok (soq.sameYear (now) ||
-          (now.month () >= 10 &&
-           soq.year () == now.year () + 1), "soq is in same year as now");
-    t.ok (eoq.sameYear (now),  "eoq is in same year as now");
-#endif
-
-    // ISO8601d::sameHour
-    ISO8601d r20 ("6/7/2010 01:00:00", "m/d/Y H:N:S");
-    ISO8601d r21 ("6/7/2010 01:59:59", "m/d/Y H:N:S");
-    t.ok (r20.sameHour (r21), "two dates within the same hour");
-
-    ISO8601d r22 ("6/7/2010 00:59:59", "m/d/Y H:N:S");
-    t.notok (r20.sameHour (r22), "two dates not within the same hour");
-
-    // ISO8601d::operator-
-    ISO8601d r25 (1234567890);
-    t.is ((r25 - 1).toEpoch (), 1234567889, "1234567890 - 1 = 1234567889");
-
-    // ISO8601d::operator--
-    ISO8601d r26 (11, 7, 2010, 23, 59, 59);
-    r26--;
-    t.is (r26.toString ("YMDHNS"), "20101106235959", "decrement across fall DST boundary");
-
-    ISO8601d r27 (3, 14, 2010, 23, 59, 59);
-    r27--;
-    t.is (r27.toString ("YMDHNS"), "20100313235959", "decrement across spring DST boundary");
-
-    // ISO8601d::operator++
-    ISO8601d r28 (11, 6, 2010, 23, 59, 59);
-    r28++;
-    t.is (r28.toString ("YMDHNS"), "20101107235959", "increment across fall DST boundary");
-
-    ISO8601d r29 (3, 13, 2010, 23, 59, 59);
-    r29++;
-    t.is (r29.toString ("YMDHNS"), "20100314235959", "increment across spring DST boundary");
-
-    // int ISO8601d::length (const std::string&);
-    t.is (ISO8601d::length ("m"), 2,  "length 'm' --> 2");
-    t.is (ISO8601d::length ("M"), 2,  "length 'M' --> 2");
-    t.is (ISO8601d::length ("d"), 2,  "length 'd' --> 2");
-    t.is (ISO8601d::length ("D"), 2,  "length 'D' --> 2");
-    t.is (ISO8601d::length ("y"), 2,  "length 'y' --> 2");
-    t.is (ISO8601d::length ("Y"), 4,  "length 'Y' --> 4");
-    t.is (ISO8601d::length ("a"), 3,  "length 'a' --> 3");
-    t.is (ISO8601d::length ("A"), 10, "length 'A' --> 10");
-    t.is (ISO8601d::length ("b"), 3,  "length 'b' --> 3");
-    t.is (ISO8601d::length ("B"), 10, "length 'B' --> 10");
-    t.is (ISO8601d::length ("v"), 2,  "length 'v' --> 2");
-    t.is (ISO8601d::length ("V"), 2,  "length 'V' --> 2");
-    t.is (ISO8601d::length ("h"), 2,  "length 'h' --> 2");
-    t.is (ISO8601d::length ("H"), 2,  "length 'H' --> 2");
-    t.is (ISO8601d::length ("n"), 2,  "length 'n' --> 2");
-    t.is (ISO8601d::length ("N"), 2,  "length 'N' --> 2");
-    t.is (ISO8601d::length ("s"), 2,  "length 's' --> 2");
-    t.is (ISO8601d::length ("S"), 2,  "length 'S' --> 2");
-    t.is (ISO8601d::length ("j"), 3,  "length 'j' --> 3");
-    t.is (ISO8601d::length ("J"), 3,  "length 'J' --> 3");
-
-    t.is (ISO8601d::length (" "), 1, "length ' ' --> 1");
-
-    // Depletion requirement.
-    ISO8601d r30 ("Mon Jun 30 2014", "a b D Y");
-    t.is (r30.toString ("YMDHNS"), "20140630000000", "Depletion required on complex format with spaces");
-
-    ISO8601d r31 ("Mon Jun 30 2014 xxx", "a b D Y");
-    t.is (r31.toString ("YMDHNS"), "20140630000000", "Depletion not required on complex format with spaces");
-
-    // Test all format options.
-    ISO8601d r32 ("2015-10-28T12:55:00");
-    t.is (r32.toString ("Y"),      "2015", "2015-10-28T12:55:00 -> Y ->      2015");
-    t.is (r32.toString ("y"),        "15", "2015-10-28T12:55:00 -> y ->        15");
-    t.is (r32.toString ("M"),        "10", "2015-10-28T12:55:00 -> M ->        10");
-    t.is (r32.toString ("m"),        "10", "2015-10-28T12:55:00 -> m ->        10");
-    t.is (r32.toString ("D"),        "28", "2015-10-28T12:55:00 -> D ->        28");
-    t.is (r32.toString ("d"),        "28", "2015-10-28T12:55:00 -> d ->        28");
-    t.is (r32.toString ("H"),        "12", "2015-10-28T12:55:00 -> H ->        12");
-    t.is (r32.toString ("h"),        "12", "2015-10-28T12:55:00 -> h ->        12");
-    t.is (r32.toString ("N"),        "55", "2015-10-28T12:55:00 -> N ->        55");
-    t.is (r32.toString ("n"),        "55", "2015-10-28T12:55:00 -> n ->        55");
-    t.is (r32.toString ("S"),        "00", "2015-10-28T12:55:00 -> S ->        00");
-    t.is (r32.toString ("s"),         "0", "2015-10-28T12:55:00 -> s ->         0");
-    t.is (r32.toString ("A"), "Wednesday", "2015-10-28T12:55:00 -> A -> Wednesday");
-    t.is (r32.toString ("a"),       "Wed", "2015-10-28T12:55:00 -> a ->       Wed");
-    t.is (r32.toString ("B"),   "October", "2015-10-28T12:55:00 -> B ->   October");
-    t.is (r32.toString ("b"),       "Oct", "2015-10-28T12:55:00 -> b ->       Oct");
-    t.is (r32.toString ("V"),        "44", "2015-10-28T12:55:00 -> V ->        44");
-    t.is (r32.toString ("v"),        "44", "2015-10-28T12:55:00 -> v ->        44");
-    t.is (r32.toString ("J"),       "301", "2015-10-28T12:55:00 -> J ->       301");
-    t.is (r32.toString ("j"),       "301", "2015-10-28T12:55:00 -> j ->       301");
-    t.is (r32.toString ("w"),         "3", "2015-10-28T12:55:00 -> w ->         3");
-
-    // Test all parse options.
-    ISO8601d r33 ("2015 10 28 19 28 01", "Y M D H N S");
-    t.is(r33.year (),   2015,         "Y works");
-    t.is(r33.month (),    10,         "M works");
-    t.is(r33.day (),      28,         "D works");
-    t.is(r33.hour (),     19,         "H works");
-    t.is(r33.minute (),   28,         "N works");
-    t.is(r33.second (),    1,         "S works");
-
-    ISO8601d r34 ("15 5 4 3 2 1", "y m d h n s");
-    t.is(r34.year (),   2015,         "y works");
-    t.is(r34.month (),     5,         "m works");
-    t.is(r34.day (),       4,         "d works");
-    t.is(r34.hour (),      3,         "h works");
-    t.is(r34.minute (),    2,         "n works");
-    t.is(r34.second (),    1,         "s works");
-
-    ISO8601d r35 ("Wednesday October 28 2015", "A B D Y");
-    t.is(r35.year (),    2015,        "Y works");
-    t.is(r35.month (),     10,        "B works");
-    t.is(r35.day (),       28,        "D works");
-    t.is(r35.dayOfWeek (),  3,        "A works");
-
-    ISO8601d r36 ("Wed Oct 28 15", "a b d y");
-    t.is(r36.year (),    2015,        "y works");
-    t.is(r36.month (),     10,        "b works");
-    t.is(r36.day (),       28,        "d works");
-    t.is(r36.dayOfWeek (),  3,        "a works");
-  }
-
-  catch (const std::string& e)
-  {
-    t.fail ("Exception thrown.");
-    t.diag (e);
-  }
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 15ceb61d96dbf2288f7ee4cc048b7a1c6d4e974b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 22:18:04 -0500
Subject: [PATCH 445/879] ISO8601: Migrated all to Datetime/Duration

---
 src/CMakeLists.txt |    1 -
 src/ISO8601.cpp    | 2081 --------------------------------------------
 src/ISO8601.h      |  179 ----
 3 files changed, 2261 deletions(-)
 delete mode 100644 src/ISO8601.cpp
 delete mode 100644 src/ISO8601.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a70d4d90..b05f4126e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,6 @@ add_library (task CLI2.cpp CLI2.h
                   Eval.cpp Eval.h
                   Filter.cpp Filter.h
                   Hooks.cpp Hooks.h
-                  ISO8601.cpp ISO8601.h
                   Lexer.cpp Lexer.h
                   Nibbler.cpp Nibbler.h
                   TDB2.cpp TDB2.h
diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp
deleted file mode 100644
index d9c02031a..000000000
--- a/src/ISO8601.cpp
+++ /dev/null
@@ -1,2081 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <ISO8601.h>
-#include <sstream>
-#include <iomanip>
-#include <stdlib.h>
-#include <assert.h>
-#include <Lexer.h>
-#include <util.h>
-#ifdef PRODUCT_TASKWARRIOR
-#include <Dates.h>
-#endif
-#include <shared.h>
-#include <format.h>
-#include <utf8.h>
-#include <i18n.h>
-
-#define DAY    86400
-#define HOUR    3600
-#define MINUTE    60
-#define SECOND     1
-
-static struct
-{
-  std::string unit;
-  int seconds;
-  bool standalone;
-} durations[] =
-{
-  // These are sorted by first character, then length, so that Nibbler::getOneOf
-  // returns a maximal match.
-  {"annual",     365 * DAY,    true},
-  {"biannual",   730 * DAY,    true},
-  {"bimonthly",   61 * DAY,    true},
-  {"biweekly",    14 * DAY,    true},
-  {"biyearly",   730 * DAY,    true},
-  {"daily",        1 * DAY,    true},
-  {"days",         1 * DAY,    false},
-  {"day",          1 * DAY,    true},
-  {"d",            1 * DAY,    false},
-  {"fortnight",   14 * DAY,    true},
-  {"hours",        1 * HOUR,   false},
-  {"hour",         1 * HOUR,   true},
-  {"hrs",          1 * HOUR,   false},
-  {"hr",           1 * HOUR,   true},
-  {"h",            1 * HOUR,   false},
-  {"minutes",      1 * MINUTE, false},
-  {"minute",       1 * MINUTE, true},
-  {"mins",         1 * MINUTE, false},
-  {"min",          1 * MINUTE, true},
-  {"monthly",     30 * DAY,    true},
-  {"months",      30 * DAY,    false},
-  {"month",       30 * DAY,    true},
-  {"mnths",       30 * DAY,    false},
-  {"mths",        30 * DAY,    false},
-  {"mth",         30 * DAY,    true},
-  {"mos",         30 * DAY,    false},
-  {"mo",          30 * DAY,    true},
-  {"m",           30 * DAY,    false},
-  {"quarterly",   91 * DAY,    true},
-  {"quarters",    91 * DAY,    false},
-  {"quarter",     91 * DAY,    true},
-  {"qrtrs",       91 * DAY,    false},
-  {"qrtr",        91 * DAY,    true},
-  {"qtrs",        91 * DAY,    false},
-  {"qtr",         91 * DAY,    true},
-  {"q",           91 * DAY,    false},
-  {"semiannual", 183 * DAY,    true},
-  {"sennight",    14 * DAY,    false},
-  {"seconds",      1 * SECOND, false},
-  {"second",       1 * SECOND, true},
-  {"secs",         1 * SECOND, false},
-  {"sec",          1 * SECOND, true},
-  {"s",            1 * SECOND, false},
-  {"weekdays",     1 * DAY,    true},
-  {"weekly",       7 * DAY,    true},
-  {"weeks",        7 * DAY,    false},
-  {"week",         7 * DAY,    true},
-  {"wks",          7 * DAY,    false},
-  {"wk",           7 * DAY,    true},
-  {"w",            7 * DAY,    false},
-  {"yearly",     365 * DAY,    true},
-  {"years",      365 * DAY,    false},
-  {"year",       365 * DAY,    true},
-  {"yrs",        365 * DAY,    false},
-  {"yr",         365 * DAY,    true},
-  {"y",          365 * DAY,    false},
-};
-
-#define NUM_DURATIONS (sizeof (durations) / sizeof (durations[0]))
-
-std::string ISO8601d::weekstart  = STRING_DATE_SUNDAY;
-int ISO8601d::minimumMatchLength = 3;
-bool ISO8601d::isoEnabled = true;
-bool ISO8601p::isoEnabled = true;
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::ISO8601d ()
-{
-  clear ();
-  _date = time (NULL);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::ISO8601d (const std::string& input, const std::string& format /*= ""*/)
-{
-  clear ();
-  std::string::size_type start = 0;
-  if (! parse (input, start, format))
-    throw ::format (STRING_DATE_INVALID_FORMAT, input, format);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::ISO8601d (const time_t t)
-{
-  clear ();
-  _date = t;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::ISO8601d (const int m, const int d, const int y)
-{
-  clear ();
-
-  // Error if not valid.
-  struct tm t {};
-  t.tm_isdst = -1;   // Requests that mktime determine summer time effect.
-  t.tm_mday  = d;
-  t.tm_mon   = m - 1;
-  t.tm_year  = y - 1900;
-
-  _date = mktime (&t);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::ISO8601d (const int m,  const int d,  const int y,
-                    const int hr, const int mi, const int se)
-{
-  clear ();
-
-  // Error if not valid.
-  struct tm t {};
-  t.tm_isdst = -1;   // Requests that mktime determine summer time effect.
-  t.tm_mday  = d;
-  t.tm_mon   = m - 1;
-  t.tm_year  = y - 1900;
-  t.tm_hour  = hr;
-  t.tm_min   = mi;
-  t.tm_sec   = se;
-
-  _date = mktime (&t);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d::~ISO8601d ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Supported:
-//
-//    result       ::= date 'T' time 'Z'                      # UTC
-//                   | date 'T' time                          # Local
-//                   | date-ext 'T' time-ext 'Z'              # UTC
-//                   | date-ext 'T' time-ext offset-ext       # Specified TZ
-//                   | date-ext 'T' time-ext                  # Local
-//                   | date-ext                               # Local
-//                   | time-ext 'Z'
-//                   | time-ext offset-ext            Not needed
-//                   | time-ext
-//                   ;
-//
-//    date-ext     ::= ±YYYYY-MM-DD                   Νot needed
-//                   | ±YYYYY-Www-D                   Νot needed
-//                   | ±YYYYY-Www                     Νot needed
-//                   | ±YYYYY-DDD                     Νot needed
-//                   | YYYY-MM-DD
-//                   | YYYY-DDD
-//                   | YYYY-Www-D
-//                   | YYYY-Www
-//                   ;
-//
-//    time-ext     ::= hh:mm:ss[,ss]
-//                   | hh:mm[,mm]
-//                   | hh[,hh]                        Ambiguous (number)
-//                   ;
-//
-//    time-utc-ext ::= hh:mm[:ss] 'Z' ;
-//
-//    offset-ext   ::= ±hh[:mm] ;
-//
-// Not yet supported:
-//
-//    recurrence ::=
-//                 | 'R' [n] '/' designated '/' datetime-ext          # duration end
-//                 | 'R' [n] '/' designated '/' datetime              # duration end
-//                 | 'R' [n] '/' designated                           # duration
-//                 | 'R' [n] '/' datetime-ext '/' designated          # start duration
-//                 | 'R' [n] '/' datetime-ext '/' datetime-ext        # start end
-//                 | 'R' [n] '/' datetime '/' designated              # start duration
-//                 | 'R' [n] '/' datetime '/' datetime                # start end
-//                 ;
-//
-bool ISO8601d::parse (
-  const std::string& input,
-  std::string::size_type& start,
-  const std::string& format /* = "" */)
-{
-  auto i = start;
-  Nibbler n (input.substr (i));
-
-  // Parse epoch first, as it's the most common scenario.
-  if (parse_epoch (n))
-  {
-    // ::validate and ::resolve are not needed in this case.
-    start = n.cursor ();
-    return true;
-  }
-
-  else if (parse_formatted (n, format))
-  {
-    // Check the values and determine time_t.
-    if (validate ())
-    {
-      start = n.cursor ();
-      resolve ();
-      return true;
-    }
-  }
-
-  // Allow parse_date_time and parse_date_time_ext regardless of
-  // ISO8601d::isoEnabled setting, because these formats are relied upon by
-  // the 'import' command, JSON parser and hook system.
-  else if (parse_date_time     (n)   || // Strictest first.
-           parse_date_time_ext (n)   ||
-           (ISO8601d::isoEnabled &&
-            (parse_date_ext      (n) ||
-             parse_time_utc_ext  (n) ||
-             parse_time_off_ext  (n) ||
-             parse_time_ext      (n)))) // Time last, as it is the most permissive.
-  {
-    // Check the values and determine time_t.
-    if (validate ())
-    {
-      start = n.cursor ();
-      resolve ();
-      return true;
-    }
-  }
-
-  else if (parse_named (n))
-  {
-    // ::validate and ::resolve are not needed in this case.
-    start = n.cursor ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ISO8601d::clear ()
-{
-  _year            = 0;
-  _month           = 0;
-  _week            = 0;
-  _weekday         = 0;
-  _julian          = 0;
-  _day             = 0;
-  _seconds         = 0;
-  _offset          = 0;
-  _utc             = false;
-  _date            = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::parse_formatted (Nibbler& n, const std::string& format)
-{
-  // Short-circuit on missing format.
-  if (format == "")
-    return false;
-
-  n.save ();
-
-  int month  = -1;   // So we can check later.
-  int day    = -1;
-  int year   = -1;
-  int hour   = -1;
-  int minute = -1;
-  int second = -1;
-
-  // For parsing, unused.
-  int wday   = -1;
-  int week   = -1;
-
-  for (unsigned int f = 0; f < format.length (); ++f)
-  {
-    switch (format[f])
-    {
-    case 'm':
-      if (n.getDigit (month))
-      {
-        if (month == 0)
-          n.getDigit (month);
-
-        if (month == 1)
-          if (n.getDigit (month))
-            month += 10;
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'M':
-      if (! n.getDigit2 (month))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'd':
-      if (n.getDigit (day))
-      {
-        if (day == 0)
-          n.getDigit (day);
-
-        if (day == 1 || day == 2 || day == 3)
-        {
-          int tens = day;
-          if (n.getDigit (day))
-            day += 10 * tens;
-        }
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'D':
-      if (! n.getDigit2 (day))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'y':
-      if (! n.getDigit2 (year))
-      {
-        n.restore ();
-        return false;
-      }
-      year += 2000;
-      break;
-
-    case 'Y':
-      if (! n.getDigit4 (year))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'h':
-      if (n.getDigit (hour))
-      {
-        if (hour == 0)
-          n.getDigit (hour);
-
-        if (hour == 1 || hour == 2)
-        {
-          int tens = hour;
-          if (n.getDigit (hour))
-            hour += 10 * tens;
-        }
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'H':
-      if (! n.getDigit2 (hour))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'n':
-      if (n.getDigit (minute))
-      {
-        if (minute == 0)
-          n.getDigit (minute);
-
-        if (minute < 6)
-        {
-          int tens = minute;
-          if (n.getDigit (minute))
-            minute += 10 * tens;
-        }
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'N':
-      if (! n.getDigit2 (minute))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 's':
-      if (n.getDigit (second))
-      {
-        if (second == 0)
-          n.getDigit (second);
-
-        if (second < 6)
-        {
-          int tens = second;
-          if (n.getDigit (second))
-            second += 10 * tens;
-        }
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'S':
-      if (! n.getDigit2 (second))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'v':
-      if (n.getDigit (week))
-      {
-        if (week == 0)
-          n.getDigit (week);
-
-        if (week < 6)
-        {
-          int tens = week;
-          if (n.getDigit (week))
-            week += 10 * tens;
-        }
-      }
-      else
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'V':
-      if (! n.getDigit2 (week))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-
-    case 'a':
-      {
-        auto cursor = n.cursor ();
-        wday = ISO8601d::dayOfWeek (n.str ().substr (cursor, 3));
-        if (wday == -1)
-        {
-          n.restore ();
-          return false;
-        }
-
-        n.skipN (3);
-      }
-      break;
-
-    case 'A':
-      {
-        std::string dayName;
-        if (n.getUntil (format[f + 1], dayName))
-        {
-          wday = ISO8601d::dayOfWeek (Lexer::lowerCase (dayName));
-          if (wday == -1)
-          {
-            n.restore ();
-            return false;
-          }
-        }
-      }
-      break;
-
-    case 'b':
-      {
-        auto cursor = n.cursor ();
-        month = ISO8601d::monthOfYear (n.str ().substr (cursor, 3));
-        if (month == -1)
-        {
-          n.restore ();
-          return false;
-        }
-
-        n.skipN (3);
-      }
-      break;
-
-    case 'B':
-      {
-        std::string monthName;
-        if (n.getUntil (format[f + 1], monthName))
-        {
-          month = ISO8601d::monthOfYear (Lexer::lowerCase (monthName));
-          if (month == -1)
-          {
-            n.restore ();
-            return false;
-          }
-        }
-      }
-      break;
-
-    default:
-      if (! n.skip (format[f]))
-      {
-        n.restore ();
-        return false;
-      }
-      break;
-    }
-  }
-
-  // It is possible that the format='Y-M-D', and the input is Y-M-DTH:N:SZ, and
-  // this should not be considered a match.
-  if (! n.depleted () && ! Lexer::isWhitespace (n.next ()))
-  {
-    n.restore ();
-    return false;
-  }
-
-  // Missing values are filled in from the current date.
-  if (year == -1)
-  {
-    ISO8601d now;
-    year = now.year ();
-    if (month == -1)
-    {
-      month = now.month ();
-      if (day == -1)
-      {
-        day = now.day ();
-        if (hour == -1)
-        {
-          hour = now.hour ();
-          if (minute == -1)
-          {
-            minute = now.minute ();
-            if (second == -1)
-              second = now.second ();
-          }
-        }
-      }
-    }
-  }
-
-  // Any remaining undefined values are assigned defaults.
-  if (month  == -1) month  = 1;
-  if (day    == -1) day    = 1;
-  if (hour   == -1) hour   = 0;
-  if (minute == -1) minute = 0;
-  if (second == -1) second = 0;
-
-  _year    = year;
-  _month   = month;
-  _day     = day;
-  _seconds = (hour * 3600) + (minute * 60) + second;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::parse_named (Nibbler& n)
-{
-#ifdef PRODUCT_TASKWARRIOR
-  n.save ();
-  std::string token;
-  if (n.getUntilWS (token))
-  {
-    Variant v;
-    if (namedDates (token, v))
-    {
-      _date = v.get_date ();
-      return true;
-    }
-  }
-
-  n.restore ();
-#endif
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Valid epoch values are unsigned integers after 1980-01-01T00:00:00Z. This
-// restriction means that '12' will not be identified as an epoch date.
-bool ISO8601d::parse_epoch (Nibbler& n)
-{
-  n.save ();
-
-  int epoch;
-  if (n.getUnsignedInt (epoch) &&
-      n.depleted ()            &&
-      epoch >= 315532800)
-  {
-    _date = static_cast <time_t> (epoch);
-    return true;
-  }
-
-  n.restore ();
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::parse_date_time (Nibbler& n)
-{
-  n.save ();
-  int year, month, day, hour, minute, second;
-  if (n.getDigit4 (year)   &&
-      n.getDigit2 (month)  && month &&
-      n.getDigit2 (day)    && day   &&
-      n.skip      ('T')    &&
-      n.getDigit2 (hour)   &&
-      n.getDigit2 (minute) && minute < 60 &&
-      n.getDigit2 (second) && second < 60)
-  {
-    if (n.skip ('Z'))
-      _utc = true;
-
-    _year    = year;
-    _month   = month;
-    _day     = day;
-    _seconds = (((hour * 60) + minute) * 60) + second;
-
-    return true;
-  }
-
-  _year    = 0;
-  _month   = 0;
-  _day     = 0;
-  _seconds = 0;
-
-  n.restore ();
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// date-ext 'T' time-ext 'Z'
-// date-ext 'T' time-ext offset-ext
-// date-ext 'T' time-ext
-bool ISO8601d::parse_date_time_ext (Nibbler& n)
-{
-  n.save ();
-  if (parse_date_ext (n))
-  {
-    if (n.skip ('T') &&
-        parse_time_ext (n))
-    {
-      if (n.skip ('Z'))
-      {
-        _utc = true;
-      }
-      else if (parse_off_ext (n))
-      {
-      }
-
-      if (! Lexer::isDigit (n.next ()))
-        return true;
-    }
-
-    // Restore date_ext
-    _year    = 0;
-    _month   = 0;
-    _week    = 0;
-    _weekday = 0;
-    _julian  = 0;
-    _day     = 0;
-  }
-
-  n.restore ();
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// YYYY-MM-DD
-// YYYY-DDD
-// YYYY-Www-D
-// YYYY-Www
-bool ISO8601d::parse_date_ext (Nibbler& n)
-{
-  Nibbler backup (n);
-  int year;
-  if (n.getDigit4 (year) &&
-      n.skip ('-'))
-  {
-    int month;
-    int day;
-    if (n.skip ('W') &&
-        n.getDigit2 (_week) && _week)
-    {
-      if (n.skip ('-') &&
-          n.getDigit (_weekday))
-      {
-      }
-
-      _year = year;
-      if (!Lexer::isDigit (n.next ()))
-        return true;
-    }
-    else if (n.getDigit3 (_julian) && _julian)
-    {
-      _year = year;
-      if (!Lexer::isDigit (n.next ()))
-        return true;
-    }
-    else if (n.getDigit2 (month) && month &&
-             n.skip ('-')        &&
-             n.getDigit2 (day)   && day)
-    {
-      _year = year;
-      _month = month;
-      _day = day;
-      if (!Lexer::isDigit (n.next ()))
-        return true;
-    }
-  }
-
-  n = backup;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ±hh[:mm]
-bool ISO8601d::parse_off_ext (Nibbler& n)
-{
-  Nibbler backup (n);
-  std::string sign;
-  if (n.getN (1, sign) && (sign == "+" || sign == "-"))
-  {
-    int offset;
-    int hh;
-    int mm;
-    if (n.getDigit2 (hh) && hh <= 12 &&
-        !n.getDigit (mm))
-    {
-      offset = hh * 3600;
-
-      if (n.skip (':'))
-      {
-        if (n.getDigit2 (mm) && mm < 60)
-        {
-          offset += mm * 60;
-        }
-        else
-        {
-          n = backup;
-          return false;
-        }
-      }
-
-      _offset = (sign == "-") ? -offset : offset;
-      if (!Lexer::isDigit (n.next ()))
-        return true;
-    }
-  }
-
-  n = backup;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// hh:mm[:ss]
-bool ISO8601d::parse_time_ext (Nibbler& n)
-{
-  Nibbler backup (n);
-  int seconds = 0;
-  int hh;
-  int mm;
-  int ss;
-  if (n.getDigit2 (hh) && hh <= 24 &&
-      n.skip (':')     &&
-      n.getDigit2 (mm) && mm < 60)
-  {
-    seconds = (hh * 3600) + (mm * 60);
-
-    if (n.skip (':'))
-    {
-      if (n.getDigit2 (ss) && ss < 60)
-      {
-        seconds += ss;
-        _seconds = seconds;
-
-        if (!Lexer::isDigit (n.next ()))
-          return true;
-      }
-
-      n = backup;
-      return false;
-    }
-
-    _seconds = seconds;
-    if (!Lexer::isDigit (n.next ()))
-      return true;
-  }
-
-  n = backup;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// time-ext 'Z'
-bool ISO8601d::parse_time_utc_ext (Nibbler& n)
-{
-  n.save ();
-  if (parse_time_ext (n) &&
-      n.skip ('Z'))
-  {
-    _utc = true;
-    if (!Lexer::isDigit (n.next ()))
-      return true;
-  }
-
-  n.restore ();
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// time-ext offset-ext
-bool ISO8601d::parse_time_off_ext  (Nibbler& n)
-{
-  Nibbler backup (n);
-  if (parse_time_ext (n) &&
-      parse_off_ext (n))
-  {
-    if (!Lexer::isDigit (n.next ()))
-      return true;
-  }
-
-  n = backup;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Validation via simple range checking.
-bool ISO8601d::validate ()
-{
-  // _year;
-  if ((_year    && (_year    <   1900 || _year    >                                  2200)) ||
-      (_month   && (_month   <      1 || _month   >                                    12)) ||
-      (_week    && (_week    <      1 || _week    >                                    53)) ||
-      (_weekday && (_weekday <      0 || _weekday >                                     6)) ||
-      (_julian  && (_julian  <      1 || _julian  >          ISO8601d::daysInYear (_year))) ||
-      (_day     && (_day     <      1 || _day     > ISO8601d::daysInMonth (_month, _year))) ||
-      (_seconds && (_seconds <      1 || _seconds >                                 86400)) ||
-      (_offset  && (_offset  < -86400 || _offset  >                                 86400)))
-    return false;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// int tm_sec;       seconds (0 - 60)
-// int tm_min;       minutes (0 - 59)
-// int tm_hour;      hours (0 - 23)
-// int tm_mday;      day of month (1 - 31)
-// int tm_mon;       month of year (0 - 11)
-// int tm_year;      year - 1900
-// int tm_wday;      day of week (Sunday = 0)
-// int tm_yday;      day of year (0 - 365)
-// int tm_isdst;     is summer time in effect?
-// char *tm_zone;    abbreviation of timezone name
-// long tm_gmtoff;   offset from UTC in seconds
-void ISO8601d::resolve ()
-{
-  // Don't touch the original values.
-  int year    = _year;
-  int month   = _month;
-  int week    = _week;
-  int weekday = _weekday;
-  int julian  = _julian;
-  int day     = _day;
-  int seconds = _seconds;
-  int offset  = _offset;
-  bool utc    = _utc;
-
-  // Get current time.
-  time_t now = time (NULL);
-
-  // A UTC offset needs to be accommodated.  Once the offset is subtracted,
-  // only local and UTC times remain.
-  if (offset)
-  {
-    seconds -= offset;
-    now -= offset;
-    utc = true;
-  }
-
-  // Get 'now' in the relevant location.
-  struct tm* t_now = utc ? gmtime (&now) : localtime (&now);
-
-  int seconds_now = (t_now->tm_hour * 3600) +
-                    (t_now->tm_min  *   60) +
-                     t_now->tm_sec;
-
-  // Project forward one day if the specified seconds are earlier in the day
-  // than the current seconds.
-  if (year    == 0 &&
-      month   == 0 &&
-      day     == 0 &&
-      week    == 0 &&
-      weekday == 0 &&
-      seconds < seconds_now)
-  {
-    seconds += 86400;
-  }
-
-  // Convert week + weekday --> julian.
-  if (week)
-  {
-    julian = (week * 7) + weekday - dayOfWeek (year, 1, 4) - 3;
-  }
-
-  // Provide default values for year, month, day.
-  else
-  {
-    // Default values for year, month, day:
-    //
-    // y   m   d  -->  y   m   d
-    // y   m   -  -->  y   m   1
-    // y   -   -  -->  y   1   1
-    // -   -   -  -->  now now now
-    //
-    if (year == 0)
-    {
-      year  = t_now->tm_year + 1900;
-      month = t_now->tm_mon + 1;
-      day   = t_now->tm_mday;
-    }
-    else
-    {
-      if (month == 0)
-      {
-        month = 1;
-        day   = 1;
-      }
-      else if (day == 0)
-        day = 1;
-    }
-  }
-
-  if (julian)
-  {
-    month = 1;
-    day = julian;
-  }
-
-  struct tm t {};
-  t.tm_isdst = -1;  // Requests that mktime/gmtime determine summer time effect.
-  t.tm_year = year - 1900;
-  t.tm_mon = month - 1;
-  t.tm_mday = day;
-
-  if (seconds > 86400)
-  {
-    int days = seconds / 86400;
-    t.tm_mday += days;
-    seconds %= 86400;
-  }
-
-  t.tm_hour = seconds / 3600;
-  t.tm_min = (seconds % 3600) / 60;
-  t.tm_sec = seconds % 60;
-
-  _date = utc ? timegm (&t) : mktime (&t);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-time_t ISO8601d::toEpoch () const
-{
-  return _date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string ISO8601d::toEpochString () const
-{
-  std::stringstream epoch;
-  epoch << _date;
-  return epoch.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 19980119T070000Z =  YYYYMMDDThhmmssZ
-std::string ISO8601d::toISO () const
-{
-  struct tm* t = gmtime (&_date);
-
-  std::stringstream iso;
-  iso << std::setw (4) << std::setfill ('0') << t->tm_year + 1900
-      << std::setw (2) << std::setfill ('0') << t->tm_mon + 1
-      << std::setw (2) << std::setfill ('0') << t->tm_mday
-      << "T"
-      << std::setw (2) << std::setfill ('0') << t->tm_hour
-      << std::setw (2) << std::setfill ('0') << t->tm_min
-      << std::setw (2) << std::setfill ('0') << t->tm_sec
-      << "Z";
-
-  return iso.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 1998-01-19T07:00:00 =  YYYY-MM-DDThh:mm:ss
-std::string ISO8601d::toISOLocalExtended () const
-{
-  struct tm* t = localtime (&_date);
-
-  std::stringstream iso;
-  iso << std::setw (4) << std::setfill ('0') << t->tm_year + 1900
-      << "-"
-      << std::setw (2) << std::setfill ('0') << t->tm_mon + 1
-      << "-"
-      << std::setw (2) << std::setfill ('0') << t->tm_mday
-      << "T"
-      << std::setw (2) << std::setfill ('0') << t->tm_hour
-      << ":"
-      << std::setw (2) << std::setfill ('0') << t->tm_min
-      << ":"
-      << std::setw (2) << std::setfill ('0') << t->tm_sec;
-
-  return iso.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-double ISO8601d::toJulian () const
-{
-  return (_date / 86400.0) + 2440587.5;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ISO8601d::toMDY (int& m, int& d, int& y) const
-{
-  struct tm* t = localtime (&_date);
-
-  m = t->tm_mon + 1;
-  d = t->tm_mday;
-  y = t->tm_year + 1900;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string ISO8601d::toString (
-  const std::string& format /*= "m/d/Y" */) const
-{
-  std::stringstream formatted;
-  for (unsigned int i = 0; i < format.length (); ++i)
-  {
-    int c = format[i];
-    switch (c)
-    {
-    case 'm': formatted                                        << this->month ();         break;
-    case 'M': formatted << std::setw (2) << std::setfill ('0') << this->month ();         break;
-    case 'd': formatted                                        << this->day ();           break;
-    case 'D': formatted << std::setw (2) << std::setfill ('0') << this->day ();           break;
-    case 'y': formatted << std::setw (2) << std::setfill ('0') << (this->year () % 100);  break;
-    case 'Y': formatted                                        << this->year ();          break;
-    case 'a': formatted                                        << ISO8601d::dayNameShort (dayOfWeek ()); break;
-    case 'A': formatted                                        << ISO8601d::dayName (dayOfWeek ());      break;
-    case 'b': formatted                                        << ISO8601d::monthNameShort (month ());   break;
-    case 'B': formatted                                        << ISO8601d::monthName (month ());        break;
-    case 'v': formatted                                        << ISO8601d::weekOfYear (ISO8601d::dayOfWeek (ISO8601d::weekstart)); break;
-    case 'V': formatted << std::setw (2) << std::setfill ('0') << ISO8601d::weekOfYear (ISO8601d::dayOfWeek (ISO8601d::weekstart)); break;
-    case 'h': formatted                                        << this->hour ();          break;
-    case 'H': formatted << std::setw (2) << std::setfill ('0') << this->hour ();          break;
-    case 'n': formatted                                        << this->minute ();        break;
-    case 'N': formatted << std::setw (2) << std::setfill ('0') << this->minute ();        break;
-    case 's': formatted                                        << this->second ();        break;
-    case 'S': formatted << std::setw (2) << std::setfill ('0') << this->second ();        break;
-    case 'j': formatted                                        << this->dayOfYear ();     break;
-    case 'J': formatted << std::setw (3) << std::setfill ('0') << this->dayOfYear ();     break;
-    case 'w': formatted                                        << this->dayOfWeek ();     break;
-    default:  formatted                                        << static_cast <char> (c); break;
-    }
-  }
-
-  return formatted.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::startOfDay () const
-{
-  return ISO8601d (month (), day (), year ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::startOfWeek () const
-{
-  ISO8601d sow (_date);
-  sow -= (dayOfWeek () * 86400);
-  return ISO8601d (sow.month (), sow.day (), sow.year ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::startOfMonth () const
-{
-  return ISO8601d (month (), 1, year ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::startOfYear () const
-{
-  return ISO8601d (1, 1, year ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::valid (const std::string& input, const std::string& format /*= ""*/)
-{
-  try
-  {
-    ISO8601d test (input, format);
-  }
-
-  catch (...)
-  {
-    return false;
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::valid (const int m, const int d, const int y, const int hr,
-                  const int mi, const int se)
-{
-  if (hr < 0 || hr > 23)
-    return false;
-
-  if (mi < 0 || mi > 59)
-    return false;
-
-  if (se < 0 || se > 59)
-    return false;
-
-  return ISO8601d::valid (m, d, y);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::valid (const int m, const int d, const int y)
-{
-  // Check that the year is valid.
-  if (y < 0)
-    return false;
-
-  // Check that the month is valid.
-  if (m < 1 || m > 12)
-    return false;
-
-  // Finally check that the days fall within the acceptable range for this
-  // month, and whether or not this is a leap year.
-  if (d < 1 || d > ISO8601d::daysInMonth (m, y))
-    return false;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Julian
-bool ISO8601d::valid (const int d, const int y)
-{
-  // Check that the year is valid.
-  if (y < 0)
-    return false;
-
-  if (d < 1 || d > ISO8601d::daysInYear (y))
-    return false;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-bool ISO8601d::leapYear (int year)
-{
-  return ((! (year % 4)) && (year % 100)) ||
-         ! (year % 400);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-int ISO8601d::daysInMonth (int month, int year)
-{
-  static int days[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-  if (month == 2 && ISO8601d::leapYear (year))
-    return 29;
-
-  return days[month - 1];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-int ISO8601d::daysInYear (int year)
-{
-  return ISO8601d::leapYear (year) ? 366 : 365;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-std::string ISO8601d::monthName (int month)
-{
-  static const char* months[12] =
-  {
-    STRING_DATE_JANUARY,
-    STRING_DATE_FEBRUARY,
-    STRING_DATE_MARCH,
-    STRING_DATE_APRIL,
-    STRING_DATE_MAY,
-    STRING_DATE_JUNE,
-    STRING_DATE_JULY,
-    STRING_DATE_AUGUST,
-    STRING_DATE_SEPTEMBER,
-    STRING_DATE_OCTOBER,
-    STRING_DATE_NOVEMBER,
-    STRING_DATE_DECEMBER,
-  };
-
-  assert (month > 0);
-  assert (month <= 12);
-  return Lexer::ucFirst (months[month - 1]);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-std::string ISO8601d::monthNameShort (int month)
-{
-  static const char* months[12] =
-  {
-    STRING_DATE_JANUARY,
-    STRING_DATE_FEBRUARY,
-    STRING_DATE_MARCH,
-    STRING_DATE_APRIL,
-    STRING_DATE_MAY,
-    STRING_DATE_JUNE,
-    STRING_DATE_JULY,
-    STRING_DATE_AUGUST,
-    STRING_DATE_SEPTEMBER,
-    STRING_DATE_OCTOBER,
-    STRING_DATE_NOVEMBER,
-    STRING_DATE_DECEMBER,
-  };
-
-  assert (month > 0);
-  assert (month <= 12);
-  return Lexer::ucFirst (months[month - 1]).substr (0, 3);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-std::string ISO8601d::dayName (int dow)
-{
-  static const char* days[7] =
-  {
-    STRING_DATE_SUNDAY,
-    STRING_DATE_MONDAY,
-    STRING_DATE_TUESDAY,
-    STRING_DATE_WEDNESDAY,
-    STRING_DATE_THURSDAY,
-    STRING_DATE_FRIDAY,
-    STRING_DATE_SATURDAY,
-  };
-
-  return Lexer::ucFirst (days[dow]);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-std::string ISO8601d::dayNameShort (int dow)
-{
-  static const char* days[7] =
-  {
-    STRING_DATE_SUNDAY,
-    STRING_DATE_MONDAY,
-    STRING_DATE_TUESDAY,
-    STRING_DATE_WEDNESDAY,
-    STRING_DATE_THURSDAY,
-    STRING_DATE_FRIDAY,
-    STRING_DATE_SATURDAY,
-  };
-
-  return Lexer::ucFirst (days[dow]).substr (0, 3);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-int ISO8601d::dayOfWeek (const std::string& input)
-{
-  if (ISO8601d::minimumMatchLength== 0)
-    ISO8601d::minimumMatchLength = 3;
-
-       if (closeEnough (STRING_DATE_SUNDAY,    input, ISO8601d::minimumMatchLength)) return 0;
-  else if (closeEnough (STRING_DATE_MONDAY,    input, ISO8601d::minimumMatchLength)) return 1;
-  else if (closeEnough (STRING_DATE_TUESDAY,   input, ISO8601d::minimumMatchLength)) return 2;
-  else if (closeEnough (STRING_DATE_WEDNESDAY, input, ISO8601d::minimumMatchLength)) return 3;
-  else if (closeEnough (STRING_DATE_THURSDAY,  input, ISO8601d::minimumMatchLength)) return 4;
-  else if (closeEnough (STRING_DATE_FRIDAY,    input, ISO8601d::minimumMatchLength)) return 5;
-  else if (closeEnough (STRING_DATE_SATURDAY,  input, ISO8601d::minimumMatchLength)) return 6;
-
-  return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Using Zeller's Congruence.
-// Static
-int ISO8601d::dayOfWeek (int year, int month, int day)
-{
-  int adj = (14 - month) / 12;
-  int m = month + 12 * adj - 2;
-  int y = year - adj;
-  return (day + (13 * m - 1) / 5 + y + y / 4 - y / 100 + y / 400) % 7;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-int ISO8601d::monthOfYear (const std::string& input)
-{
-  if (ISO8601d::minimumMatchLength== 0)
-    ISO8601d::minimumMatchLength= 3;
-
-       if (closeEnough (STRING_DATE_JANUARY,   input, ISO8601d::minimumMatchLength)) return 1;
-  else if (closeEnough (STRING_DATE_FEBRUARY,  input, ISO8601d::minimumMatchLength)) return 2;
-  else if (closeEnough (STRING_DATE_MARCH,     input, ISO8601d::minimumMatchLength)) return 3;
-  else if (closeEnough (STRING_DATE_APRIL,     input, ISO8601d::minimumMatchLength)) return 4;
-  else if (closeEnough (STRING_DATE_MAY,       input, ISO8601d::minimumMatchLength)) return 5;
-  else if (closeEnough (STRING_DATE_JUNE,      input, ISO8601d::minimumMatchLength)) return 6;
-  else if (closeEnough (STRING_DATE_JULY,      input, ISO8601d::minimumMatchLength)) return 7;
-  else if (closeEnough (STRING_DATE_AUGUST,    input, ISO8601d::minimumMatchLength)) return 8;
-  else if (closeEnough (STRING_DATE_SEPTEMBER, input, ISO8601d::minimumMatchLength)) return 9;
-  else if (closeEnough (STRING_DATE_OCTOBER,   input, ISO8601d::minimumMatchLength)) return 10;
-  else if (closeEnough (STRING_DATE_NOVEMBER,  input, ISO8601d::minimumMatchLength)) return 11;
-  else if (closeEnough (STRING_DATE_DECEMBER,  input, ISO8601d::minimumMatchLength)) return 12;
-
-  return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Static
-int ISO8601d::length (const std::string& format)
-{
-  int len = 0;
-  for (auto& i : format)
-  {
-    switch (i)
-    {
-    case 'm':
-    case 'M':
-    case 'd':
-    case 'D':
-    case 'y':
-    case 'v':
-    case 'V':
-    case 'h':
-    case 'H':
-    case 'n':
-    case 'N':
-    case 's':
-    case 'S': len += 2;  break;
-    case 'b':
-    case 'j':
-    case 'J':
-    case 'a': len += 3;  break;
-    case 'Y': len += 4;  break;
-    case 'A':
-    case 'B': len += 10; break;
-
-    // Calculate the width, don't assume a single character width.
-    default:  len += mk_wcwidth (i); break;
-    }
-  }
-
-  return len;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::month () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_mon + 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::week () const
-{
-  return ISO8601d::weekOfYear (ISO8601d::dayOfWeek (ISO8601d::weekstart));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::day () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_mday;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::year () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_year + 1900;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::weekOfYear (int weekStart) const
-{
-  struct tm* t = localtime (&_date);
-  char   weekStr[3];
-
-  if (weekStart == 0)
-    strftime(weekStr, sizeof(weekStr), "%U", t);
-  else if (weekStart == 1)
-    strftime(weekStr, sizeof(weekStr), "%V", t);
-  else
-    throw std::string (STRING_DATE_BAD_WEEKSTART);
-
-  int weekNumber = atoi (weekStr);
-
-  if (weekStart == 0)
-    weekNumber += 1;
-
-  return weekNumber;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::dayOfWeek () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_wday;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::dayOfYear () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_yday + 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::hour () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_hour;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::minute () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_min;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ISO8601d::second () const
-{
-  struct tm* t = localtime (&_date);
-  return t->tm_sec;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator== (const ISO8601d& rhs) const
-{
-  return rhs._date == _date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator!= (const ISO8601d& rhs) const
-{
-  return rhs._date != _date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator<  (const ISO8601d& rhs) const
-{
-  return _date < rhs._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator> (const ISO8601d& rhs) const
-{
-  return _date > rhs._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator<= (const ISO8601d& rhs) const
-{
-  return _date <= rhs._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::operator>= (const ISO8601d& rhs) const
-{
-  return _date >= rhs._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameHour (const ISO8601d& rhs) const
-{
-  return this->year ()  == rhs.year ()  &&
-         this->month () == rhs.month () &&
-         this->day ()   == rhs.day ()   &&
-         this->hour ()  == rhs.hour ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameDay (const ISO8601d& rhs) const
-{
-  return this->year ()  == rhs.year ()  &&
-         this->month () == rhs.month () &&
-         this->day ()   == rhs.day ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameWeek (const ISO8601d& rhs) const
-{
-  return this->year () == rhs.year () &&
-         this->week () == rhs.week ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameMonth (const ISO8601d& rhs) const
-{
-  return this->year ()  == rhs.year () &&
-         this->month () == rhs.month ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameQuarter (const ISO8601d& rhs) const
-{
-  return (this->year () == rhs.year ()) &&
-         ((this->month () - 1) / 4) == ((rhs.month () - 1) / 4);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601d::sameYear (const ISO8601d& rhs) const
-{
-  return this->year () == rhs.year ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::operator+ (const int delta)
-{
-  return ISO8601d (_date + delta);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d ISO8601d::operator- (const int delta)
-{
-  return ISO8601d (_date - delta);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d& ISO8601d::operator+= (const int delta)
-{
-  _date += (time_t) delta;
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601d& ISO8601d::operator-= (const int delta)
-{
-  _date -= (time_t) delta;
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-time_t ISO8601d::operator- (const ISO8601d& rhs)
-{
-  return _date - rhs._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Prefix decrement by one day.
-void ISO8601d::operator-- ()
-{
-  ISO8601d yesterday = startOfDay () - 1;
-  yesterday = ISO8601d (yesterday.month (),
-                        yesterday.day (),
-                        yesterday.year (),
-                        hour (),
-                        minute (),
-                        second ());
-  _date = yesterday._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Postfix decrement by one day.
-void ISO8601d::operator-- (int)
-{
-  ISO8601d yesterday = startOfDay () - 1;
-  yesterday = ISO8601d (yesterday.month (),
-                        yesterday.day (),
-                        yesterday.year (),
-                        hour (),
-                        minute (),
-                        second ());
-  _date = yesterday._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Prefix increment by one day.
-void ISO8601d::operator++ ()
-{
-  ISO8601d tomorrow = (startOfDay () + 90001).startOfDay ();
-  tomorrow = ISO8601d (tomorrow.month (),
-                       tomorrow.day (),
-                       tomorrow.year (),
-                       hour (),
-                       minute (),
-                       second ());
-  _date = tomorrow._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Postfix increment by one day.
-void ISO8601d::operator++ (int)
-{
-  ISO8601d tomorrow = (startOfDay () + 90001).startOfDay ();
-  tomorrow = ISO8601d (tomorrow.month (),
-                       tomorrow.day (),
-                       tomorrow.year (),
-                       hour (),
-                       minute (),
-                       second ());
-  _date = tomorrow._date;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/*
-std::string ISO8601d::dump () const
-{
-  std::stringstream s;
-  s << "ISO8601d"
-    << " y"   << _year
-    << " m"   << _month
-    << " w"   << _week
-    << " wd"  << _weekday
-    << " j"   << _julian
-    << " d"   << _day
-    << " s"   << _seconds
-    << " off" << _offset
-    << " utc" << _utc
-    << " ="   << _date
-    << "  "   << (_date ? toISO () : "");
-
-  return s.str ();
-}
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::ISO8601p ()
-{
-  clear ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::ISO8601p (time_t input)
-{
-  clear ();
-  _period = input;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::ISO8601p (const std::string& input)
-{
-  clear ();
-
-  if (Lexer::isAllDigits (input))
-  {
-    time_t value = (time_t) strtol (input.c_str (), NULL, 10);
-    if (value == 0 || value > 60)
-    {
-      _period = value;
-      return;
-    }
-  }
-
-  std::string::size_type idx = 0;
-  parse (input, idx);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::~ISO8601p ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p& ISO8601p::operator= (const ISO8601p& other)
-{
-  if (this != &other)
-  {
-    _year    = other._year;
-    _month   = other._month;
-    _day     = other._day;
-    _hours   = other._hours;
-    _minutes = other._minutes;
-    _seconds = other._seconds;
-    _period  = other._period;
-  }
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601p::operator< (const ISO8601p& other)
-{
-  return _period < other._period;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601p::operator> (const ISO8601p& other)
-{
-  return _period > other._period;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::operator std::string () const
-{
-  std::stringstream s;
-  s << _period;
-  return s.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-ISO8601p::operator time_t () const
-{
-  return _period;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Supported:
-//
-//    duration   ::= designated                                     # duration
-//
-//    designated ::= 'P' [nn 'Y'] [nn 'M'] [nn 'D'] ['T' [nn 'H'] [nn 'M'] [nn 'S']]
-//
-// Not supported:
-//
-//    duration   ::= designated '/' datetime-ext                    # duration end
-//                 | degignated '/' datetime                        # duration end
-//                 | designated                                     # duration
-//                 | 'P' datetime-ext '/' datetime-ext              # start end
-//                 | 'P' datetime '/' datetime                      # start end
-//                 | 'P' datetime-ext                               # start
-//                 | 'P' datetime                                   # start
-//                 | datetime-ext '/' designated                    # start duration
-//                 | datetime-ext '/' 'P' datetime-ext              # start end
-//                 | datetime-ext '/' datetime-ext                  # start end
-//                 | datetime '/' designated                        # start duration
-//                 | datetime '/' 'P' datetime                      # start end
-//                 | datetime '/' datetime                          # start end
-//                 ;
-//
-bool ISO8601p::parse (const std::string& input, std::string::size_type& start)
-{
-  // Attempt and ISO parse first.
-  auto original_start = start;
-  Nibbler n (input.substr (original_start));
-  n.save ();
-
-  if (parse_designated (n))
-  {
-    // Check the values and determine time_t.
-    if (validate ())
-    {
-      // Record cursor position.
-      start = n.cursor ();
-
-      resolve ();
-      return true;
-    }
-  }
-
-  // Attempt a legacy format parse next.
-  n.restore ();
-
-  // Static and so preserved between calls.
-  static std::vector <std::string> units;
-  if (units.size () == 0)
-    for (unsigned int i = 0; i < NUM_DURATIONS; i++)
-      units.push_back (durations[i].unit);
-
-  std::string number;
-  std::string unit;
-
-  if (n.getOneOf (units, unit))
-  {
-    if (n.depleted ()                           ||
-        Lexer::isWhitespace         (n.next ()) ||
-        Lexer::isSingleCharOperator (n.next ()))
-    {
-      start = original_start + n.cursor ();
-
-      // Linear lookup - should instead be logarithmic.
-      for (unsigned int i = 0; i < NUM_DURATIONS; i++)
-      {
-        if (durations[i].unit == unit &&
-            durations[i].standalone == true)
-        {
-          _period = static_cast <int> (durations[i].seconds);
-          return true;
-        }
-      }
-    }
-  }
-
-  else if (n.getNumber (number) &&
-           number.find ('e') == std::string::npos &&
-           number.find ('E') == std::string::npos &&
-           (number.find ('+') == std::string::npos || number.find ('+') == 0) &&
-           (number.find ('-') == std::string::npos || number.find ('-') == 0))
-  {
-    n.skipWS ();
-    if (n.getOneOf (units, unit))
-    {
-      // The "d" unit is a special case, because it is the only one that can
-      // legitimately occur at the beginning of a UUID, and be followed by an
-      // operator:
-      //
-      //   1111111d-0000-0000-0000-000000000000
-      //
-      // Because Lexer::isDuration is higher precedence than Lexer::isUUID,
-      // the above UUID looks like:
-      //
-      //   <1111111d> <-> ...
-      //   duration   op  ...
-      //
-      // So as a special case, durations, with units of "d" are rejected if the
-      // quantity exceeds 10000.
-      //
-      if (unit == "d" &&
-          strtol (number.c_str (), NULL, 10) > 10000)
-        return false;
-
-      if (n.depleted ()                           ||
-          Lexer::isWhitespace         (n.next ()) ||
-          Lexer::isSingleCharOperator (n.next ()))
-      {
-        start = original_start + n.cursor ();
-        double quantity = strtod (number.c_str (), NULL);
-
-        // Linear lookup - should instead be logarithmic.
-        double seconds = 1;
-        for (unsigned int i = 0; i < NUM_DURATIONS; i++)
-        {
-          if (durations[i].unit == unit)
-          {
-            seconds = durations[i].seconds;
-            _period = static_cast <int> (quantity * static_cast <double> (seconds));
-            return true;
-          }
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ISO8601p::clear ()
-{
-  _year    = 0;
-  _month   = 0;
-  _day     = 0;
-  _hours   = 0;
-  _minutes = 0;
-  _seconds = 0;
-  _period  = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string ISO8601p::format () const
-{
-  if (_period)
-  {
-    time_t t = _period;
-    int seconds = t % 60; t /= 60;
-    int minutes = t % 60; t /= 60;
-    int hours   = t % 24; t /= 24;
-    int days    = t;
-
-    std::stringstream s;
-    s << 'P';
-    if (days)   s << days   << 'D';
-
-    if (hours || minutes || seconds)
-    {
-      s << 'T';
-      if (hours)   s << hours   << 'H';
-      if (minutes) s << minutes << 'M';
-      if (seconds) s << seconds << 'S';
-    }
-
-    return s.str ();
-  }
-  else
-  {
-    return "PT0S";
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Range      Representation
-// ---------  ---------------------
-// >= 365d    {n.n}y
-// >= 90d     {n}mo
-// >= 14d     {n}w
-// >= 1d      {n}d
-// >= 1h      {n}h
-// >= 1min    {n}min
-//            {n}s
-//
-const std::string ISO8601p::formatVague () const
-{
-  float days = (float) _period / 86400.0;
-
-  std::stringstream formatted;
-       if (_period >= 86400 * 365) formatted << std::fixed << std::setprecision (1) << (days / 365) << "y";
-  else if (_period >= 86400 * 90)  formatted << static_cast <int> (days / 30)       << "mo";
-  else if (_period >= 86400 * 14)  formatted << static_cast <int> (days / 7)        << "w";
-  else if (_period >= 86400)       formatted << static_cast <int> (days)            << "d";
-  else if (_period >= 3600)        formatted << static_cast <int> (_period / 3600)  << "h";
-  else if (_period >= 60)          formatted << static_cast <int> (_period / 60)    << "min";
-  else if (_period >= 1)           formatted << static_cast <int> (_period)         << "s";
-
-  return formatted.str ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 'P' [nn 'Y'] [nn 'M'] [nn 'D'] ['T' [nn 'H'] [nn 'M'] [nn 'S']]
-bool ISO8601p::parse_designated (Nibbler& n)
-{
-  Nibbler backup (n);
-
-  if (n.skip ('P'))
-  {
-    int value;
-    n.save ();
-    if (n.getUnsignedInt (value) && n.skip ('Y'))
-      _year = value;
-    else
-      n.restore ();
-
-    n.save ();
-    if (n.getUnsignedInt (value) && n.skip ('M'))
-      _month = value;
-    else
-      n.restore ();
-
-    n.save ();
-    if (n.getUnsignedInt (value) && n.skip ('D'))
-      _day = value;
-    else
-      n.restore ();
-
-    if (n.skip ('T'))
-    {
-      n.save ();
-      if (n.getUnsignedInt (value) && n.skip ('H'))
-        _hours = value;
-      else
-        n.restore ();
-
-      n.save ();
-      if (n.getUnsignedInt (value) && n.skip ('M'))
-        _minutes = value;
-      else
-        n.restore ();
-
-      n.save ();
-      if (n.getUnsignedInt (value) && n.skip ('S'))
-        _seconds = value;
-      else
-        n.restore ();
-    }
-
-    return true;
-  }
-
-  n = backup;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ISO8601p::validate ()
-{
-  return _year    ||
-         _month   ||
-         _day     ||
-         _hours   ||
-         _minutes ||
-         _seconds;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Allow un-normalized values.
-void ISO8601p::resolve ()
-{
-  _period = (_year  * 365 * 86400) +
-            (_month  * 30 * 86400) +
-            (_day         * 86400) +
-            (_hours       *  3600) +
-            (_minutes     *    60) +
-            _seconds;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/*
-std::string ISO8601p::dump () const
-{
-  std::stringstream s;
-  s << "ISO8601p"
-    << " y"  << _year
-    << " mo" << _month
-    << " d"  << _day
-    << " h"  << _hours
-    << " mi" << _minutes
-    << " s"  << _seconds
-    << " ="  << _period
-    << "  "         << (_period ? format () : "");
-
-  return s.str ();
-}
-*/
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/ISO8601.h b/src/ISO8601.h
deleted file mode 100644
index a28f8edee..000000000
--- a/src/ISO8601.h
+++ /dev/null
@@ -1,179 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_ISO8601
-#define INCLUDED_ISO8601
-
-#include <Nibbler.h>
-#include <time.h>
-
-// Date
-class ISO8601d
-{
-public:
-  static std::string weekstart;
-  static int minimumMatchLength;
-  static bool isoEnabled;
-
-  ISO8601d ();
-  ISO8601d (const std::string&, const std::string& format = "");
-  ISO8601d (time_t);
-  ISO8601d (const int, const int, const int);
-  ISO8601d (const int, const int, const int, const int, const int, const int);
-  ~ISO8601d ();
-  bool parse (const std::string&, std::string::size_type&, const std::string& format = "");
-
-  time_t toEpoch () const;
-  std::string toEpochString () const;
-  std::string toISO () const;
-  std::string toISOLocalExtended () const;
-  double toJulian () const;
-  void toMDY (int&, int&, int&) const;
-  const std::string toString (const std::string& format = "m/d/Y") const;
-
-  ISO8601d startOfDay () const;
-  ISO8601d startOfWeek () const;
-  ISO8601d startOfMonth () const;
-  ISO8601d startOfYear () const;
-
-  static bool valid (const std::string&, const std::string& format = "");
-  static bool valid (const int, const int, const int, const int, const int, const int);
-  static bool valid (const int, const int, const int);
-  static bool valid (const int, const int);
-  static bool leapYear (int);
-  static int daysInMonth (int, int);
-  static int daysInYear (int);
-  static std::string monthName (int);
-  static std::string monthNameShort (int);
-  static std::string dayName (int);
-  static std::string dayNameShort (int);
-  static int dayOfWeek (const std::string&);
-  static int dayOfWeek (int, int, int);
-  static int monthOfYear (const std::string&);
-  static int length (const std::string&);
-
-  int month () const;
-  int week () const;
-  int day () const;
-  int year () const;
-  int weekOfYear (int) const;
-  int dayOfWeek () const;
-  int dayOfYear () const;
-  int hour () const;
-  int minute () const;
-  int second () const;
-
-  bool operator==  (const ISO8601d&) const;
-  bool operator!=  (const ISO8601d&) const;
-  bool operator<   (const ISO8601d&) const;
-  bool operator>   (const ISO8601d&) const;
-  bool operator<=  (const ISO8601d&) const;
-  bool operator>=  (const ISO8601d&) const;
-  bool sameHour    (const ISO8601d&) const;
-  bool sameDay     (const ISO8601d&) const;
-  bool sameWeek    (const ISO8601d&) const;
-  bool sameMonth   (const ISO8601d&) const;
-  bool sameQuarter (const ISO8601d&) const;
-  bool sameYear    (const ISO8601d&) const;
-  ISO8601d operator+  (const int);
-  ISO8601d operator-  (const int);
-  ISO8601d& operator+= (const int);
-  ISO8601d& operator-= (const int);
-  time_t operator- (const ISO8601d&);
-  void operator--  ();    // Prefix
-  void operator--  (int); // Postfix
-  void operator++  ();    // Prefix
-  void operator++  (int); // Postfix
-
-private:
-  void clear ();
-  bool parse_formatted     (Nibbler&, const std::string&);
-  bool parse_named         (Nibbler&);
-  bool parse_epoch         (Nibbler&);
-  bool parse_date_time     (Nibbler&);
-  bool parse_date_time_ext (Nibbler&);
-  bool parse_date_ext      (Nibbler&);
-  bool parse_off_ext       (Nibbler&);
-  bool parse_time_ext      (Nibbler&);
-  bool parse_time_utc_ext  (Nibbler&);
-  bool parse_time_off_ext  (Nibbler&);
-  bool validate ();
-  void resolve ();
-  std::string dump () const;
-
-public:
-  int _year;
-  int _month;
-  int _week;
-  int _weekday;
-  int _julian;
-  int _day;
-  int _seconds;
-  int _offset;
-  bool _utc;
-  time_t _date;
-};
-
-// Period
-class ISO8601p
-{
-public:
-  static bool isoEnabled;
-
-  ISO8601p ();
-  ISO8601p (time_t);
-  ISO8601p (const std::string&);
-  ~ISO8601p ();
-  ISO8601p (const ISO8601p&);            // Unimplemented
-  ISO8601p& operator= (const ISO8601p&);
-  bool operator< (const ISO8601p&);
-  bool operator> (const ISO8601p&);
-  operator std::string () const;
-  operator time_t () const;
-  bool parse (const std::string&, std::string::size_type&);
-  const std::string format () const;
-  const std::string formatVague () const;
-
-private:
-  void clear ();
-  bool parse_designated (Nibbler&);
-  bool validate ();
-  void resolve ();
-  std::string dump () const;
-
-public:
-  int _year;
-  int _month;
-  int _day;
-  int _hours;
-  int _minutes;
-  int _seconds;
-  time_t _period;
-};
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////

From f2483538d2e7ffcfae2c927f196c7d4f0a18753a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 22:21:07 -0500
Subject: [PATCH 446/879] Tests: Removed unused Nibbler tests

---
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/nibbler.t.cpp  | 471 --------------------------------------------
 3 files changed, 1 insertion(+), 473 deletions(-)
 delete mode 100644 test/nibbler.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 46f48742b..38bc7bb35 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -7,7 +7,6 @@ col.t
 dates.t
 eval.t
 lexer.t
-nibbler.t
 t.t
 taskmod.t
 tdb2.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 56dd7cf96..b76b2fb77 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t nibbler.t t.t tdb2.t util.t view.t lexer.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t t.t tdb2.t util.t view.t lexer.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
deleted file mode 100644
index f6e755332..000000000
--- a/test/nibbler.t.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <stdlib.h>
-#include <Context.h>
-#include <Nibbler.h>
-#include <test.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (234);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  try
-  {
-    Nibbler n;
-    std::string s;
-    int i;
-    double d;
-    std::vector <std::string> options;
-
-    // Make sure the nibbler behaves itself with trivial input.
-    t.diag ("Test all nibbler calls given empty input");
-    n = Nibbler ("");
-    t.notok (n.getUntil (' ', s),        "trivial: getUntil");
-    t.notok (n.getUntil ("hi", s),       "trivial: getUntil");
-    t.notok (n.getUntilOneOf ("ab", s),  "trivial: getUntilOneOf");
-    t.notok (n.skipN (123),              "trivial: skipN");
-    t.notok (n.skip ('x'),               "trivial: skip");
-    t.notok (n.skipAllOneOf ("abc"),     "trivial: skipAllOneOf");
-    t.notok (n.getQuoted ('"', s),       "trivial: getQuoted");
-    t.notok (n.getDigit (i),             "trivial: getDigit");
-    t.notok (n.getInt (i),               "trivial: getInt"); // 10
-    t.notok (n.getUnsignedInt (i),       "trivial: getUnsignedInt");
-    t.notok (n.getUntilEOS (s),          "trivial: getUntilEOS");
-    t.notok (n.getOneOf (options, s),    "trivial: getOneOf");
-    t.ok    (n.depleted (),              "trivial: depleted");
-
-    // bool getUntil (char, std::string&);
-    t.diag ("Nibbler::getUntil");
-    n = Nibbler ("one two");
-    t.ok    (n.getUntil (' ', s),        " 'one two' :       getUntil (' ')    -> true");
-    t.is    (s, "one",                   " 'one two' :       getUntil (' ')    -> 'one'"); // 20
-    t.ok    (n.getUntil (' ', s),        "    ' two' :       getUntil (' ')    -> true");
-    t.is    (s, "",                      "    ' two' :       getUntil (' ')    -> ''");
-    t.ok    (n.skip (' '),               "    ' two' :           skip (' ')    -> true");
-    t.ok    (n.getUntil (' ', s),        "     'two' :       getUntil (' ')    -> 'two'");
-    t.notok (n.getUntil (' ', s),        "        '' :       getUntil (' ')    -> false");
-    t.ok    (n.depleted (),              "        '' :       depleted ()       -> true");
-
-    // bool getUntilOneOf (const std::string&, std::string&);
-    t.diag ("Nibbler::getUntilOneOf");
-    n = Nibbler ("ab.cd");
-    t.ok    (n.getUntilOneOf (".:", s),  "   'ab.cd' :  getUntilOneOf ('.:')   -> true");
-    t.is    (s, "ab",                    "   'ab.cd' :  getUntilOneOf ('.:')   -> 'ab'");
-    t.ok    (n.skipN (),                 "     '.cd' :          skipN ()       -> true");
-    t.ok    (n.getUntilOneOf (".:", s),  "      'cd' :  getUntilOneOf ('.:')   -> true");
-    t.notok (n.getUntilOneOf (".:", s),  "        '' :  getUntilOneOf ('.:')   -> false");
-    t.ok    (n.depleted (),              "        '' :       depleted ()       -> true");
-
-    // bool getUntil (const std::string&, std::string&);
-    t.diag ("Nibbler::getUntil");
-    n = Nibbler ("ab\r\ncd");
-    t.ok (n.getUntil ("\r\n", s),     "'ab\\r\\ncd' :       getUntil ('\\r\\n') -> true");
-    t.ok (n.skipN (2),                "  '\\r\\ncd' :          skipN (2)      -> true");
-    t.ok (n.getUntil ("\r\n", s),     "      'cd' :       getUntil ('\\r\\n') -> true");
-    t.ok (n.depleted (),              "        '' :       depleted ()       -> true");
-
-    // bool getUntilWS (std::string&);
-    t.diag ("Nibbler::getUntilWS");
-    n = Nibbler ("ab \t\ncd");
-    t.ok    (n.getUntilWS (s),        " 'ab \\t\\ncd' :     getUntilWS ()     -> true");
-    t.is    (s, "ab",                 " 'ab \\t\\ncd' :     getUntilWS ()     -> 'ab'");
-    t.ok    (n.getUntilWS (s),        "   ' \\t\\ncd' :     getUntilWS ()     -> true");
-    t.is    (s, "",                   "   ' \\t\\ncd' :     getUntilWS ()     -> ''");
-    t.ok    (n.skipWS (),             "        'cd' :         skipWS ()     -> true");
-    t.ok    (n.getUntilWS (s),        "          '' :     getUntilWS ()     -> true");
-    t.is    (s, "cd",                 "        'cd' :     getUntilWS ()     -> 'cd'");
-    t.ok    (n.depleted (),           "          '' :       depleted ()     -> true");
-
-    // bool skipN (const int quantity = 1);
-    t.diag ("Nibbler::skipN");
-    n = Nibbler ("abcde");
-    t.ok    (n.skipN (),              "   'abcde' :          skipN ()       -> true");
-    t.ok    (n.skipN (2),             "    'bcde' :          skipN (2       -> true");
-    t.notok (n.skipN (3),             "      'de' :          skipN (3       -> false");
-    t.notok (n.depleted (),           "      'de' :       depleted ()       -> true");
-
-    // bool skip (char);
-    t.diag ("Nibbler::skip");
-    n = Nibbler ("  a");
-    t.ok    (n.skip (' '),            "     '  a' :           skip (' ')    -> true");
-    t.ok    (n.skip (' '),            "      ' a' :           skip (' ')    -> true");
-    t.notok (n.skip (' '),            "       'a' :           skip (' ')    -> false");
-    t.notok (n.depleted (),           "       'a' :       depleted ()       -> false");
-    t.ok    (n.skip ('a'),            "       'a' :           skip ('a')    -> true");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool skipAllOneOf (const std::string&);
-    t.diag ("Nibbler::skipAllOneOf");
-    n = Nibbler ("abababcc");
-    t.ok    (n.skipAllOneOf ("ab"),   "'abababcc' :   skipAllOneOf ('ab')   -> true");
-    t.notok (n.skipAllOneOf ("ab"),   "      'cc' :   skipAllOneOf ('ab')   -> false");
-    t.ok    (n.skipAllOneOf ("c"),    "      'cc' :   skipAllOneOf ('ab')   -> false");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool skipWS ();
-    t.diag ("Nibbler::skipWS");
-    n = Nibbler (" \tfoo");
-    t.ok    (n.skipWS (),             "  ' \\tfoo' :         skipWS ()       -> true");
-    t.notok (n.skipWS (),             "     'foo' :         skipWS ()       -> false");
-    t.ok    (n.getUntilEOS (s),       "     'foo' :    getUntilEOS ()       -> true");
-    t.is    (s, "foo",                "     'foo' :    getUntilEOS ()       -> 'foo'");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool getQuoted (char, std::string&);
-    t.diag ("Nibbler::getQuoted");
-    n = Nibbler ("''");
-    t.ok    (n.getQuoted ('\'', s),   "      '''' :      getQuoted (''')    -> true");
-    t.is    (s, "",                   "      '''' :      getQuoted (''')    -> ''");
-
-    n = Nibbler ("'\"'");
-    t.ok    (n.getQuoted ('\'', s),   "      ''\"'' :     getQuoted (''')    -> true");
-    t.is    (s, "\"",                  "     ''\"'' :      getQuoted (''')    -> '\"'");
-
-    n = Nibbler ("'x'");
-    t.ok    (n.getQuoted ('\'', s),   "      ''x'' :     getQuoted (''')    -> true");
-    t.is    (s, "x",                  "      ''x'' :     getQuoted (''')    -> ''");
-
-    n = Nibbler ("'x");
-    t.notok (n.getQuoted ('\'', s),   "      ''x' :      getQuoted (''')    -> false");
-
-    n = Nibbler ("x");
-    t.notok (n.getQuoted ('\'', s),   "       'x' :      getQuoted (''')    -> false"); // 90
-
-    n = Nibbler ("\"one\\\"two\"");
-    t.notok (n.getQuoted ('\'', s),   "\"one\\\"two\" :      getQuoted (''')    -> false");
-
-    n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s), "\"one\\\"two\" :      getQuoted ('\"', s) -> true");
-    t.is (s, "one\\\"two", "getQuoted ('\"', s) -> one\\\"two");
-
-    n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s), "\"one\\\"two\" :      getQuoted ('\"', s) -> true");
-    t.is (s, "one\\\"two", "getQuoted ('\"', s) -> one\\\"two");
-
-    n = Nibbler ("\"one\\\\\"");
-    t.ok (n.getQuoted ('\"', s), "one\\ :              getQuoted ('\"', s)      -> true");
-    t.is (s, "one\\\\",                                       "getQuoted ('\"', s)      -> \"one\\\\\"");
-
-    // bool getDigit (int&);
-    t.diag ("Nibbler::getDigit");
-    n = Nibbler ("12x");
-    t.ok    (n.getDigit (i),          "     '12x' :         getDigit ()     -> true");
-    t.is    (i, 1,                    "     '12x' :         getDigit ()     -> 1");
-    t.ok    (n.getDigit (i),          "      '2x' :         getDigit ()     -> true");
-    t.is    (i, 2,                    "      '2x' :         getDigit ()     -> 2");
-    t.notok (n.getDigit (i),          "       'x' :         getDigit ()     -> false");
-
-    // bool getDigit4 (int&);
-    t.diag ("Nibbler::getDigit4");
-    n = Nibbler ("4321");
-    t.ok    (n.getDigit4 (i),         "      4321 :         getDigit4 ()    -> true");
-    t.is    (i, 4321,                 "      4321 :         getDigit4 ()    -> 4321");
-
-    // bool getDigit2 (int&);
-    t.diag ("Nibbler::getDigit2");
-    n = Nibbler ("21");
-    t.ok    (n.getDigit2 (i),         "        21 :         getDigit2 ()    -> true");
-    t.is    (i, 21,                   "        21 :         getDigit2 ()    -> 21");
-
-    // bool getInt (int&);
-    t.diag ("Nibbler::getInt");
-    n = Nibbler ("123 -4");
-    t.ok    (n.getInt (i),            "  '123 -4' :         getInt ()       -> true");
-    t.is    (i, 123,                  "  '123 -4' :         getInt ()       -> '123'");
-    t.ok    (n.skip (' '),            "     ' -4' :           skip (' ')    -> true");
-    t.ok    (n.getInt (i),            "      '-4' :         getInt ()       -> true");
-    t.is    (i, -4,                   "      '-4' :         getInt ()       -> '-4'");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool getUnsignedInt (int&i);
-    t.diag ("Nibbler::getUnsignedInt");
-    n = Nibbler ("123 4");
-    t.ok    (n.getUnsignedInt (i),    "   '123 4' : getUnsignedInt ()       -> true");
-    t.is    (i, 123,                  "   '123 4' : getUnsignedInt ()       -> '123'");
-    t.ok    (n.skip (' '),            "      ' 4' :           skip (' ')    -> true");
-    t.ok    (n.getUnsignedInt (i),    "       '4' : getUnsignedInt ()       -> true");
-    t.is    (i, 4,                    "       '4' : getUnsignedInt ()       -> '4'");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool getNumber (double&);
-    t.diag ("Nibbler::getNumber");
-    n = Nibbler ("-1.234 2.3e4");
-    t.ok    (n.getNumber (d),         "'-1.234 2.3e4' : getNumber ()       -> true");
-    t.is    (d, -1.234, 0.000001,     "'-1.234 2.3e4' : getNumber ()       -> '-1.234'");
-    t.ok    (n.skip (' '),            "      ' 2.3e4' : skip (' ')         -> true");
-    t.ok    (n.getNumber (d),         "       '2.3e4' : getNumber ()       -> true");
-    t.is    (d, 2.3e4,                "       '2.3e4' : getNumber ()       -> '2.3e4'");
-    t.ok    (n.depleted (),           "            '' : depleted ()        -> true");
-
-    n = Nibbler ("2.0");
-    t.ok    (n.getNumber (d),         "'2.0' : getNumber ()                -> true");
-    t.is    (d, 2.0, 0.000001,        "'2.0' : getNumber ()                -> '2.0'");
-    t.ok    (n.depleted (),           "            '' : depleted ()        -> true");
-
-    n = Nibbler ("-864000.00000");
-    t.ok    (n.getNumber (d),         "'-864000.00000' : getNumber ()      -> true");
-    t.is    (d, -864000.0,            "'-864000.00000' : getNumber ()      -> -864000.0");
-    t.ok    (n.depleted (),           "             '' : depleted ()       -> true");
-
-    // bool getLiteral (const std::string&);
-    t.diag ("Nibbler::getLiteral");
-    n = Nibbler ("foobar");
-    t.ok    (n.getLiteral ("foo"),    "  'foobar' :     getLiteral ('foo')  -> true");
-    t.notok (n.getLiteral ("foo"),    "     'bar' :     getLiteral ('foo')  -> false");
-    t.ok    (n.getLiteral ("bar"),    "     'bar' :     getLiteral ('bar')  -> true");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // bool getPartialUUID (std::string&);
-    t.diag ("Nibbler::getPartialUUID");
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [36] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5", "partial uuid [36] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [35] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d",  "partial uuid [35] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [34] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4",   "partial uuid [34] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [33] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c",    "partial uuid [33] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [32] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3",     "partial uuid [32] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [31] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b",      "partial uuid [31] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [30] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2",       "partial uuid [30] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [29] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a",        "partial uuid [29] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [28] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1",         "partial uuid [28] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [27] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F",          "partial uuid [27] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [26] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0",           "partial uuid [26] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [25] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E",            "partial uuid [25] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [24] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-",             "partial uuid [24] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [23] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9",              "partial uuid [23] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [22] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D",               "partial uuid [22] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [21] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8",                "partial uuid [21] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [20] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C",                 "partial uuid [20] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [19] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-",                  "partial uuid [19] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [18] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7",                   "partial uuid [18] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6B");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [17] found");
-    t.is (s, "a0b1c2d3-e4f5-A6B",                    "partial uuid [17] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A6");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [16] found");
-    t.is (s, "a0b1c2d3-e4f5-A6",                     "partial uuid [16] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-A");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [15] found");
-    t.is (s, "a0b1c2d3-e4f5-A",                      "partial uuid [15] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5-");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [14] found");
-    t.is (s, "a0b1c2d3-e4f5-",                       "partial uuid [14] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f5");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [13] found");
-    t.is (s, "a0b1c2d3-e4f5",                        "partial uuid [13] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4f");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [12] found");
-    t.is (s, "a0b1c2d3-e4f",                         "partial uuid [12] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e4");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [11] found");
-    t.is (s, "a0b1c2d3-e4",                          "partial uuid [11] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-e");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [10] found");
-    t.is (s, "a0b1c2d3-e",                           "partial uuid [10] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3-");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [9] found");
-    t.is (s, "a0b1c2d3-",                            "partial uuid [9] -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("a0b1c2d3");
-    t.ok (n.getPartialUUID (s),                      "partial uuid [8] found");
-    t.is (s, "a0b1c2d3",                             "partial uuid [8] -> correct");
-    t.ok (n.depleted (),                             "not depleted");
-
-    // bool getOneOf (const std::vector <std::string>&, std::string&);
-    t.diag ("Nibbler::getOneOf");
-    options = {"one", "two", "three"};
-    n = Nibbler ("onetwothreefour");
-    t.ok    (n.getOneOf (options, s),         "'onetwothreefour':   getOneOf () -> true");
-    t.is    (s, "one",                        "'onetwothreefour':   getOneOf () -> one");
-    t.ok    (n.getOneOf (options, s),         "   'twothreefour':   getOneOf () -> true");
-    t.is    (s, "two",                        "   'twothreefour':   getOneOf () -> two");
-    t.ok    (n.getOneOf (options, s),         "      'threefour':   getOneOf () -> true");
-    t.is    (s, "three",                      "      'threefour':   getOneOf () -> three");
-    t.notok (n.getOneOf (options, s),         "           'four':   getOneOf () -> false");
-
-    // bool getN (int, std::string&);
-    t.diag ("Nibbler::getN");
-    n = Nibbler ("111223");
-    t.ok (n.getN (3, s),              "  '111223' : getN (3)         -> true");
-    t.is (s, "111",                   "  '111223' : getN (3)         -> '111'");
-    t.ok (n.getN (2, s),              "     '223' : getN (2)         -> true");
-    t.is (s, "22",                    "     '223' : getN (2)         -> '22'");
-    t.ok (n.getN (1, s),              "       '3' : getN (1)         -> true");
-    t.is (s, "3",                     "       '3' : getN (1)         -> '1'");
-    t.ok    (n.depleted (),           "        '' : depleted ()      -> true");
-
-    // bool getUntilEOS (std::string&);
-    t.diag ("Nibbler::getUntilEOS");
-    n = Nibbler ("one two");
-    t.ok    (n.getUntilEOS (s),       " 'one two' :    getUntilEOS ()       -> 'one two'");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // char next ();
-    t.diag ("Nibbler::next");
-    n = Nibbler ("hello");
-    t.is    (n.next (), 'h',          "   'hello' :           next ()       -> 'h'");
-    t.is    (n.next (), 'h',          "   'hello' :           next ()       -> 'h'");
-    t.ok    (n.skipN (4),             "   'hello' :          skipN (4)      -> true");
-    t.is    (n.next (), 'o',          "       'o' :           next ()       -> 'o'");
-    t.ok    (n.skipN (1),             "       'o' :          skipN ()       -> true");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // std::string next (const int quantity);
-    t.diag ("Nibbler::next");
-    n = Nibbler ("hello");
-    t.is    (n.next (1), "h",         "   'hello' :          next (1)       -> 'h'");
-    t.is    (n.next (1), "h",         "   'hello' :          next (1)       -> 'h'");
-    t.is    (n.next (2), "he",        "   'hello' :          next (2)       -> 'he'");
-    t.is    (n.next (3), "hel",       "   'hello' :          next (3)       -> 'hel'");
-    t.is    (n.next (4), "hell",      "   'hello' :          next (4)       -> 'hell'");
-    t.is    (n.next (5), "hello",     "   'hello' :          next (5)       -> 'hello'");
-    t.is    (n.next (6), "",          "   'hello' :          next (6)       -> ''");
-
-    // bool depleted ();
-    t.diag ("Nibbler::depleted");
-    n = Nibbler (" ");
-    t.notok (n.depleted (),           "       ' ' :       depleted ()       -> false");
-    t.ok    (n.skipN (),              "        '' :           skip ()       -> true");
-    t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
-
-    // void save ();
-    // void restore ();
-    n = Nibbler ("abcde");
-    t.ok (n.skipN (),                 "   'abcde' :           skip ()       -> true");
-    n.save ();
-    t.ok (n.skipN (),                 "    'bcde' :           skip ()       -> true");
-    t.ok (n.skipN (),                 "     'cde' :           skip ()       -> true");
-    t.ok (n.skipN (),                 "      'de' :           skip ()       -> true");
-    n.restore ();
-    t.is (n.next (1), "b",            "    'bcde' :           skip ()       -> 'b'");
-  }
-
-  catch (const std::string& e) {t.diag (e);}
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From d424a885bd64135d78f7bff3a8673452a93857ae Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 4 Mar 2017 22:21:49 -0500
Subject: [PATCH 447/879] Nibbler: Elimnated, migrated to Pig

---
 src/CMakeLists.txt |   1 -
 src/Nibbler.cpp    | 626 ---------------------------------------------
 src/Nibbler.h      |  89 -------
 3 files changed, 716 deletions(-)
 delete mode 100644 src/Nibbler.cpp
 delete mode 100644 src/Nibbler.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b05f4126e..d7f3d4c69 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ add_library (task CLI2.cpp CLI2.h
                   Filter.cpp Filter.h
                   Hooks.cpp Hooks.h
                   Lexer.cpp Lexer.h
-                  Nibbler.cpp Nibbler.h
                   TDB2.cpp TDB2.h
                   Task.cpp Task.h
                   TLSClient.cpp TLSClient.h
diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
deleted file mode 100644
index 23331aae6..000000000
--- a/src/Nibbler.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Nibbler.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <Lexer.h>
-#include <util.h>
-
-static const char*        _uuid_pattern    = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
-static const unsigned int _uuid_min_length = 8;
-
-////////////////////////////////////////////////////////////////////////////////
-Nibbler::Nibbler ()
-: _length (0)
-, _cursor (0)
-, _saved (0)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Nibbler::Nibbler (const std::string& input)
-: _input (std::make_shared <std::string> (input))
-, _length (input.length ())
-, _cursor (0)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Nibbler::Nibbler (const Nibbler& other)
-: _input (other._input)
-, _length (other._length)
-, _cursor (other._cursor)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Nibbler& Nibbler::operator= (const Nibbler& other)
-{
-  if (this != &other)
-  {
-    _input  = other._input;
-    _length = other._length;
-    _cursor = other._cursor;
-  }
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-Nibbler::~Nibbler ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Extract up until the next c (but not including) or EOS.
-bool Nibbler::getUntil (char c, std::string& result)
-{
-  if (_cursor < _length)
-  {
-    auto i = _input->find (c, _cursor);
-    if (i != std::string::npos)
-    {
-      result = _input->substr (_cursor, i - _cursor);
-      _cursor = i;
-    }
-    else
-    {
-      result = _input->substr (_cursor);
-      _cursor = _length;
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUntil (const std::string& terminator, std::string& result)
-{
-  if (_cursor < _length)
-  {
-    auto i = _input->find (terminator, _cursor);
-    if (i != std::string::npos)
-    {
-      result = _input->substr (_cursor, i - _cursor);
-      _cursor = i;
-    }
-    else
-    {
-      result = _input->substr (_cursor);
-      _cursor = _length;
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUntilOneOf (const std::string& chars, std::string& result)
-{
-  if (_cursor < _length)
-  {
-    auto i = _input->find_first_of (chars, _cursor);
-    if (i != std::string::npos)
-    {
-      result = _input->substr (_cursor, i - _cursor);
-      _cursor = i;
-    }
-    else
-    {
-      result = _input->substr (_cursor);
-      _cursor = _length;
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUntilWS (std::string& result)
-{
-  return this->getUntilOneOf (" \t\r\n\f", result);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUntilEOS (std::string& result)
-{
-  if (_cursor < _length)
-  {
-    result = _input->substr (_cursor);
-    _cursor = _length;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getN (const int quantity, std::string& result)
-{
-  if (_cursor + quantity <= _length)
-  {
-    result = _input->substr (_cursor, quantity);
-    _cursor += quantity;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Gets quote content:      "foobar" -> foobar      (for c = '"')
-// Handles escaped quotes:  "foo\"bar" -> foo\"bar  (for c = '"')
-// Returns false if first character is not c, or if there is no closing c
-bool Nibbler::getQuoted (char c, std::string& result)
-{
-  result = "";
-
-  if (_cursor >= _length ||
-      (*_input)[_cursor] != c)
-  {
-    return false;
-  }
-
-  std::string::size_type start = _cursor + 1;  // Skip first quote char
-  std::string::size_type i = start;
-
-  while (i < _length)
-  {
-    i = (*_input).find (c, i);
-
-    if (i == std::string::npos)
-      return false;  // Unclosed quote
-
-    if (i == start)
-    {
-      // Empty quote
-      _cursor += 2;  // Skip both quote chars
-      return true;
-    }
-
-    if ((*_input)[i-1] == '\\')
-    {
-      // Check for escaped backslashes.  Backtracking like this is not very
-      // efficient, but is only done in extreme corner cases.
-
-      auto j = i-2;  // Start one character further left
-      bool is_escaped_quote = true;
-      while (j >= start && (*_input)[j] == '\\')
-      {
-        // Toggle flag for each further backslash encountered.
-        is_escaped_quote = is_escaped_quote ? false : true;
-        --j;
-      }
-
-      if (is_escaped_quote)
-      {
-        // Keep searching
-        ++i;
-        continue;
-      }
-    }
-
-    // None of the above applied, we must have found the closing quote char.
-    result.assign ((*_input), start, i - start);
-    _cursor = i + 1;  // Skip closing quote char
-    return true;
-  }
-
-  // This should never be reached.  We could throw here instead.
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getDigit (int& result)
-{
-  if (_cursor < _length &&
-      Lexer::isDigit ((*_input)[_cursor]))
-  {
-    result = (*_input)[_cursor++] - '0';
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getDigit4 (int& result)
-{
-  auto i = _cursor;
-  if (i < _length &&
-      _length - i >= 4)
-  {
-    if (Lexer::isDigit ((*_input)[i + 0]) &&
-        Lexer::isDigit ((*_input)[i + 1]) &&
-        Lexer::isDigit ((*_input)[i + 2]) &&
-        Lexer::isDigit ((*_input)[i + 3]))
-    {
-      result = strtoimax (_input->substr (_cursor, 4).c_str (), NULL, 10);
-      _cursor += 4;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getDigit3 (int& result)
-{
-  auto i = _cursor;
-  if (i < _length &&
-      _length - i >= 3)
-  {
-    if (Lexer::isDigit ((*_input)[i + 0]) &&
-        Lexer::isDigit ((*_input)[i + 1]) &&
-        Lexer::isDigit ((*_input)[i + 2]))
-    {
-      result = strtoimax (_input->substr (_cursor, 3).c_str (), NULL, 10);
-      _cursor += 3;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getDigit2 (int& result)
-{
-  auto i = _cursor;
-  if (i < _length &&
-      _length - i >= 2)
-  {
-    if (Lexer::isDigit ((*_input)[i + 0]) &&
-        Lexer::isDigit ((*_input)[i + 1]))
-    {
-      result = strtoimax (_input->substr (_cursor, 2).c_str (), NULL, 10);
-      _cursor += 2;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getInt (int& result)
-{
-  auto i = _cursor;
-
-  if (i < _length)
-  {
-    if ((*_input)[i] == '-')
-      ++i;
-    else if ((*_input)[i] == '+')
-      ++i;
-  }
-
-  // TODO Potential for use of find_first_not_of
-  while (i < _length && Lexer::isDigit ((*_input)[i]))
-    ++i;
-
-  if (i > _cursor)
-  {
-    result = strtoimax (_input->substr (_cursor, i - _cursor).c_str (), NULL, 10);
-    _cursor = i;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUnsignedInt (int& result)
-{
-  auto i = _cursor;
-  // TODO Potential for use of find_first_not_of
-  while (i < _length && Lexer::isDigit ((*_input)[i]))
-    ++i;
-
-  if (i > _cursor)
-  {
-    result = strtoimax (_input->substr (_cursor, i - _cursor).c_str (), NULL, 10);
-    _cursor = i;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// number:
-//   int frac? exp?
-// 
-// int:
-//   (-|+)? digit+
-// 
-// frac:
-//   . digit+
-// 
-// exp:
-//   e digit+
-// 
-// e:
-//   e|E (+|-)?
-// 
-bool Nibbler::getNumber (std::string& result)
-{
-  auto i = _cursor;
-
-  // [+-]?
-  if (i < _length && ((*_input)[i] == '-' || (*_input)[i] == '+'))
-    ++i;
-
-  // digit+
-  if (i < _length && Lexer::isDigit ((*_input)[i]))
-  {
-    ++i;
-
-    while (i < _length && Lexer::isDigit ((*_input)[i]))
-      ++i;
-
-    // ( . digit+ )?
-    if (i < _length && (*_input)[i] == '.')
-    {
-      ++i;
-
-      while (i < _length && Lexer::isDigit ((*_input)[i]))
-        ++i;
-    }
-
-    // ( [eE] [+-]? digit+ )?
-    if (i < _length && ((*_input)[i] == 'e' || (*_input)[i] == 'E'))
-    {
-      ++i;
-
-      if (i < _length && ((*_input)[i] == '+' || (*_input)[i] == '-'))
-        ++i;
-
-      if (i < _length && Lexer::isDigit ((*_input)[i]))
-      {
-        ++i;
-
-        while (i < _length && Lexer::isDigit ((*_input)[i]))
-          ++i;
-
-        result = _input->substr (_cursor, i - _cursor);
-        _cursor = i;
-        return true;
-      }
-
-      return false;
-    }
-
-    result = _input->substr (_cursor, i - _cursor);
-    _cursor = i;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getNumber (double &result)
-{
-  std::string s;
-  if (getNumber (s))
-  {
-    result = strtof (s.c_str (), NULL);
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getLiteral (const std::string& literal)
-{
-  if (_cursor < _length &&
-      _input->find (literal, _cursor) == _cursor)
-  {
-    _cursor += literal.length ();
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getPartialUUID (std::string& result)
-{
-  std::string::size_type i;
-  for (i = 0; i < 36 && i < (_length - _cursor); i++)
-  {
-    if (_uuid_pattern[i] == 'x' && !isxdigit ((*_input)[_cursor + i]))
-      break;
-
-    else if (_uuid_pattern[i] == '-' && (*_input)[_cursor + i] != '-')
-      break;
-  }
-
-  // If the partial match found is long enough, consider it a match.
-  if (i >= _uuid_min_length)
-  {
-    // Fail if there is another hex digit.
-    if (_cursor + i < _length &&
-        isxdigit ((*_input)[_cursor + i]))
-      return false;
-
-    result = _input->substr (_cursor, i);
-    _cursor += i;
-
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Assumes that the options are sorted by decreasing length, so that if the
-// options contain 'fourteen' and 'four', the stream is first matched against
-// the longer entry.
-bool Nibbler::getOneOf (
-  const std::vector <std::string>& options,
-  std::string& found)
-{
-  for (auto& option : options)
-  {
-    if (getLiteral (option))
-    {
-      found = option;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::skipN (const int quantity /* = 1 */)
-{
-  if (_cursor < _length &&
-      _cursor <= _length - quantity)
-  {
-    _cursor += quantity;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::skip (char c)
-{
-  if (_cursor < _length &&
-      (*_input)[_cursor] == c)
-  {
-    ++_cursor;
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::skipWS ()
-{
-  return this->skipAllOneOf (" \t\n\r\f");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::skipAllOneOf (const std::string& chars)
-{
-  if (_cursor < _length)
-  {
-    auto i = _input->find_first_not_of (chars, _cursor);
-    if (i == _cursor)
-      return false;
-
-    if (i == std::string::npos)
-      _cursor = _length;  // Yes, off the end.
-    else
-      _cursor = i;
-
-    return true;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Peeks ahead - does not move cursor.
-char Nibbler::next ()
-{
-  if (_cursor < _length)
-    return (*_input)[_cursor];
-
-  return '\0';
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string::size_type Nibbler::cursor ()
-{
-  return _cursor;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Peeks ahead - does not move cursor.
-std::string Nibbler::next (const int quantity)
-{
-  if (           _cursor  <  _length &&
-      (unsigned) quantity <= _length &&
-                 _cursor  <= _length - quantity)
-    return _input->substr (_cursor, quantity);
-
-  return "";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string::size_type Nibbler::save ()
-{
-  return _saved = _cursor;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string::size_type Nibbler::restore ()
-{
-  return _cursor = _saved;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const std::string& Nibbler::str () const
-{
-  return *_input;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::depleted ()
-{
-  if (_cursor >= _length)
-    return true;
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-std::string Nibbler::dump ()
-{
-  return std::string ("Nibbler ‹")
-         + _input->substr (_cursor)
-         + "›";
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Nibbler.h b/src/Nibbler.h
deleted file mode 100644
index 3b34bdd3d..000000000
--- a/src/Nibbler.h
+++ /dev/null
@@ -1,89 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_NIBBLER
-#define INCLUDED_NIBBLER
-
-#include <string>
-#include <vector>
-#include <time.h>
-#include <memory>
-
-class Nibbler
-{
-public:
-  Nibbler ();                          // Default constructor
-  Nibbler (const std::string&);        // Constructor
-  Nibbler (const Nibbler&);            // Copy constructor
-  Nibbler& operator= (const Nibbler&); // Assignment operator
-  ~Nibbler ();                         // Destructor
-
-  bool getUntil (char, std::string&);
-  bool getUntil (const std::string&, std::string&);
-  bool getUntilOneOf (const std::string&, std::string&);
-  bool getUntilWS (std::string&);
-  bool getUntilEOS (std::string&);
-
-  bool getN (const int, std::string&);
-  bool getQuoted (char, std::string&);
-  bool getDigit (int&);
-  bool getDigit4 (int&);
-  bool getDigit3 (int&);
-  bool getDigit2 (int&);
-  bool getInt (int&);
-  bool getUnsignedInt (int&);
-  bool getNumber (std::string&);
-  bool getNumber (double&);
-  bool getLiteral (const std::string&);
-  bool getPartialUUID (std::string&);
-  bool getOneOf (const std::vector <std::string>&, std::string&);
-
-  bool skipN (const int quantity = 1);
-  bool skip (char);
-  bool skipAllOneOf (const std::string&);
-  bool skipWS ();
-
-  char next ();
-  std::string next (const int quantity);
-
-  std::string::size_type cursor ();
-  std::string::size_type save ();
-  std::string::size_type restore ();
-  const std::string& str () const;
-
-  bool depleted ();
-
-  std::string dump ();
-
-private:
-  std::shared_ptr<std::string> _input;
-  std::string::size_type _length;
-  std::string::size_type _cursor;
-  std::string::size_type _saved;
-};
-
-#endif
-////////////////////////////////////////////////////////////////////////////////

From 8f3d6c575de92041dd79e82da6fc38959ee2b6a6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:28:57 -0500
Subject: [PATCH 448/879] Filter: Eliminated namedDates

---
 src/Filter.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Filter.cpp b/src/Filter.cpp
index 73d4e3379..5be928cc6 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -32,7 +32,6 @@
 #include <DOM.h>
 #include <Eval.h>
 #include <Variant.h>
-#include <Dates.h>
 #include <i18n.h>
 #include <format.h>
 #include <shared.h>
@@ -74,7 +73,6 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
   {
     Eval eval;
     eval.addSource (domSource);
-    eval.addSource (namedDates);
 
     // Debug output from Eval during compilation is useful.  During evaluation
     // it is mostly noise.
@@ -126,7 +124,6 @@ void Filter::subset (std::vector <Task>& output)
 
     Eval eval;
     eval.addSource (domSource);
-    eval.addSource (namedDates);
 
     // Debug output from Eval during compilation is useful.  During evaluation
     // it is mostly noise.

From fa71f846ae03a25f4fac67c7f7a849c5f5e2220b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:29:13 -0500
Subject: [PATCH 449/879] calc: Eliminated namedDates

---
 src/calc.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index a4efbed0f..80bb4ccb9 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <Eval.h>
-#include <Dates.h>
 #include <Context.h>
 #include <Task.h>
 #include <shared.h>
@@ -62,7 +61,6 @@ int main (int argc, char** argv)
 
     // Add a source for constants.
     Eval e;
-    e.addSource (namedDates);
     e.addSource (get);
 
     // Combine all the arguments into one expression string.

From d390b02be52f547d617d0bfbb0c3d6d95c3db5fd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:29:28 -0500
Subject: [PATCH 450/879] ColProject: Eliminated namedDates

---
 src/columns/ColProject.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 85e48cc7b..d5141e9f1 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -31,7 +31,6 @@
 #include <Variant.h>
 #include <Lexer.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
@@ -124,7 +123,6 @@ void ColumnProject::modify (Task& task, const std::string& value)
     {
       Eval e;
       e.addSource (domSource);
-      e.addSource (namedDates);
       contextTask = task;
 
       Variant v;

From 23569ad5e7579f90ce39fefe04f8fc5d0c55849e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:29:50 -0500
Subject: [PATCH 451/879] ColRecur: Eliminated namedDates

---
 src/columns/ColRecur.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index c6ba5cecf..07aa87702 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -32,7 +32,6 @@
 #include <Variant.h>
 #include <Lexer.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
@@ -111,7 +110,6 @@ void ColumnRecur::modify (Task& task, const std::string& value)
   {
     Eval e;
     e.addSource (domSource);
-    e.addSource (namedDates);
     contextTask = task;
     e.evaluateInfixExpression (value, evaluatedValue);
   }

From c4b41734a9a08c26bb5867d2e0c11848d030fba0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:30:06 -0500
Subject: [PATCH 452/879] ColTags: Eliminated namedDates

---
 src/columns/ColTags.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 24fa4b718..a76779059 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -31,7 +31,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <shared.h>
 #include <format.h>
 #include <i18n.h>
@@ -170,7 +169,6 @@ void ColumnTags::modify (Task& task, const std::string& value)
     {
       Eval e;
       e.addSource (domSource);
-      e.addSource (namedDates);
       contextTask = task;
 
       Variant v;

From 8269a3a2350d2d4f75c6c06563c3ea14ffbf6f37 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:30:31 -0500
Subject: [PATCH 453/879] ColTypeDate: Eliminated namedDates

---
 src/columns/ColTypeDate.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index add52cdcf..822e8e8ac 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -32,7 +32,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -216,7 +215,6 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   {
     Eval e;
     e.addSource (domSource);
-    e.addSource (namedDates);
     contextTask = task;
     e.evaluateInfixExpression (value, evaluatedValue);
   }
@@ -231,9 +229,9 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   if (evaluatedValue.type () == Variant::type_duration)
   {
     context.debug (label + _name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
-    Variant now;
-    if (namedDates ("now", now))
-      evaluatedValue += now;
+    Datetime date_now;
+    Variant now (date_now.toEpoch (), Variant::type_date);
+    evaluatedValue += now;
   }
   else
   {

From 2e34d9ffd4718d91a9d63c29e2487d323a8c8991 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:30:51 -0500
Subject: [PATCH 454/879] ColTypeDuration: Eliminated namedDates

---
 src/columns/ColTypeDuration.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 973d69361..bff60f734 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -30,7 +30,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -58,7 +57,6 @@ void ColumnTypeDuration::modify (Task& task, const std::string& value)
   {
     Eval e;
     e.addSource (domSource);
-    e.addSource (namedDates);
     contextTask = task;
     e.evaluateInfixExpression (value, evaluatedValue);
   }

From d6bbdb90b943909bcd08041b31e14b2d9431de71 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:31:10 -0500
Subject: [PATCH 455/879] ColTypeNumeric: Eliminated namedDates

---
 src/columns/ColTypeNumeric.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index a79083780..e6153bfd4 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -30,7 +30,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -58,7 +57,6 @@ void ColumnTypeNumeric::modify (Task& task, const std::string& value)
   {
     Eval e;
     e.addSource (domSource);
-    e.addSource (namedDates);
     contextTask = task;
     e.evaluateInfixExpression (value, evaluatedValue);
   }

From 06a78e1aff551b3ef31b898d0dc9501a738baecd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:31:29 -0500
Subject: [PATCH 456/879] ColTypeString: Eliminated namedDates

---
 src/columns/ColTypeString.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index cee564589..ba971c2aa 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -30,7 +30,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -63,7 +62,6 @@ void ColumnTypeString::modify (Task& task, const std::string& value)
   {
     Eval e;
     e.addSource (domSource);
-    e.addSource (namedDates);
     contextTask = task;
 
     Variant v;

From d8526a388d79d6be893d7bfb6ca7abdd703495e6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:31:50 -0500
Subject: [PATCH 457/879] CmdCalc: Eliminated namedDates

---
 src/commands/CmdCalc.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 2c8ffe43a..b812bbde7 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -28,7 +28,6 @@
 #include <CmdCalc.h>
 #include <Filter.h>
 #include <Eval.h>
-#include <Dates.h>
 #include <main.h>
 #include <i18n.h>
 
@@ -61,7 +60,6 @@ int CmdCalc::execute (std::string& output)
   // Create an evaluator with DOM access.
   Eval e;
   e.addSource (domSource);
-  e.addSource (namedDates);
   e.debug (context.config.getBoolean ("debug"));
 
   // Compile all the args into one expression.

From 1039320a9cb4f2927c9b746afa107717a53a831d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:34:30 -0500
Subject: [PATCH 458/879] Tests: Eliminated namedDates

---
 test/dates.t.cpp | 159 ++++++++++++++++++++++-------------------------
 1 file changed, 76 insertions(+), 83 deletions(-)

diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 3013fb944..459a459b6 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -26,17 +26,14 @@
 
 #include <cmake.h>
 #include <test.h>
-#include <Dates.h>
-#include <Context.h>
-
-Context context;
+#include <Datetime.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-void testInit (UnitTest& t, const std::string& value, Variant& var)
+void testInit (UnitTest& t, const std::string& value, Datetime& var)
 {
   try
   {
-    namedDates (value, var);
+    var = Datetime (value);
     t.pass (value + " --> valid");
   }
 
@@ -55,23 +52,23 @@ void testInit (UnitTest& t, const std::string& value, Variant& var)
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (105);
+  UnitTest t (101);
 
-  Variant sunday;    testInit (t, "sunday",    sunday);
-  Variant monday;    testInit (t, "monday",    monday);
-  Variant tuesday;   testInit (t, "tuesday",   tuesday);
-  Variant wednesday; testInit (t, "wednesday", wednesday);
-  Variant thursday;  testInit (t, "thursday",  thursday);
-  Variant friday;    testInit (t, "friday",    friday);
-  Variant saturday;  testInit (t, "saturday",  saturday);
+  Datetime sunday;    testInit (t, "sunday",    sunday);
+  Datetime monday;    testInit (t, "monday",    monday);
+  Datetime tuesday;   testInit (t, "tuesday",   tuesday);
+  Datetime wednesday; testInit (t, "wednesday", wednesday);
+  Datetime thursday;  testInit (t, "thursday",  thursday);
+  Datetime friday;    testInit (t, "friday",    friday);
+  Datetime saturday;  testInit (t, "saturday",  saturday);
 
-  Variant sun; testInit (t, "sun", sun);
-  Variant mon; testInit (t, "mon", mon);
-  Variant tue; testInit (t, "tue", tue);
-  Variant wed; testInit (t, "wed", wed);
-  Variant thu; testInit (t, "thu", thu);
-  Variant fri; testInit (t, "fri", fri);
-  Variant sat; testInit (t, "sat", sat);
+  Datetime sun; testInit (t, "sun", sun);
+  Datetime mon; testInit (t, "mon", mon);
+  Datetime tue; testInit (t, "tue", tue);
+  Datetime wed; testInit (t, "wed", wed);
+  Datetime thu; testInit (t, "thu", thu);
+  Datetime fri; testInit (t, "fri", fri);
+  Datetime sat; testInit (t, "sat", sat);
 
   t.ok (sunday    == sun, "sunday == sun");
   t.ok (monday    == mon, "monday == mon");
@@ -81,30 +78,30 @@ int main (int, char**)
   t.ok (friday    == fri, "friday == fri");
   t.ok (saturday  == sat, "saturday == sat");
 
-  Variant january;   testInit (t, "january",   january);
-  Variant february;  testInit (t, "february",  february);
-  Variant march;     testInit (t, "march",     march);
-  Variant april;     testInit (t, "april",     april);
-  Variant may;       testInit (t, "may",       may);
-  Variant june;      testInit (t, "june",      june);
-  Variant july;      testInit (t, "july",      july);
-  Variant august;    testInit (t, "august",    august);
-  Variant september; testInit (t, "september", september);
-  Variant october;   testInit (t, "october",   october);
-  Variant november;  testInit (t, "november",  november);
-  Variant december;  testInit (t, "december",  december);
+  Datetime january;   testInit (t, "january",   january);
+  Datetime february;  testInit (t, "february",  february);
+  Datetime march;     testInit (t, "march",     march);
+  Datetime april;     testInit (t, "april",     april);
+  Datetime may;       testInit (t, "may",       may);
+  Datetime june;      testInit (t, "june",      june);
+  Datetime july;      testInit (t, "july",      july);
+  Datetime august;    testInit (t, "august",    august);
+  Datetime september; testInit (t, "september", september);
+  Datetime october;   testInit (t, "october",   october);
+  Datetime november;  testInit (t, "november",  november);
+  Datetime december;  testInit (t, "december",  december);
 
-  Variant jan; testInit (t, "jan", jan);
-  Variant feb; testInit (t, "feb", feb);
-  Variant mar; testInit (t, "mar", mar);
-  Variant apr; testInit (t, "apr", apr);
-  Variant jun; testInit (t, "jun", jun);
-  Variant jul; testInit (t, "jul", jul);
-  Variant aug; testInit (t, "aug", aug);
-  Variant sep; testInit (t, "sep", sep);
-  Variant oct; testInit (t, "oct", oct);
-  Variant nov; testInit (t, "nov", nov);
-  Variant dec; testInit (t, "dec", dec);
+  Datetime jan; testInit (t, "jan", jan);
+  Datetime feb; testInit (t, "feb", feb);
+  Datetime mar; testInit (t, "mar", mar);
+  Datetime apr; testInit (t, "apr", apr);
+  Datetime jun; testInit (t, "jun", jun);
+  Datetime jul; testInit (t, "jul", jul);
+  Datetime aug; testInit (t, "aug", aug);
+  Datetime sep; testInit (t, "sep", sep);
+  Datetime oct; testInit (t, "oct", oct);
+  Datetime nov; testInit (t, "nov", nov);
+  Datetime dec; testInit (t, "dec", dec);
 
   t.ok (january   == jan, "january == jan");
   t.ok (february  == feb, "february == feb");
@@ -120,51 +117,47 @@ int main (int, char**)
   t.ok (december  == dec, "december == dec");
 
   // Simply instantiate these for now.  Test later.
-  Variant now;            testInit (t, "now", now);
-  Variant today;          testInit (t, "today", today);
-  Variant sod;            testInit (t, "sod", sod);
-  Variant yesterday;      testInit (t, "yesterday", yesterday);
-  Variant tomorrow;       testInit (t, "tomorrow", tomorrow);
-  Variant eod;            testInit (t, "eod", eod);
-  Variant soy;            testInit (t, "soy", soy);
-  Variant eoy;            testInit (t, "eoy", eoy);
-  Variant socm;           testInit (t, "socm", socm);
-  Variant eocm;           testInit (t, "eocm", eocm);
-  Variant soww;           testInit (t, "soww", soww);
-  Variant eoww;           testInit (t, "eoww", eoww);
-  Variant som;            testInit (t, "som", som);
-  Variant eom;            testInit (t, "eom", eom);
-  Variant later;          testInit (t, "later", later);
-  Variant someday;        testInit (t, "someday", someday);
-  Variant easter;         testInit (t, "easter", easter);
-  Variant eastermonday;   testInit (t, "eastermonday", eastermonday);
-  Variant ascension;      testInit (t, "ascension", ascension);
-  Variant pentecost;      testInit (t, "pentecost", pentecost);
-  Variant goodfriday;     testInit (t, "goodfriday", goodfriday);
-  Variant pi;             testInit (t, "pi", pi);
-  Variant var_true;       testInit (t, "true", var_true);
-  Variant var_false;      testInit (t, "false", var_false);
-  Variant midsommar;      testInit (t, "midsommar", midsommar);
-  Variant midsommarafton; testInit (t, "midsommarafton", midsommarafton);
-  Variant juhannus;       testInit (t, "juhannus", juhannus);
-  Variant first;          testInit (t, "1st", first);
-  Variant second;         testInit (t, "2nd", second);
-  Variant third;          testInit (t, "3rd", third);
-  Variant fourth;         testInit (t, "4th", fourth);
+  Datetime now;            testInit (t, "now", now);
+  Datetime today;          testInit (t, "today", today);
+  Datetime sod;            testInit (t, "sod", sod);
+  Datetime yesterday;      testInit (t, "yesterday", yesterday);
+  Datetime tomorrow;       testInit (t, "tomorrow", tomorrow);
+  Datetime eod;            testInit (t, "eod", eod);
+  Datetime soy;            testInit (t, "soy", soy);
+  Datetime eoy;            testInit (t, "eoy", eoy);
+  Datetime socm;           testInit (t, "socm", socm);
+  Datetime eocm;           testInit (t, "eocm", eocm);
+  Datetime soww;           testInit (t, "soww", soww);
+  Datetime eoww;           testInit (t, "eoww", eoww);
+  Datetime som;            testInit (t, "som", som);
+  Datetime eom;            testInit (t, "eom", eom);
+  Datetime later;          testInit (t, "later", later);
+  Datetime someday;        testInit (t, "someday", someday);
+  Datetime easter;         testInit (t, "easter", easter);
+  Datetime eastermonday;   testInit (t, "eastermonday", eastermonday);
+  Datetime ascension;      testInit (t, "ascension", ascension);
+  Datetime pentecost;      testInit (t, "pentecost", pentecost);
+  Datetime goodfriday;     testInit (t, "goodfriday", goodfriday);
+  Datetime midsommar;      testInit (t, "midsommar", midsommar);
+  Datetime midsommarafton; testInit (t, "midsommarafton", midsommarafton);
+  Datetime juhannus;       testInit (t, "juhannus", juhannus);
+  Datetime first;          testInit (t, "1st", first);
+  Datetime second;         testInit (t, "2nd", second);
+  Datetime third;          testInit (t, "3rd", third);
+  Datetime fourth;         testInit (t, "4th", fourth);
 
   // Check abbreviations.
   // TW-1515: abbreviation.minimum does not apply to date recognition
-  Variant yesterday2;      testInit (t, "yesterday", yesterday2);
-  Variant yesterday3;      testInit (t, "yesterda",  yesterday3);
-  Variant yesterday4;      testInit (t, "yesterd",   yesterday4);
-  Variant yesterday5;      testInit (t, "yester",    yesterday5);
-  Variant yesterday6;      testInit (t, "yeste",     yesterday6);
-  Variant yesterday7;      testInit (t, "yest",      yesterday7);
-  Variant yesterday8;      testInit (t, "yes",       yesterday8);
+  Datetime yesterday2;      testInit (t, "yesterday", yesterday2);
+  Datetime yesterday3;      testInit (t, "yesterda",  yesterday3);
+  Datetime yesterday4;      testInit (t, "yesterd",   yesterday4);
+  Datetime yesterday5;      testInit (t, "yester",    yesterday5);
+  Datetime yesterday6;      testInit (t, "yeste",     yesterday6);
+  Datetime yesterday7;      testInit (t, "yest",      yesterday7);
+  Datetime yesterday8;      testInit (t, "yes",       yesterday8);
 
   t.ok (now >= today,               "now >= today");
   t.ok (sod == tomorrow,            "sod == tomorrow");
-  t.ok (sod > eod,                  "sod > eod");
   t.ok (yesterday < today,          "yesterday < today");
   t.ok (today < tomorrow,           "today < tomorrow");
   t.ok (socm < eocm,                "socm < eocm");

From f030333766e52bda33871d3b6b0cdff929af0b68 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:35:13 -0500
Subject: [PATCH 459/879] Tests: Corrected lexer data type for newly-supported
 date types

---
 test/lexer.t.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index ef22e8b6c..55b2eea0f 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -174,21 +174,21 @@ int main (int, char**)
     tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
   }
 
-  t.is ((int)tokens.size (),     7,                         "7 tokens");
-  t.is (tokens[0].first,         "1",                       "tokens[0] == '1'");
-  t.is ((int) tokens[0].second,  (int) Lexer::Type::number, "tokens[0] == Type::number");
-  t.is (tokens[1].first,         "12",                      "tokens[1] == '12'");
-  t.is ((int) tokens[1].second,  (int) Lexer::Type::number, "tokens[1] == Type::date");
-  t.is (tokens[2].first,         "123",                     "tokens[2] == '123'");
-  t.is ((int) tokens[2].second,  (int) Lexer::Type::number, "tokens[2] == Type::number"); // 70
-  t.is (tokens[3].first,         "1234",                    "tokens[3] == '1234'");
-  t.is ((int) tokens[3].second,  (int) Lexer::Type::number, "tokens[3] == Type::date");
-  t.is (tokens[4].first,         "12345",                   "tokens[4] == '12345'");
-  t.is ((int) tokens[4].second,  (int) Lexer::Type::number, "tokens[4] == Type::number");
-  t.is (tokens[5].first,         "123456",                  "tokens[5] == '123456'");
-  t.is ((int) tokens[5].second,  (int) Lexer::Type::number, "tokens[5] == Type::date");
-  t.is (tokens[6].first,         "1234567",                 "tokens[6] == '1234567'");
-  t.is ((int) tokens[6].second,  (int) Lexer::Type::number, "tokens[6] == Type::number");
+  t.is ((int)tokens.size (),     7,                           "7 tokens");
+  t.is (tokens[0].first,         "1",                         "tokens[0] == '1'");
+  t.is ((int) tokens[0].second,  (int) Lexer::Type::number,   "tokens[0] == Type::number");
+  t.is (tokens[1].first,         "12",                        "tokens[1] == '12'");
+  t.is ((int) tokens[1].second,  (int) Lexer::Type::number,   "tokens[1] == Type::date");
+  t.is (tokens[2].first,         "123",                       "tokens[2] == '123'");
+  t.is ((int) tokens[2].second,  (int) Lexer::Type::number,   "tokens[2] == Type::number"); // 70
+  t.is (tokens[3].first,         "1234",                      "tokens[3] == '1234'");
+  t.is ((int) tokens[3].second,  (int) Lexer::Type::date,     "tokens[3] == Type::date");
+  t.is (tokens[4].first,         "12345",                     "tokens[4] == '12345'");
+  t.is ((int) tokens[4].second,  (int) Lexer::Type::number,   "tokens[4] == Type::number");
+  t.is (tokens[5].first,         "123456",                    "tokens[5] == '123456'");
+  t.is ((int) tokens[5].second,  (int) Lexer::Type::date,     "tokens[5] == Type::date");
+  t.is (tokens[6].first,         "1234567",                   "tokens[6] == '1234567'");
+  t.is ((int) tokens[6].second,  (int) Lexer::Type::duration, "tokens[6] == Type::number");
 
   // void split (std::vector<std::string>&, const std::string&);
   std::string unsplit = " ( A or B ) ";

From ce7f2e799eb6349b1ee3dc2e4006dd6daa3bf6b7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:35:34 -0500
Subject: [PATCH 460/879] Tests: Eliminated old-style EOD math

---
 test/math.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/math.t b/test/math.t
index 8b269233c..79ca06537 100755
--- a/test/math.t
+++ b/test/math.t
@@ -44,7 +44,7 @@ class TestMath(TestCase):
         cls.t.config("dateformat", "YYYY-MM-DD")
 
         # YYYY-12-21.
-        cls.when = "%d-12-21T23:59:59\n" % datetime.now().year
+        cls.when = "%d-12-22T00:00:00\n" % datetime.now().year
 
         # Different ways of specifying YYYY-12-21.
         cls.t("add one   due:eoy-10days")
@@ -52,7 +52,7 @@ class TestMath(TestCase):
         cls.t("add three 'due:eoy-10days'")
         cls.t("add four  due:'eoy - 10days'")
         cls.t("add five  'due:eoy - 10days'")
-        cls.t("add six   'due:%d-12-31T23:59:59 - 10days'" % datetime.now().year)
+        cls.t("add six   'due:%d-01-01T00:00:00 - 10days'".format (datetime.now().year + 1))
 
     def test_compact_unquoted(self):
         """compact unquoted"""

From 0143ced07c6a526d327f816f63f1f41b5c36d4ab Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:46:21 -0500
Subject: [PATCH 461/879] Task: Eliminated namedDates

---
 src/Task.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 087ce66d4..d7fdc678e 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -57,7 +57,6 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Filter.h>
-#include <Dates.h>
 
 #define APPROACHING_INFINITY 1000   // Close enough.  This isn't rocket surgery.
 

From 850ef84b0bea4f3b2e27f2ca4fe82339431f1800 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 09:46:44 -0500
Subject: [PATCH 462/879] CMake: Eliminated Dates.cpp

---
 src/CMakeLists.txt |   1 -
 src/Dates.cpp      | 520 ---------------------------------------------
 src/Dates.h        |  37 ----
 3 files changed, 558 deletions(-)
 delete mode 100644 src/Dates.cpp
 delete mode 100644 src/Dates.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7f3d4c69..27ab3587c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories (${CMAKE_SOURCE_DIR}
 add_library (task CLI2.cpp CLI2.h
                   Context.cpp Context.h
                   DOM.cpp DOM.h
-                  Dates.cpp Dates.h
                   Eval.cpp Eval.h
                   Filter.cpp Filter.h
                   Hooks.cpp Hooks.h
diff --git a/src/Dates.cpp b/src/Dates.cpp
deleted file mode 100644
index d091cc069..000000000
--- a/src/Dates.cpp
+++ /dev/null
@@ -1,520 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Dates.h>
-#include <algorithm>
-#include <stdlib.h>
-#include <time.h>
-#include <shared.h>
-#include <Datetime.h>
-#include <Lexer.h>
-#include <CLI2.h>
-#include <i18n.h>
-
-////////////////////////////////////////////////////////////////////////////////
-static bool isMonth (const std::string& name, int& i)
-{
-  i = Datetime::monthOfYear (name) - 1;
-  return i != -2 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-static bool isDay (const std::string& name, int& i)
-{
-  i = Datetime::dayOfWeek (name);
-  return i != -1 ? true : false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-static void easter (struct tm* t)
-{
-  int Y = t->tm_year + 1900;
-  int a = Y % 19;
-  int b = Y / 100;
-  int c = Y % 100;
-  int d = b / 4;
-  int e = b % 4;
-  int f = (b + 8) / 25;
-  int g = (b - f + 1) / 3;
-  int h = (19 * a + b - d - g + 15) % 30;
-  int i = c / 4;
-  int k = c % 4;
-  int L = (32 + 2 * e + 2 * i - h - k) % 7;
-  int m = (a + 11 * h + 22 * L) / 451;
-  int month = (h + L - 7 * m + 114) / 31;
-  int day = ((h + L - 7 * m + 114) % 31) + 1;
-
-  t->tm_isdst = -1;   // Requests that mktime determine summer time effect.
-  t->tm_mday  = day;
-  t->tm_mon   = month - 1;
-  t->tm_year  = Y - 1900;
-  t->tm_isdst = -1;
-  t->tm_hour = t->tm_min = t->tm_sec = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-static void midsommar (struct tm* t)
-{
-  t->tm_mon = 5;                          // June.
-  t->tm_mday = 20;                        // Saturday after 20th.
-  t->tm_hour = t->tm_min = t->tm_sec = 0; // Midnight.
-  t->tm_isdst = -1;                       // Probably DST, but check.
-
-  time_t then = mktime (t);               // Obtain the weekday of June 20th.
-  struct tm* mid = localtime (&then);
-  t->tm_mday += 6 - mid->tm_wday;         // How many days after 20th.
-}
-
-////////////////////////////////////////////////////////////////////////////////
-static void midsommarafton (struct tm* t)
-{
-  t->tm_mon = 5;                          // June.
-  t->tm_mday = 19;                        // Friday after 19th.
-  t->tm_hour = t->tm_min = t->tm_sec = 0; // Midnight.
-  t->tm_isdst = -1;                       // Probably DST, but check.
-
-  time_t then = mktime (t);               // Obtain the weekday of June 19th.
-  struct tm* mid = localtime (&then);
-  t->tm_mday += 5 - mid->tm_wday;         // How many days after 19th.
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Note how these are all single words:
-//   <day>
-//   <month>
-//   Nth
-//   socy, eocy
-//   socq, eocq
-//   socm, eocm
-//   som, eom
-//   soq, eoq
-//   soy, eoy
-//   socw, eocw
-//   sow, eow
-//   soww, eoww
-//   sod, eod
-//   yesterday
-//   today
-//   now
-//   tomorrow
-//   later          = midnight, Jan 18th, 2038.
-//   someday        = midnight, Jan 18th, 2038.
-//   easter
-//   eastermonday
-//   ascension
-//   pentecost
-//   goodfriday
-//   midsommar      = midnight, 1st Saturday after 20th June
-//   midsommarafton = midnight, 1st Friday after 19th June
-//
-bool namedDates (const std::string& name, Variant& value)
-{
-  time_t now = time (NULL);
-  struct tm* t = localtime (&now);
-  int i;
-
-  int minimum = CLI2::minimumMatchLength;
-  if (minimum == 0)
-    minimum = 3;
-
-  // Dynamics.
-  if (closeEnough ("now", name, minimum))
-  {
-    value = Variant (now, Variant::type_date);
-  }
-
-  else if (closeEnough ("today", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("sod", name, minimum))
-  {
-    t->tm_mday++;
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("eod", name, minimum))
-  {
-    t->tm_mday++;
-    t->tm_hour = t->tm_min = 0;
-    t->tm_sec = -1;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("tomorrow", name, minimum))
-  {
-    t->tm_mday++;
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("yesterday", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) - 86400, Variant::type_date);
-  }
-
-  else if (isDay (name, i))
-  {
-    if (t->tm_wday >= i)
-      t->tm_mday += i - t->tm_wday + 7;
-    else
-      t->tm_mday += i - t->tm_wday;
-
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (isMonth (name, i))
-  {
-    if (t->tm_mon >= i)
-      t->tm_year++;
-
-    t->tm_mon = i;
-    t->tm_mday = 1;
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("later",   name, minimum) ||
-           closeEnough ("someday", name, std::max (minimum, 4)))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_year = 138;
-    t->tm_mon = 0;
-    t->tm_mday = 18;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("eoy", name, minimum))
-  {
-    t->tm_hour = t->tm_min = 0;
-    t->tm_sec = -1;
-    t->tm_mon = 0;
-    t->tm_mday = 1;
-    t->tm_year++;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("soy", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_mon = 0;
-    t->tm_mday = 1;
-    t->tm_year++;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("eoq", name, minimum))
-  {
-    t->tm_hour = t->tm_min = 0;
-    t->tm_sec = -1;
-    t->tm_mon += 3 - (t->tm_mon % 3);
-    if (t->tm_mon > 11)
-    {
-      t->tm_mon -= 12;
-      ++t->tm_year;
-    }
-
-    t->tm_mday = 1;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("soq", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_mon += 3 - (t->tm_mon % 3);
-    if (t->tm_mon > 11)
-    {
-      t->tm_mon -= 12;
-      ++t->tm_year;
-    }
-
-    t->tm_mday = 1;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("socm", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    t->tm_mday = 1;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("som", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-
-    t->tm_mon++;
-    if (t->tm_mon == 12)
-    {
-      t->tm_year++;
-      t->tm_mon = 0;
-    }
-
-    t->tm_mday = 1;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("eom",  name, minimum) ||
-           closeEnough ("eocm", name, minimum))
-  {
-    t->tm_hour = 24;
-    t->tm_min = 0;
-    t->tm_sec = -1;
-    t->tm_mday = Datetime::daysInMonth (t->tm_year + 1900, t->tm_mon + 1);
-    t->tm_isdst = -1;
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("socw", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    int extra = t->tm_wday * 86400;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) - extra, Variant::type_date);
-  }
-
-  else if (closeEnough ("eow",  name, minimum) ||
-           closeEnough ("eocw", name, minimum))
-  {
-    t->tm_hour = t->tm_min = 0;
-    t->tm_sec = -1;
-    int extra = (7 - t->tm_wday) * 86400;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) + extra, Variant::type_date);
-  }
-
-  else if (closeEnough ("sow", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    int extra = (7 - t->tm_wday) * 86400;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) + extra, Variant::type_date);
-  }
-
-  else if (closeEnough ("soww", name, minimum))
-  {
-    t->tm_hour = t->tm_min = t->tm_sec = 0;
-    int days = (8 - t->tm_wday) % 7;
-    int extra = days * 86400;
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) + extra, Variant::type_date);
-  }
-
-  else if (closeEnough ("eoww", name, minimum))
-  {
-    t->tm_hour = 24;
-    t->tm_min = 0;
-    t->tm_sec = -1;
-    int extra = (5 - t->tm_wday) * 86400;
-    if (extra < 0)
-      extra += 7 * 86400;
-
-    t->tm_isdst = -1;
-    value = Variant (mktime (t) + extra, Variant::type_date);
-  }
-
-  // Support "21st" to indicate the next date that is the 21st day.
-  // 1st
-  // 2nd
-  // 3rd
-  // 4th
-  else if ((
-            name.length () == 3 &&
-            Lexer::isDigit (name[0])   &&
-            ((name[1] == 's' && name[2] == 't') ||
-             (name[1] == 'n' && name[2] == 'd') ||
-             (name[1] == 'r' && name[2] == 'd') ||
-             (name[1] == 't' && name[2] == 'h'))
-           )
-           ||
-           (
-            name.length () == 4 &&
-            Lexer::isDigit (name[0])   &&
-            Lexer::isDigit (name[1])   &&
-            ((name[2] == 's' && name[3] == 't') ||
-             (name[2] == 'n' && name[3] == 'd') ||
-             (name[2] == 'r' && name[3] == 'd') ||
-             (name[2] == 't' && name[3] == 'h'))
-           )
-          )
-  {
-    int number;
-    std::string ordinal;
-
-    if (Lexer::isDigit (name[1]))
-    {
-      number = strtol (name.substr (0, 2).c_str (), NULL, 10);
-      ordinal = Lexer::lowerCase (name.substr (2));
-    }
-    else
-    {
-      number = strtol (name.substr (0, 1).c_str (), NULL, 10);
-      ordinal = Lexer::lowerCase (name.substr (1));
-    }
-
-    // Sanity check.
-    if (number <= 31)
-    {
-      int remainder1 = number % 10;
-      int remainder2 = number % 100;
-      if ((remainder2 != 11 && remainder1 == 1 && ordinal == "st") ||
-          (remainder2 != 12 && remainder1 == 2 && ordinal == "nd") ||
-          (remainder2 != 13 && remainder1 == 3 && ordinal == "rd") ||
-          ((remainder2 == 11 ||
-            remainder2 == 12 ||
-            remainder2 == 13 ||
-            remainder1 == 0 ||
-            remainder1 > 3) && ordinal == "th"))
-      {
-        int y = t->tm_year + 1900;
-        int m = t->tm_mon + 1;
-        int d = t->tm_mday;
-
-        // If it is this month.
-        if (d < number &&
-            number <= Datetime::daysInMonth (y, m))
-        {
-          t->tm_hour = t->tm_min = t->tm_sec = 0;
-          t->tm_mon  = m - 1;
-          t->tm_mday = number;
-          t->tm_year = y - 1900;
-          t->tm_isdst = -1;
-          value = Variant (mktime (t), Variant::type_date);
-        }
-        else
-        {
-          if (++m > 12)
-          {
-            m = 1;
-            y++;
-          }
-
-          t->tm_hour = t->tm_min = t->tm_sec = 0;
-          t->tm_mon  = m - 1;
-          t->tm_mday = number;
-          t->tm_year = y - 1900;
-          t->tm_isdst = -1;
-          value = Variant (mktime (t), Variant::type_date);
-        }
-      }
-    }
-  }
-
-  else if (closeEnough ("easter",       name, minimum) ||
-           closeEnough ("eastermonday", name, minimum) ||
-           closeEnough ("ascension",    name, minimum) ||
-           closeEnough ("pentecost",    name, minimum) ||
-           closeEnough ("goodfriday",   name, minimum))
-  {
-    Variant valueNow = Variant (mktime (t), Variant::type_date);
-    easter (t);
-    value = Variant (mktime (t), Variant::type_date);
-
-    // If the result is earlier this year, then recalc for next year.
-    if (value < valueNow)
-    {
-      t = localtime (&now);
-      t->tm_year++;
-      easter (t);
-    }
-
-         if (closeEnough ("goodfriday",   name, minimum)) t->tm_mday -= 2;
-
-    // DO NOT REMOVE THIS USELESS-LOOKING LINE.
-    // It is here to capture an exact match for 'easter', to prevent 'easter'
-    // being a partial match for 'eastermonday'.
-    else if (closeEnough ("easter",       name, minimum)) ;
-    else if (closeEnough ("eastermonday", name, minimum)) t->tm_mday += 1;
-    else if (closeEnough ("ascension",    name, minimum)) t->tm_mday += 39;
-    else if (closeEnough ("pentecost",    name, minimum)) t->tm_mday += 49;
-
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("midsommar", name, minimum))
-  {
-    Variant valueNow = Variant (mktime (t), Variant::type_date);
-    midsommar (t);
-    value = Variant (mktime (t), Variant::type_date);
-
-    // If the result is earlier this year, then recalc for next year.
-    if (value < valueNow)
-    {
-      t = localtime (&now);
-      t->tm_year++;
-      midsommar (t);
-    }
-
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else if (closeEnough ("midsommarafton", name, minimum) ||
-           closeEnough ("juhannus", name, minimum))
-  {
-    Variant valueNow = Variant (mktime (t), Variant::type_date);
-    midsommarafton (t);
-    value = Variant (mktime (t), Variant::type_date);
-
-    // If the result is earlier this year, then recalc for next year.
-    if (value < valueNow)
-    {
-      t = localtime (&now);
-      t->tm_year++;
-      midsommarafton (t);
-    }
-
-    value = Variant (mktime (t), Variant::type_date);
-  }
-
-  else
-    return false;
-
-  value.source (name);
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/Dates.h b/src/Dates.h
deleted file mode 100644
index a214a41db..000000000
--- a/src/Dates.h
+++ /dev/null
@@ -1,37 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2017, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_DATES
-#define INCLUDED_DATES
-
-#include <string>
-#include <Variant.h>
-
-bool namedDates (const std::string&, Variant&);
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////

From 6009e20aa49fab0333fbf4b609a51e25105d0b72 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 5 Mar 2017 15:03:14 -0500
Subject: [PATCH 463/879] Tests: Named date tests migrated to libshared

---
 test/.gitignore     |   1 -
 test/CMakeLists.txt |   2 +-
 test/dates.t.cpp    | 174 --------------------------------------------
 3 files changed, 1 insertion(+), 176 deletions(-)
 delete mode 100644 test/dates.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 38bc7bb35..2c85bd59d 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,7 +4,6 @@
 *.log
 *.runlog
 col.t
-dates.t
 eval.t
 lexer.t
 t.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b76b2fb77..0d9bd2a8c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t t.t tdb2.t util.t view.t lexer.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t t.t tdb2.t util.t view.t lexer.t eval.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/dates.t.cpp b/test/dates.t.cpp
deleted file mode 100644
index 459a459b6..000000000
--- a/test/dates.t.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013 - 2017, Göteborg Bit Factory.
-//
-// 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <test.h>
-#include <Datetime.h>
-
-////////////////////////////////////////////////////////////////////////////////
-void testInit (UnitTest& t, const std::string& value, Datetime& var)
-{
-  try
-  {
-    var = Datetime (value);
-    t.pass (value + " --> valid");
-  }
-
-  catch (const std::string& e)
-  {
-    t.fail (value + " --> valid");
-    t.diag (e);
-  }
-
-  catch (...)
-  {
-    t.fail (value + " --> valid");
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (101);
-
-  Datetime sunday;    testInit (t, "sunday",    sunday);
-  Datetime monday;    testInit (t, "monday",    monday);
-  Datetime tuesday;   testInit (t, "tuesday",   tuesday);
-  Datetime wednesday; testInit (t, "wednesday", wednesday);
-  Datetime thursday;  testInit (t, "thursday",  thursday);
-  Datetime friday;    testInit (t, "friday",    friday);
-  Datetime saturday;  testInit (t, "saturday",  saturday);
-
-  Datetime sun; testInit (t, "sun", sun);
-  Datetime mon; testInit (t, "mon", mon);
-  Datetime tue; testInit (t, "tue", tue);
-  Datetime wed; testInit (t, "wed", wed);
-  Datetime thu; testInit (t, "thu", thu);
-  Datetime fri; testInit (t, "fri", fri);
-  Datetime sat; testInit (t, "sat", sat);
-
-  t.ok (sunday    == sun, "sunday == sun");
-  t.ok (monday    == mon, "monday == mon");
-  t.ok (tuesday   == tue, "tuesday == tue");
-  t.ok (wednesday == wed, "wednesday == wed");
-  t.ok (thursday  == thu, "thursday == thu");
-  t.ok (friday    == fri, "friday == fri");
-  t.ok (saturday  == sat, "saturday == sat");
-
-  Datetime january;   testInit (t, "january",   january);
-  Datetime february;  testInit (t, "february",  february);
-  Datetime march;     testInit (t, "march",     march);
-  Datetime april;     testInit (t, "april",     april);
-  Datetime may;       testInit (t, "may",       may);
-  Datetime june;      testInit (t, "june",      june);
-  Datetime july;      testInit (t, "july",      july);
-  Datetime august;    testInit (t, "august",    august);
-  Datetime september; testInit (t, "september", september);
-  Datetime october;   testInit (t, "october",   october);
-  Datetime november;  testInit (t, "november",  november);
-  Datetime december;  testInit (t, "december",  december);
-
-  Datetime jan; testInit (t, "jan", jan);
-  Datetime feb; testInit (t, "feb", feb);
-  Datetime mar; testInit (t, "mar", mar);
-  Datetime apr; testInit (t, "apr", apr);
-  Datetime jun; testInit (t, "jun", jun);
-  Datetime jul; testInit (t, "jul", jul);
-  Datetime aug; testInit (t, "aug", aug);
-  Datetime sep; testInit (t, "sep", sep);
-  Datetime oct; testInit (t, "oct", oct);
-  Datetime nov; testInit (t, "nov", nov);
-  Datetime dec; testInit (t, "dec", dec);
-
-  t.ok (january   == jan, "january == jan");
-  t.ok (february  == feb, "february == feb");
-  t.ok (march     == mar, "march == mar");
-  t.ok (april     == apr, "april == apr");
-  // May has only three letters.
-  t.ok (june      == jun, "june == jun");
-  t.ok (july      == jul, "july == jul");
-  t.ok (august    == aug, "august == aug");
-  t.ok (september == sep, "september == sep");
-  t.ok (october   == oct, "october == oct");
-  t.ok (november  == nov, "november == nov");
-  t.ok (december  == dec, "december == dec");
-
-  // Simply instantiate these for now.  Test later.
-  Datetime now;            testInit (t, "now", now);
-  Datetime today;          testInit (t, "today", today);
-  Datetime sod;            testInit (t, "sod", sod);
-  Datetime yesterday;      testInit (t, "yesterday", yesterday);
-  Datetime tomorrow;       testInit (t, "tomorrow", tomorrow);
-  Datetime eod;            testInit (t, "eod", eod);
-  Datetime soy;            testInit (t, "soy", soy);
-  Datetime eoy;            testInit (t, "eoy", eoy);
-  Datetime socm;           testInit (t, "socm", socm);
-  Datetime eocm;           testInit (t, "eocm", eocm);
-  Datetime soww;           testInit (t, "soww", soww);
-  Datetime eoww;           testInit (t, "eoww", eoww);
-  Datetime som;            testInit (t, "som", som);
-  Datetime eom;            testInit (t, "eom", eom);
-  Datetime later;          testInit (t, "later", later);
-  Datetime someday;        testInit (t, "someday", someday);
-  Datetime easter;         testInit (t, "easter", easter);
-  Datetime eastermonday;   testInit (t, "eastermonday", eastermonday);
-  Datetime ascension;      testInit (t, "ascension", ascension);
-  Datetime pentecost;      testInit (t, "pentecost", pentecost);
-  Datetime goodfriday;     testInit (t, "goodfriday", goodfriday);
-  Datetime midsommar;      testInit (t, "midsommar", midsommar);
-  Datetime midsommarafton; testInit (t, "midsommarafton", midsommarafton);
-  Datetime juhannus;       testInit (t, "juhannus", juhannus);
-  Datetime first;          testInit (t, "1st", first);
-  Datetime second;         testInit (t, "2nd", second);
-  Datetime third;          testInit (t, "3rd", third);
-  Datetime fourth;         testInit (t, "4th", fourth);
-
-  // Check abbreviations.
-  // TW-1515: abbreviation.minimum does not apply to date recognition
-  Datetime yesterday2;      testInit (t, "yesterday", yesterday2);
-  Datetime yesterday3;      testInit (t, "yesterda",  yesterday3);
-  Datetime yesterday4;      testInit (t, "yesterd",   yesterday4);
-  Datetime yesterday5;      testInit (t, "yester",    yesterday5);
-  Datetime yesterday6;      testInit (t, "yeste",     yesterday6);
-  Datetime yesterday7;      testInit (t, "yest",      yesterday7);
-  Datetime yesterday8;      testInit (t, "yes",       yesterday8);
-
-  t.ok (now >= today,               "now >= today");
-  t.ok (sod == tomorrow,            "sod == tomorrow");
-  t.ok (yesterday < today,          "yesterday < today");
-  t.ok (today < tomorrow,           "today < tomorrow");
-  t.ok (socm < eocm,                "socm < eocm");
-  t.ok (now < later,                "now < later");
-  t.ok (now < someday,              "now < someday");
-  t.ok (goodfriday < easter,        "goodfriday < easter");
-  t.ok (easter < eastermonday,      "easter < eastermonday");
-  t.ok (midsommarafton < midsommar, "midsommarafton < midsommar");
-  t.ok (juhannus == midsommarafton, "juhannus == midsommarafton");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 5c56f9008c6b1ef675d8ca15efd0dd4821de326d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 6 Mar 2017 23:58:16 -0500
Subject: [PATCH 464/879] libshared: Updated to
 5bd493494fe2b1f0ab208e1edb4854316eeb5423

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 0dbe6c281..5bd493494 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 0dbe6c2818d4dc99f5d0089d6afb1559ed05ebf7
+Subproject commit 5bd493494fe2b1f0ab208e1edb4854316eeb5423

From 9841ce11076d240cb5850013f227a66b08fd6bd6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:26:32 -0500
Subject: [PATCH 465/879] libshared: Updated to
 cbe3fd84a8950a42ed271a0dd8e7c4e1564b1333

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 5bd493494..cbe3fd84a 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 5bd493494fe2b1f0ab208e1edb4854316eeb5423
+Subproject commit cbe3fd84a8950a42ed271a0dd8e7c4e1564b1333

From ec3e14c8f6f1bb1f48a32d7f16ff769e99ba942d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:33:34 -0500
Subject: [PATCH 466/879] Task: Uses named dates to WEEK virtual tag

---
 src/Task.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index d7fdc678e..c7c839d6f 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -447,7 +447,8 @@ bool Task::is_dueweek () const
         status != Task::deleted)
     {
       Datetime due (get_date ("due"));
-      if (due.sameWeek (Datetime ()))
+      if (due >= Datetime ("sow") &&
+          due <= Datetime ("eow"))
         return true;
     }
   }

From 2e1e295ba4ab291f7598d6bdcd895bff90b0c706 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:33:55 -0500
Subject: [PATCH 467/879] Task: Uses named dates for MONTH virtual tag

---
 src/Task.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index c7c839d6f..e18a3fa7f 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -467,7 +467,8 @@ bool Task::is_duemonth () const
         status != Task::deleted)
     {
       Datetime due (get_date ("due"));
-      if (due.sameMonth (Datetime ()))
+      if (due >= Datetime ("som") &&
+          due <= Datetime ("eom"))
         return true;
     }
   }

From 2485efa5f3c6e5d0baf77464e7470d67551673b9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:34:15 -0500
Subject: [PATCH 468/879] Task: Uses named dates for QUARTER virtual tag

---
 src/Task.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index e18a3fa7f..c894c6554 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -487,7 +487,8 @@ bool Task::is_duequarter () const
         status != Task::deleted)
     {
       Datetime due (get_date ("due"));
-      if (due.sameQuarter (Datetime ()))
+      if (due >= Datetime ("soq") &&
+          due <= Datetime ("eoq"))
         return true;
     }
   }

From f06ca50df9c9c09498166ff6b419d8b57ee30a43 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:34:25 -0500
Subject: [PATCH 469/879] Task: Uses named dates for YEAR virtual tag

---
 src/Task.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index c894c6554..ab4423415 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -507,7 +507,8 @@ bool Task::is_dueyear () const
         status != Task::deleted)
     {
       Datetime due (get_date ("due"));
-      if (due.sameYear (Datetime ()))
+      if (due >= Datetime ("soy") &&
+          due <= Datetime ("eoy"))
         return true;
     }
   }

From 99f92beac9eff90c77d797b8bea161c5492673ad Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 8 Mar 2017 08:48:15 -0500
Subject: [PATCH 470/879] libshared: Updated to
 320f65961505019d276e5b36316bd11bdd0025b1

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index cbe3fd84a..320f65961 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit cbe3fd84a8950a42ed271a0dd8e7c4e1564b1333
+Subproject commit 320f65961505019d276e5b36316bd11bdd0025b1

From 2dba81e4601d18f88a941db30ee2611c4fddc451 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 15 Mar 2017 12:00:43 -0400
Subject: [PATCH 471/879] libshared: Updated to
 6f0900d86743405f24d52f9eafe6c8e941d40ec3

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 320f65961..6f0900d86 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 320f65961505019d276e5b36316bd11bdd0025b1
+Subproject commit 6f0900d86743405f24d52f9eafe6c8e941d40ec3

From b3c1d94e750f032caf4a3d1e05e9e5381f213822 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 15 Mar 2017 13:04:26 -0400
Subject: [PATCH 472/879] libshared: Updated to
 b1686ad3e14c766faa3bdec3d5afe7152ace5e71

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 6f0900d86..b1686ad3e 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 6f0900d86743405f24d52f9eafe6c8e941d40ec3
+Subproject commit b1686ad3e14c766faa3bdec3d5afe7152ace5e71

From 60fc24ce2bd25f71a7237f71714d4d4fb45ff18d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 09:59:20 -0400
Subject: [PATCH 473/879] Cleanup: Formatting

---
 src/Context.cpp | 2 +-
 src/Eval.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 9c8713c2f..d5470da4c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1086,7 +1086,7 @@ void Context::createDefaultConfig ()
   if (rc_file._data != "" && ! rc_file.exists ())
   {
     if (config.getBoolean ("confirmation") &&
-        !confirm (format (STRING_CONTEXT_CREATE_RC, home_dir, rc_file._data)))
+        ! confirm (format (STRING_CONTEXT_CREATE_RC, home_dir, rc_file._data)))
       throw std::string (STRING_CONTEXT_NEED_RC);
 
     // Override data.location in the defaults.
diff --git a/src/Eval.cpp b/src/Eval.cpp
index a1ca83d25..91e9c31c9 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -352,7 +352,7 @@ void Eval::evaluatePostfixStack (
           }
 
           // An identifier that fails lookup is a string.
-          if (!found)
+          if (! found)
           {
             v.cast (Variant::type_string);
             if (_debug)

From 82935c585afe9d71ab3479ad13ceee095db3a6fc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 09:59:50 -0400
Subject: [PATCH 474/879] libshared: Updated to
 f2ac7ef9cc9f33f634f9aacd65ca9c1f828f50e3

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index b1686ad3e..f2ac7ef9c 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit b1686ad3e14c766faa3bdec3d5afe7152ace5e71
+Subproject commit f2ac7ef9cc9f33f634f9aacd65ca9c1f828f50e3

From 70ce4eef7eb448445373f05a400485fcfd29d74c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 10:00:25 -0400
Subject: [PATCH 475/879] Context: Selects Datetime/Duration features to match
 expectations

---
 src/Context.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index d5470da4c..fd59ae1bc 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -39,6 +39,7 @@
 #include <Eval.h>
 #include <Variant.h>
 #include <Datetime.h>
+#include <Duration.h>
 #include <shared.h>
 #include <format.h>
 #include <main.h>
@@ -1027,19 +1028,23 @@ void Context::getLimits (int& rows, int& lines)
 // easier, it has been decoupled from Context.
 void Context::staticInitialization ()
 {
-  CLI2::minimumMatchLength     = config.getInteger ("abbreviation.minimum");
-  Lexer::minimumMatchLength    = config.getInteger ("abbreviation.minimum");
+  CLI2::minimumMatchLength           = config.getInteger ("abbreviation.minimum");
+  Lexer::minimumMatchLength          = config.getInteger ("abbreviation.minimum");
 
-  Task::defaultProject      = config.get ("default.project");
-  Task::defaultDue          = config.get ("default.due");
-  Task::defaultScheduled    = config.get ("default.scheduled");
+  Task::defaultProject               = config.get ("default.project");
+  Task::defaultDue                   = config.get ("default.due");
+  Task::defaultScheduled             = config.get ("default.scheduled");
 
-  Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
-  Task::regex               = Variant::searchUsingRegex    = config.getBoolean ("regex");
-  Lexer::dateFormat         = Variant::dateFormat          = config.get ("dateformat");
-  Datetime::isoEnabled      = config.getBoolean ("date.iso");
+  Task::searchCaseSensitive          = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
+  Task::regex                        = Variant::searchUsingRegex    = config.getBoolean ("regex");
+  Lexer::dateFormat                  = Variant::dateFormat          = config.get ("dateformat");
 
-  TDB2::debug_mode          = config.getBoolean ("debug");
+  Datetime::isoEnabled               = config.getBoolean ("date.iso");
+  Datetime::standaloneDateEnabled    = false;
+  Datetime::standaloneTimeEnabled    = false;
+  Duration::standaloneSecondsEnabled = false;
+
+  TDB2::debug_mode                   = config.getBoolean ("debug");
 
   for (auto& rc : config)
   {

From 67dc65a67dc481c9345bbad62bf116646be3ae54 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 10:05:25 -0400
Subject: [PATCH 476/879] Tests: Lexer tests now stable with Datetime/duration
 features disabled

---
 test/lexer.t.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index 55b2eea0f..f8aaa1299 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -30,9 +30,8 @@
 #include <string.h>
 #include <test.h>
 #include <Lexer.h>
-#include <Context.h>
-
-Context context;
+#include <Datetime.h>
+#include <Duration.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
@@ -43,6 +42,12 @@ int main (int, char**)
   UnitTest t (1262);
 #endif
 
+  // Use same Datetime/Duraiton configuration as Context∴:staticInitialization.
+  Datetime::isoEnabled               = true;
+  Datetime::standaloneDateEnabled    = false;
+  Datetime::standaloneTimeEnabled    = false;
+  Duration::standaloneSecondsEnabled = false;
+
   std::vector <std::pair <std::string, Lexer::Type>> tokens;
   std::string token;
   Lexer::Type type;
@@ -178,17 +183,17 @@ int main (int, char**)
   t.is (tokens[0].first,         "1",                         "tokens[0] == '1'");
   t.is ((int) tokens[0].second,  (int) Lexer::Type::number,   "tokens[0] == Type::number");
   t.is (tokens[1].first,         "12",                        "tokens[1] == '12'");
-  t.is ((int) tokens[1].second,  (int) Lexer::Type::number,   "tokens[1] == Type::date");
+  t.is ((int) tokens[1].second,  (int) Lexer::Type::number,   "tokens[1] == Type::number");
   t.is (tokens[2].first,         "123",                       "tokens[2] == '123'");
   t.is ((int) tokens[2].second,  (int) Lexer::Type::number,   "tokens[2] == Type::number"); // 70
   t.is (tokens[3].first,         "1234",                      "tokens[3] == '1234'");
-  t.is ((int) tokens[3].second,  (int) Lexer::Type::date,     "tokens[3] == Type::date");
+  t.is ((int) tokens[3].second,  (int) Lexer::Type::number,   "tokens[3] == Type::number");
   t.is (tokens[4].first,         "12345",                     "tokens[4] == '12345'");
   t.is ((int) tokens[4].second,  (int) Lexer::Type::number,   "tokens[4] == Type::number");
   t.is (tokens[5].first,         "123456",                    "tokens[5] == '123456'");
-  t.is ((int) tokens[5].second,  (int) Lexer::Type::date,     "tokens[5] == Type::date");
+  t.is ((int) tokens[5].second,  (int) Lexer::Type::number,   "tokens[5] == Type::number");
   t.is (tokens[6].first,         "1234567",                   "tokens[6] == '1234567'");
-  t.is ((int) tokens[6].second,  (int) Lexer::Type::duration, "tokens[6] == Type::number");
+  t.is ((int) tokens[6].second,  (int) Lexer::Type::number,   "tokens[6] == Type::number");
 
   // void split (std::vector<std::string>&, const std::string&);
   std::string unsplit = " ( A or B ) ";

From 55ba3b11cba9d9514c5d2b726a7648435995a998 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 17:16:52 -0400
Subject: [PATCH 477/879] libshared: Updated to
 9a05fb5040008aa5f2c95e7ad060aa249367fe92

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index f2ac7ef9c..9a05fb504 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit f2ac7ef9cc9f33f634f9aacd65ca9c1f828f50e3
+Subproject commit 9a05fb5040008aa5f2c95e7ad060aa249367fe92

From 23c69506927b1659e2c7d8eb2b0791d429e65f93 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 19 Mar 2017 17:27:40 -0400
Subject: [PATCH 478/879] Tests: Syntax error in Python that went unnoticed

---
 test/math.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/math.t b/test/math.t
index 79ca06537..a5700646f 100755
--- a/test/math.t
+++ b/test/math.t
@@ -52,7 +52,7 @@ class TestMath(TestCase):
         cls.t("add three 'due:eoy-10days'")
         cls.t("add four  due:'eoy - 10days'")
         cls.t("add five  'due:eoy - 10days'")
-        cls.t("add six   'due:%d-01-01T00:00:00 - 10days'".format (datetime.now().year + 1))
+        cls.t("add six   'due:{}-01-01T00:00:00 - 10days'".format (datetime.now().year + 1))
 
     def test_compact_unquoted(self):
         """compact unquoted"""

From 14474170f04c566770b00c3d2992e490e6a5b2d3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 08:29:51 -0400
Subject: [PATCH 479/879] CmdInfo: Fixed header underline problem

---
 src/commands/CmdInfo.cpp | 66 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 60aca8ded..44c33f0ed 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -114,10 +114,28 @@ int CmdInfo::execute (std::string& output)
       Color alternate (context.config.get ("color.alternate"));
       view.colorOdd (alternate);
 
-      view.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      if (context.config.getBoolean ("fontunderline"))
+      {
+        view.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      }
+      else
+      {
+        view.underlineHeaders ();
+        view.colorHeader (Color (context.config.get ("color.label")));
+      }
     }
     else
-      view.underlineHeaders ();
+    {
+      if (context.config.getBoolean ("fontunderline"))
+      {
+        view.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      }
+      else
+      {
+        view.underlineHeaders ();
+        view.colorHeader (Color (context.config.get ("color.label")));
+      }
+    }
 
     Datetime now;
 
@@ -415,7 +433,27 @@ int CmdInfo::execute (std::string& output)
         urgencyDetails.colorOdd (alternate);
         urgencyDetails.intraColorOdd (alternate);
 
-        urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
+        if (context.config.getBoolean ("fontunderline"))
+        {
+          urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
+        }
+        else
+        {
+          urgencyDetails.underlineHeaders ();
+          urgencyDetails.colorHeader (Color (context.config.get ("color.label")));
+        }
+      }
+      else
+      {
+        if (context.config.getBoolean ("fontunderline"))
+        {
+          urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
+        }
+        else
+        {
+          urgencyDetails.underlineHeaders ();
+          urgencyDetails.colorHeader (Color (context.config.get ("color.label")));
+        }
       }
 
       if (context.config.getBoolean ("obfuscate"))
@@ -518,10 +556,28 @@ int CmdInfo::execute (std::string& output)
       journal.colorOdd (alternate);
       journal.intraColorOdd (alternate);
 
-      journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      if (context.config.getBoolean ("fontunderline"))
+      {
+        journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      }
+      else
+      {
+        journal.underlineHeaders ();
+        journal.colorHeader (Color (context.config.get ("color.label")));
+      }
     }
     else
-      journal.underlineHeaders ();
+    {
+      if (context.config.getBoolean ("fontunderline"))
+      {
+        journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      }
+      else
+      {
+        journal.underlineHeaders ();
+        journal.colorHeader (Color (context.config.get ("color.label")));
+      }
+    }
 
     if (context.config.getBoolean ("obfuscate"))
       journal.obfuscate ();

From 78922d84339ec7e8dc6514e4ff648dc1719f802b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:02:37 -0400
Subject: [PATCH 480/879] Tests: Disabled ambiguous test (matching libshared)

---
 test/datetime-negative.t | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index 8bb7567bc..1d8783f79 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -103,8 +103,9 @@ class TestIncorrectDate(BaseDateTimeNegativeTest):
     def test_set_incorrect_datetime_day_two_hundred_in_YYYY_WwwD(self):
         self.assertInvalidDatetimeFormat('2014-W24200')
 
-    def test_set_incorrect_datetime_month_zero_in_YYYY_MM(self):
-        self.assertInvalidDatetimeFormat('2014-00')
+    # Disabled: Looks like 'hhmm-hh'
+    #def test_set_incorrect_datetime_month_zero_in_YYYY_MM(self):
+    #    self.assertInvalidDatetimeFormat('2014-00')
 
     def test_set_incorrect_datetime_overflow_month_in_YYYY_MM(self):
         self.assertInvalidDatetimeFormat('2014-13')

From b6d65a434b0ca8618a99282360f1886461d77c24 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:06:16 -0400
Subject: [PATCH 481/879] util: Added helper function to properly manage table
 header color/underline

---
 src/util.cpp | 29 +++++++++++++++++++++++++++++
 src/util.h   |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/util.cpp b/src/util.cpp
index 090ecf188..0aba1d928 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -303,3 +303,32 @@ const char* optionalBlankLine ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void setHeaderUnderline (Table& table)
+{
+  // If an alternating row color is specified, notify the table.
+  if (context.color ())
+  {
+    Color alternate (context.config.get ("color.alternate"));
+    table.colorOdd (alternate);
+    table.intraColorOdd (alternate);
+
+    if (context.config.getBoolean ("fontunderline"))
+    {
+      table.colorHeader (Color ("underline " + context.config.get ("color.label")));
+    }
+    else
+    {
+      table.colorHeader (Color (context.config.get ("color.label")));
+      table.underlineHeaders ();
+    }
+  }
+  else
+  {
+    if (context.config.getBoolean ("fontunderline"))
+      table.colorHeader (Color ("underline"));
+    else
+      table.underlineHeaders ();
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/util.h b/src/util.h
index d12d80af8..d1257ea5d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -37,7 +37,7 @@
 #else
 #include <uuid/uuid.h>
 #endif
-#include <Task.h>
+#include <Table.h>
 
 // util.cpp
 int confirm4 (const std::string&);
@@ -63,6 +63,7 @@ const std::vector <std::string> extractParents (
 bool nontrivial (const std::string&);
 int strippedLength (const std::string&);
 const char* optionalBlankLine ();
+void setHeaderUnderline (Table&);
 
 #endif
 ////////////////////////////////////////////////////////////////////////////////

From b162748e26843a23c025e216909154b4f1063189 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:06:59 -0400
Subject: [PATCH 482/879] TDB2: Table headers consistent

---
 src/TDB2.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 5988ec0ac..3a6b4cdc2 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -41,6 +41,7 @@
 #include <shared.h>
 #include <format.h>
 #include <main.h>
+#include <util.h>
 
 extern Context context;
 
@@ -1047,9 +1048,7 @@ void TDB2::show_diff (
     view.add ("");
     view.add (STRING_TDB2_UNDO_PRIOR);
     view.add (STRING_TDB2_UNDO_CURRENT);
-
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
+    setHeaderUnderline (view);
 
     Task after (current);
 

From 412e804b933a6b7b71418ea3e4cf1ecbff3fdaf0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:08:45 -0400
Subject: [PATCH 483/879] CmdCalendar: Table headers consistent

---
 src/commands/CmdCalendar.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 5dfbd3307..f3b221c57 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -286,7 +286,6 @@ int CmdCalendar::execute (std::string& output)
   Color color_weekend    (context.config.get ("color.calendar.weekend"));
   Color color_holiday    (context.config.get ("color.calendar.holiday"));
   Color color_weeknumber (context.config.get ("color.calendar.weeknumber"));
-  Color color_label      (context.config.get ("color.label"));
 
   if (context.color () && context.config.getBoolean ("calendar.legend"))
     out << "Legend: "
@@ -368,7 +367,7 @@ int CmdCalendar::execute (std::string& output)
       holTable.width (context.getWidth ());
       holTable.add (STRING_CMD_CAL_LABEL_DATE);
       holTable.add (STRING_CMD_CAL_LABEL_HOL);
-      holTable.colorHeader (color_label);
+      setHeaderUnderline (holTable);
 
       std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
       for (auto& it : context.config)
@@ -428,10 +427,8 @@ std::string CmdCalendar::renderMonths (
     throw std::string (STRING_CMD_CAL_SUN_MON);
 
   // Build table for the number of months to be displayed.
-  Color label (context.config.get ("color.label"));
-
   Table view;
-  view.colorHeader (label);
+  setHeaderUnderline (view);
   view.width (context.getWidth ());
   for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
   {

From 6703992cf3da0fae824fbae2b5dc63aca03eefc1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:09:00 -0400
Subject: [PATCH 484/879] CmdColumns: Table headers consistent

---
 src/commands/CmdColumns.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 3cd73fc21..28d3113ee 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -77,16 +77,7 @@ int CmdColumns::execute (std::string& output)
   formats.add (STRING_COLUMN_LABEL_MODIFY);
   formats.add (STRING_COLUMN_LABEL_STYLES);
   formats.add (STRING_COLUMN_LABEL_EXAMPLES);
-
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    formats.colorHeader (label);
-
-    Color alternate (context.config.get ("color.alternate"));
-    formats.colorOdd (alternate);
-    formats.intraColorOdd (alternate);
-  }
+  setHeaderUnderline (formats);
 
   for (const auto& name : names)
   {

From d6b989c8371091a1b655e69543ccb8c33bb6a271 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:09:30 -0400
Subject: [PATCH 485/879] CmdCommands: Table headers consistent

---
 src/commands/CmdCommands.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 4f0156380..6b62aefc9 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -68,20 +68,10 @@ int CmdCommands::execute (std::string& output)
   view.add (STRING_COLUMN_LABEL_MODS,     false);
   view.add (STRING_COLUMN_LABEL_MISC,     false);
   view.add (STRING_COLUMN_LABEL_DESC);
-
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
-
-    Color alternate (context.config.get ("color.alternate"));
-    view.colorOdd (alternate);
-    view.intraColorOdd (alternate);
-  }
-
   view.leftMargin (context.config.getInteger ("indent.report"));
   view.extraPadding (context.config.getInteger ("row.padding"));
   view.intraPadding (context.config.getInteger ("column.padding"));
+  setHeaderUnderline (view);
 
   for (auto& command : context.commands)
   {

From 717e8c3be5a86ce073db9288998e946814f4506f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:09:46 -0400
Subject: [PATCH 486/879] CmdContext: Table headers consistent

---
 src/commands/CmdContext.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index ef4d1127f..ca0e25e35 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -225,12 +225,7 @@ void CmdContext::listContexts (std::stringstream& out)
     table.add ("Name");
     table.add ("Definition");
     table.add ("Active");
-
-    if (context.color ())
-    {
-      Color label (context.config.get ("color.label"));
-      table.colorHeader (label);
-    }
+    setHeaderUnderline (table);
 
     std::string activeContext = context.config.get ("context");
 

From 15da5fc702aa16e65a558d443e452188b8477e36 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:10:20 -0400
Subject: [PATCH 487/879] CmdHistory: Table headers consistent

---
 src/commands/CmdHistory.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index cf4ec3e0f..8b1be1804 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -64,6 +64,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 
   // Now build the view.
   Table view;
+  setHeaderUnderline (view);
   if (context.config.getBoolean ("color"))
     view.forceColor ();
   view.width (context.getWidth ());
@@ -196,6 +197,7 @@ template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
 {
   Table view;
+  setHeaderUnderline (view);
   if (context.config.getBoolean ("color"))
     view.forceColor ();
   view.width (context.getWidth ());

From 943b73b287a40a27e14ae75555fbafb374accf8b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:10:42 -0400
Subject: [PATCH 488/879] CmdHistory: Formatting

---
 src/commands/CmdHistory.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 8b1be1804..f0f9b7a2c 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -301,7 +301,7 @@ public:
     return dt.startOfMonth ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);
@@ -404,7 +404,7 @@ public:
     return dt.startOfMonth ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);
@@ -448,7 +448,7 @@ public:
     return dt.startOfYear ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR, false);
   }
@@ -489,7 +489,7 @@ public:
     return dt.startOfYear ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR, false);
   }
@@ -531,7 +531,7 @@ public:
     return dt.startOfDay ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);
@@ -581,7 +581,7 @@ public:
     return dt.startOfDay ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);
@@ -631,7 +631,7 @@ public:
     return dt.startOfWeek ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);
@@ -681,7 +681,7 @@ public:
     return dt.startOfWeek ();
   }
 
-  static void setupTableDates (Table & view)
+  static void setupTableDates (Table& view)
   {
     view.add (STRING_CMD_HISTORY_YEAR,  false);
     view.add (STRING_CMD_HISTORY_MONTH, false);

From 35f46819290357b0325fe130b99c8b4bdf801460 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:11:00 -0400
Subject: [PATCH 489/879] CmdInfo: Table headers consistent

---
 src/commands/CmdInfo.cpp | 84 ++--------------------------------------
 1 file changed, 3 insertions(+), 81 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 44c33f0ed..2d68813ea 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -107,35 +107,7 @@ int CmdInfo::execute (std::string& output)
       view.forceColor ();
     view.add (STRING_COLUMN_LABEL_NAME);
     view.add (STRING_COLUMN_LABEL_VALUE);
-
-    // If an alternating row color is specified, notify the table.
-    if (context.color ())
-    {
-      Color alternate (context.config.get ("color.alternate"));
-      view.colorOdd (alternate);
-
-      if (context.config.getBoolean ("fontunderline"))
-      {
-        view.colorHeader (Color ("underline " + context.config.get ("color.label")));
-      }
-      else
-      {
-        view.underlineHeaders ();
-        view.colorHeader (Color (context.config.get ("color.label")));
-      }
-    }
-    else
-    {
-      if (context.config.getBoolean ("fontunderline"))
-      {
-        view.colorHeader (Color ("underline " + context.config.get ("color.label")));
-      }
-      else
-      {
-        view.underlineHeaders ();
-        view.colorHeader (Color (context.config.get ("color.label")));
-      }
-    }
+    setHeaderUnderline (view);
 
     Datetime now;
 
@@ -427,33 +399,12 @@ int CmdInfo::execute (std::string& output)
     Table urgencyDetails;
     if (task.urgency () != 0.0)
     {
+      setHeaderUnderline (urgencyDetails);
       if (context.color ())
       {
         Color alternate (context.config.get ("color.alternate"));
         urgencyDetails.colorOdd (alternate);
         urgencyDetails.intraColorOdd (alternate);
-
-        if (context.config.getBoolean ("fontunderline"))
-        {
-          urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
-        }
-        else
-        {
-          urgencyDetails.underlineHeaders ();
-          urgencyDetails.colorHeader (Color (context.config.get ("color.label")));
-        }
-      }
-      else
-      {
-        if (context.config.getBoolean ("fontunderline"))
-        {
-          urgencyDetails.colorHeader (Color ("underline " + context.config.get ("color.label")));
-        }
-        else
-        {
-          urgencyDetails.underlineHeaders ();
-          urgencyDetails.colorHeader (Color (context.config.get ("color.label")));
-        }
       }
 
       if (context.config.getBoolean ("obfuscate"))
@@ -548,36 +499,7 @@ int CmdInfo::execute (std::string& output)
 
     // Create a third table, containing undo log change details.
     Table journal;
-
-    // If an alternating row color is specified, notify the table.
-    if (context.color ())
-    {
-      Color alternate (context.config.get ("color.alternate"));
-      journal.colorOdd (alternate);
-      journal.intraColorOdd (alternate);
-
-      if (context.config.getBoolean ("fontunderline"))
-      {
-        journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
-      }
-      else
-      {
-        journal.underlineHeaders ();
-        journal.colorHeader (Color (context.config.get ("color.label")));
-      }
-    }
-    else
-    {
-      if (context.config.getBoolean ("fontunderline"))
-      {
-        journal.colorHeader (Color ("underline " + context.config.get ("color.label")));
-      }
-      else
-      {
-        journal.underlineHeaders ();
-        journal.colorHeader (Color (context.config.get ("color.label")));
-      }
-    }
+    setHeaderUnderline (journal);
 
     if (context.config.getBoolean ("obfuscate"))
       journal.obfuscate ();

From 4c802a6ff7b485ea90f1402b4e80fc963c01c3d9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:11:12 -0400
Subject: [PATCH 490/879] CmdProjects: Table headers consistent

---
 src/commands/CmdProjects.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 06b251b15..344ae6c6c 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -109,12 +109,7 @@ int CmdProjects::execute (std::string& output)
     view.width (context.getWidth ());
     view.add (STRING_COLUMN_LABEL_PROJECT);
     view.add (STRING_COLUMN_LABEL_TASKS, false);
-
-    if (context.color ())
-    {
-      Color label (context.config.get ("color.label"));
-      view.colorHeader (label);
-    }
+    setHeaderUnderline (view);
 
     std::vector <std::string> processed;
     for (auto& project : unique)

From 92184624778264adf6ab79d0c741ba741c8e1b79 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:11:26 -0400
Subject: [PATCH 491/879] CmdReports: Table headers consistent

---
 src/commands/CmdReports.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 478ba9c52..bc812167b 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -90,16 +90,7 @@ int CmdReports::execute (std::string& output)
   view.width (context.getWidth ());
   view.add (STRING_CMD_REPORTS_REPORT);
   view.add (STRING_CMD_REPORTS_DESC);
-
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
-
-    Color alternate (context.config.get ("color.alternate"));
-    view.colorOdd (alternate);
-    view.intraColorOdd (alternate);
-  }
+  setHeaderUnderline (view);
 
   for (auto& report : reports)
   {

From 5d3f97819bc6940261bb538b1591f30871236dfb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:11:40 -0400
Subject: [PATCH 492/879] CmdShow: Table headers consistent

---
 src/commands/CmdShow.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 55212224a..fb4ac4798 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -35,6 +35,7 @@
 #include <Context.h>
 #include <FS.h>
 #include <Table.h>
+#include <util.h>
 
 extern Context context;
 extern std::string configurationDefaults;
@@ -265,6 +266,7 @@ int CmdShow::execute (std::string& output)
   view.width (width);
   view.add (STRING_CMD_SHOW_CONF_VAR);
   view.add (STRING_CMD_SHOW_CONF_VALUE);
+  setHeaderUnderline (view);
 
   Color error;
   Color warning;
@@ -272,9 +274,6 @@ int CmdShow::execute (std::string& output)
   {
     error   = Color (context.config.get ("color.error"));
     warning = Color (context.config.get ("color.warning"));
-
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
   }
 
   bool issue_error = false;

From 3442e17f8318c7de0b6b2043c667105045bd6b5a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:11:56 -0400
Subject: [PATCH 493/879] CmdStats: Table headers consistent

---
 src/commands/CmdStats.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index e4aea4ca0..89afb18aa 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -160,12 +160,7 @@ int CmdStats::execute (std::string& output)
   view.intraPadding (2);
   view.add (STRING_CMD_STATS_CATEGORY);
   view.add (STRING_CMD_STATS_DATA);
-
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
-  }
+  setHeaderUnderline (view);
 
   int row = view.addRow ();
   view.set (row, 0, STRING_COLUMN_LABEL_STAT_PE);

From 44b30822348b3c9153fe113f7873c711507fd9cb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:12:09 -0400
Subject: [PATCH 494/879] CmdSummary: Table headers consistent

---
 src/commands/CmdSummary.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 0ecdbe5f2..e11efec84 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -138,6 +138,7 @@ int CmdSummary::execute (std::string& output)
   view.add (STRING_CMD_SUMMARY_AVG_AGE,   false);
   view.add (STRING_CMD_SUMMARY_COMPLETE,  false);
   view.add ("0%                        100%");
+  setHeaderUnderline (view);
 
   Color bar_color;
   Color bg_color;
@@ -145,9 +146,6 @@ int CmdSummary::execute (std::string& output)
   {
     bar_color = Color (context.config.get ("color.summary.bar"));
     bg_color  = Color (context.config.get ("color.summary.background"));
-
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
   }
 
   int barWidth = 30;

From c1445b3859f9ce2676afba9487cb345bca13efba Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:12:21 -0400
Subject: [PATCH 495/879] CmdTags: Table headers consistent

---
 src/commands/CmdTags.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 6241ddd96..cf99284cc 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -93,16 +93,12 @@ int CmdTags::execute (std::string& output)
     view.width (context.getWidth ());
     view.add (STRING_COLUMN_LABEL_TAG);
     view.add (STRING_COLUMN_LABEL_COUNT, false);
+    setHeaderUnderline (view);
 
     Color bold;
     if (context.color ())
-    {
       bold = Color ("bold");
 
-      Color label (context.config.get ("color.label"));
-      view.colorHeader (label);
-    }
-
     bool special = false;
     for (auto& i : unique)
     {

From 1f9bd897a768bf01543c13b5c8673d024e29dca1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:12:33 -0400
Subject: [PATCH 496/879] CmdTimesheet: Table headers consistent

---
 src/commands/CmdTimesheet.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index a15c882b1..3ef082e13 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -125,15 +125,7 @@ int CmdTimesheet::execute (std::string& output)
   table.add ("Project");
   table.add ("Due");
   table.add ("Task");
-
-  if (context.color ())
-  {
-    table.forceColor ();
-    table.colorHeader (Color ("underline " + context.config.get ("color.label")));
-    table.colorOdd    (Color (context.config.get ("color.alternate")));
-  }
-  else
-    table.underlineHeaders ();
+  setHeaderUnderline (table);
 
   auto dateformat = context.config.get ("dateformat");
 

From b9699bb93e5d2af709ec0acf0446b11d7788ba2a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 09:12:49 -0400
Subject: [PATCH 497/879] CmdUDAs: Table headers consistent

---
 src/commands/CmdUDAs.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index bc9c77a20..647a1548a 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -92,12 +92,7 @@ int CmdUDAs::execute (std::string& output)
     table.add (STRING_COLUMN_LABEL_VALUES);
     table.add (STRING_COLUMN_LABEL_DEFAULT);
     table.add (STRING_COLUMN_LABEL_UDACOUNT);
-
-    if (context.color ())
-    {
-      Color label ("underline " + context.config.get ("color.label"));
-      table.colorHeader (label);
-    }
+    setHeaderUnderline (table);
 
     for (auto& uda : udas)
     {
@@ -154,12 +149,7 @@ int CmdUDAs::execute (std::string& output)
     orphanTable.width (context.getWidth ());
     orphanTable.add (STRING_COLUMN_LABEL_ORPHAN);
     orphanTable.add (STRING_COLUMN_LABEL_UDACOUNT);
-
-    if (context.color ())
-    {
-      Color label ("underline " + context.config.get ("color.label"));
-      orphanTable.colorHeader (label);
-    }
+    setHeaderUnderline (orphanTable);
 
     for (auto& o : orphans)
     {

From 2949a7e86a691261c26449e89eeff716f440e533 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 20 Mar 2017 22:23:08 -0400
Subject: [PATCH 498/879] Tests: Removed taskd group features from test
 framework

---
 test/basetest/task.py  |  7 +++----
 test/basetest/taskd.py | 13 ++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/test/basetest/task.py b/test/basetest/task.py
index f83bb0358..a5a81c256 100644
--- a/test/basetest/task.py
+++ b/test/basetest/task.py
@@ -114,18 +114,17 @@ class Task(object):
         """
         if taskd_user is None:
             if default:
-                user, group, org, userkey = self.taskd.default_user
+                user, org, userkey = self.taskd.default_user
             else:
-                user, group, org, userkey = self.taskd.create_user()
+                user, org, userkey = self.taskd.create_user()
         else:
-            user, group, org, userkey = taskd_user
+            user, org, userkey = taskd_user
 
         credentials = "/".join((org, user, userkey))
         self.config("taskd.credentials", credentials)
 
         self.credentials = {
             "user": user,
-            "group": group,
             "org": org,
             "userkey": userkey,
         }
diff --git a/test/basetest/taskd.py b/test/basetest/taskd.py
index eb6ea52ce..e30fe5d00 100644
--- a/test/basetest/taskd.py
+++ b/test/basetest/taskd.py
@@ -110,9 +110,8 @@ class Taskd(object):
         # Make sure TASKDDATA points to the temporary folder
         self.env["TASKDDATA"] = self.datadir
 
-    def create_user(self, user=None, group=None, org=None):
-        """Create a user/group in the server and return the user
-        credentials to use in a taskw client.
+    def create_user(self, user=None, org=None):
+        """Create a user in the server and return the user credentials to use in a taskw client.
         """
         if user is None:
             # Create a unique user ID
@@ -122,20 +121,16 @@ class Taskd(object):
             # Increment the user_id
             self.usercount += 1
 
-        if group is None:
-            group = "default_group"
-
         if org is None:
             org = "default_org"
 
         self._add_entity("org", org, ignore_exists=True)
-        self._add_entity("group", org, group, ignore_exists=True)
         userkey = self._add_entity("user", org, user)
 
-        return user, group, org, userkey
+        return user, org, userkey
 
     def _add_entity(self, keyword, org, value=None, ignore_exists=False):
-        """Add an organization, group or user to the current server
+        """Add an organization or user to the current server
 
         If a user creation is requested, the user unique ID is returned
         """

From a9ff0770468a1b240e141cb8b35270bf7e4420b5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 21 Mar 2017 08:43:45 -0400
Subject: [PATCH 499/879] calc: Uses same configuration setting for
 Datetime/Duration as task

---
 src/calc.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/calc.cpp b/src/calc.cpp
index 80bb4ccb9..2a665b3c6 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -32,6 +32,8 @@
 #include <Eval.h>
 #include <Context.h>
 #include <Task.h>
+#include <Datetime.h>
+#include <Duration.h>
 #include <shared.h>
 #include <format.h>
 #include <i18n.h>
@@ -57,6 +59,11 @@ int main (int argc, char** argv)
 
   try
   {
+    // Same operating parameters as Context::staticInitialization.
+    Datetime::standaloneDateEnabled    = false;
+    Datetime::standaloneTimeEnabled    = false;
+    Duration::standaloneSecondsEnabled = false;
+
     bool infix {true};
 
     // Add a source for constants.

From dd1633f4538bf85d4a29f5e92c3df4eddf45ecb6 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Wed, 22 Mar 2017 02:55:22 +0100
Subject: [PATCH 500/879] Remove unused auxiliary script task_functions.sh

The definitions contained in this file were used only by the already
removed 'context' bash script, see: fc6507803bebbc11c90a995c566dc280266ca09f
---
 scripts/bash/task_functions.sh | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 scripts/bash/task_functions.sh

diff --git a/scripts/bash/task_functions.sh b/scripts/bash/task_functions.sh
deleted file mode 100644
index f60050e79..000000000
--- a/scripts/bash/task_functions.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIRM_PROMPT='are you sure'
-task_config ()
-{
-    var="${1}"
-    shift
-    value="${@}"
-    echo y | task config $var "$value" | grep -iv "$CONFIRM_PROMPT"
-}
-task_vars ()
-{
-    task _show | grep "^.*${1}.*=" | cut -d'=' -f1
-}
-task_get ()
-{
-    task _show | grep "^${1}=" | cut -d'=' -f2
-}
-task_color ()
-{
-    color="${1}"
-    shift
-    text="${@}"
-    task rc.verbose=nothing rc._forcecolor=yes color ${color} | grep 'task color' | \
-       tail -n 1 | sed -e 's/^  //' -e "s/task color ${color}/${text}/"
-}
-
-

From 129fea0a763725d07623bda1b505925e1d3db6e6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:02:06 -0400
Subject: [PATCH 501/879] Tests: Removed strippedLength() tests

---
 test/util.t.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/util.t.cpp b/test/util.t.cpp
index 752cc7f6a..8c0b04b70 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -36,7 +36,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (24);
+  UnitTest t (19);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -86,13 +86,6 @@ int main (int, char**)
   t.ok    (nontrivial ("  \t\ta"),                "nontrivial '  \\t\\ta' -> true");
   t.ok    (nontrivial ("a\t\t  "),                "nontrivial 'a\\t\\t  ' -> true");
 
-  // int strippedLength (const std::string&);
-  t.is (strippedLength (std::string ("")),                                  0, "strippedLength                              -> 0");
-  t.is (strippedLength (std::string ("abc")),                               3, "strippedLength abc                          -> 3");
-  t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
-  t.is (strippedLength (std::string ("\033[0m")),                           0, "strippedLength ^[[0m                        -> 0");
-  t.is (strippedLength (std::string ("\033[1m\033[0m")),                    0, "strippedLength ^[[1m^[[0m                   -> 0");
-
   return 0;
 }
 

From 8f2059a4c4effddc8966187e410a0316b8c05359 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:02:29 -0400
Subject: [PATCH 502/879] util: Removed unused strippedLength() function

---
 src/util.cpp | 27 ---------------------------
 src/util.h   |  1 -
 2 files changed, 28 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 0aba1d928..0c0fb6473 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -269,33 +269,6 @@ bool nontrivial (const std::string& input)
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Return the length, in characters, of the input, subtracting color control
-// codes.
-int strippedLength (const std::string& input)
-{
-  int length = input.length ();
-  bool inside = false;
-  int count = 0;
-  for (int i = 0; i < length; ++i)
-  {
-    if (inside)
-    {
-      if (input[i] == 'm')
-        inside = false;
-    }
-    else
-    {
-      if (input[i] == 033)
-        inside = true;
-      else
-        ++count;
-    }
-  }
-
-  return count;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 const char* optionalBlankLine ()
 {
diff --git a/src/util.h b/src/util.h
index d1257ea5d..a1b038ec5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -61,7 +61,6 @@ const std::vector <std::string> extractParents (
 #endif
 
 bool nontrivial (const std::string&);
-int strippedLength (const std::string&);
 const char* optionalBlankLine ();
 void setHeaderUnderline (Table&);
 

From 9295fa49e4c1eb934275e550bcbc35a7eeab636f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:03:09 -0400
Subject: [PATCH 503/879] libshared: Updated to
 f1a3cd6bfabfb083fe3c26f580a15c0d60a92ee9

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 9a05fb504..f1a3cd6bf 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 9a05fb5040008aa5f2c95e7ad060aa249367fe92
+Subproject commit f1a3cd6bfabfb083fe3c26f580a15c0d60a92ee9

From 315c455314c3d54bcefb8792d639184e3810b67b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:03:38 -0400
Subject: [PATCH 504/879] CmdSummary: Set no-wrap for progress bar column

---
 src/commands/CmdSummary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index e11efec84..617813b3f 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -137,7 +137,7 @@ int CmdSummary::execute (std::string& output)
   view.add (STRING_CMD_SUMMARY_REMAINING, false);
   view.add (STRING_CMD_SUMMARY_AVG_AGE,   false);
   view.add (STRING_CMD_SUMMARY_COMPLETE,  false);
-  view.add ("0%                        100%");
+  view.add ("0%                        100%", true, false);
   setHeaderUnderline (view);
 
   Color bar_color;

From f640dbb34e3ce9d49bd3818d44e5cc5fc06f434d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:04:23 -0400
Subject: [PATCH 505/879] CmdHistory: Formatting

---
 src/commands/CmdHistory.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 8a3977f5e..b95f6c907 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -62,13 +62,13 @@ class AnnualHistoryStrategy;
 class AnnualGHistoryStrategy;
 
 // typedef the templates to nice names to be used outside this class
-typedef CmdHistoryBase<DailyHistoryStrategy> CmdHistoryDaily;
-typedef CmdHistoryBase<DailyGHistoryStrategy> CmdGHistoryDaily;
-typedef CmdHistoryBase<WeeklyHistoryStrategy> CmdHistoryWeekly;
-typedef CmdHistoryBase<WeeklyGHistoryStrategy> CmdGHistoryWeekly;
-typedef CmdHistoryBase<MonthlyHistoryStrategy> CmdHistoryMonthly;
+typedef CmdHistoryBase<DailyHistoryStrategy>    CmdHistoryDaily;
+typedef CmdHistoryBase<DailyGHistoryStrategy>   CmdGHistoryDaily;
+typedef CmdHistoryBase<WeeklyHistoryStrategy>   CmdHistoryWeekly;
+typedef CmdHistoryBase<WeeklyGHistoryStrategy>  CmdGHistoryWeekly;
+typedef CmdHistoryBase<MonthlyHistoryStrategy>  CmdHistoryMonthly;
 typedef CmdHistoryBase<MonthlyGHistoryStrategy> CmdGHistoryMonthly;
-typedef CmdHistoryBase<AnnualHistoryStrategy> CmdHistoryAnnual;
-typedef CmdHistoryBase<AnnualGHistoryStrategy> CmdGHistoryAnnual;
+typedef CmdHistoryBase<AnnualHistoryStrategy>   CmdHistoryAnnual;
+typedef CmdHistoryBase<AnnualGHistoryStrategy>  CmdGHistoryAnnual;
 
 #endif

From 2929c46d684b2422228b397ced4adda88258850f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:05:14 -0400
Subject: [PATCH 506/879] CmdHistory: Formatting

---
 src/commands/CmdHistory.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index f0f9b7a2c..bfc5ea3bd 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -146,7 +146,6 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
         }
 
         bar += std::string (leftOffset - aBar.length (), ' ');
-
         bar += color_add.colorize    (aBar);
         bar += color_done.colorize   (cBar);
         bar += color_delete.colorize (dBar);
@@ -322,9 +321,7 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if (y != last_y)
-    {
       view.set (row, 0, y);
-    }
 
     view.set (row, 1, Datetime::monthName (m));
   }
@@ -425,9 +422,7 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if (y != last_y)
-    {
       view.set (row, 0, y);
-    }
 
     view.set (row, 1, Datetime::monthName (m));
   }
@@ -468,9 +463,7 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if (y != last_y)
-    {
       view.set (row, 0, y);
-    }
   }
 
   static constexpr const char* keyword         = "ghistory.annual";
@@ -509,9 +502,7 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if (y != last_y)
-    {
       view.set (row, 0, y);
-    }
   }
 
   static constexpr const char* keyword         = "history.annual";
@@ -553,14 +544,10 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if ((y != last_y) || (lastTime == 0))
-    {
       view.set (row, 0, y);
-    }
 
     if ((m != last_m) || (lastTime == 0))
-    {
       view.set (row, 1, Datetime::monthName (m));
-    }
 
     view.set (row, 2, d);
   }
@@ -603,14 +590,10 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if ((y != last_y) || (lastTime == 0))
-    {
       view.set (row, 0, y);
-    }
 
     if ((m != last_m) || (lastTime == 0))
-    {
       view.set (row, 1, Datetime::monthName (m));
-    }
 
     view.set (row, 2, d);
   }
@@ -653,14 +636,10 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if ((y != last_y) || (lastTime == 0))
-    {
       view.set (row, 0, y);
-    }
 
     if ((m != last_m) || (lastTime == 0))
-    {
       view.set (row, 1, Datetime::monthName (m));
-    }
 
     view.set (row, 2, d);
   }
@@ -703,14 +682,10 @@ public:
     last_dt.toYMD (last_y, last_m, last_d);
 
     if ((y != last_y) || (lastTime == 0))
-    {
       view.set (row, 0, y);
-    }
 
     if ((m != last_m) || (lastTime == 0))
-    {
       view.set (row, 1, Datetime::monthName (m));
-    }
 
     view.set (row, 2, d);
   }

From 3b9720966353a8a8d89b8e109ba0d79daddb97bb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:05:56 -0400
Subject: [PATCH 507/879] CmdHistory: Removed table header coloring which is
 handled elsewhere

---
 src/commands/CmdHistory.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index bfc5ea3bd..aade1a234 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -65,8 +65,6 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
   // Now build the view.
   Table view;
   setHeaderUnderline (view);
-  if (context.config.getBoolean ("color"))
-    view.forceColor ();
   view.width (context.getWidth ());
 
   HistoryStrategy::setupTableDates (view);
@@ -78,8 +76,6 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
   Color color_delete (context.config.get ("color.history.delete"));
   Color label        (context.config.get ("color.label"));
 
-  view.colorHeader (label);
-
   // Determine the longest line, and the longest "added" line.
   auto maxAddedLine = 0;
   auto maxRemovedLine = 0;
@@ -197,8 +193,6 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
 {
   Table view;
   setHeaderUnderline (view);
-  if (context.config.getBoolean ("color"))
-    view.forceColor ();
   view.width (context.getWidth ());
 
   HistoryStrategy::setupTableDates (view);
@@ -208,12 +202,6 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
   view.add (STRING_CMD_HISTORY_DEL,   false);
   view.add (STRING_CMD_HISTORY_NET,   false);
 
-  if (context.color ())
-  {
-    Color label (context.config.get ("color.label"));
-    view.colorHeader (label);
-  }
-
   auto totalAdded     = 0;
   auto totalCompleted = 0;
   auto totalDeleted   = 0;

From 203ee9f1c237ec09ad0c2485ff64eb19f795c2c4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:06:29 -0400
Subject: [PATCH 508/879] CmdHistory: Set no-wrap for ghistory output

---
 src/commands/CmdHistory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index aade1a234..55cb7139a 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -69,7 +69,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 
   HistoryStrategy::setupTableDates (view);
 
-  view.add (STRING_CMD_GHISTORY_NUMBER); // Fixed.
+  view.add (STRING_CMD_GHISTORY_NUMBER, true, false); // Fixed.
 
   Color color_add    (context.config.get ("color.history.add"));
   Color color_done   (context.config.get ("color.history.done"));

From 0b4fa9472dd2018352825658df8e63d3877c5960 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:10:18 -0400
Subject: [PATCH 509/879] Tests: Fixed spaing issue in history test

---
 test/history.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/history.t b/test/history.t
index bcb05918e..566787f22 100755
--- a/test/history.t
+++ b/test/history.t
@@ -131,7 +131,7 @@ class TestHistoryMonthly(TestCase):
         self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.monthly")
-        self.assertRegexpMatches(out, "2015 January\s+\++X+\s")
+        self.assertRegexpMatches(out, "2015\s+January\s+\++X+\s")
         self.assertRegexpMatches(out, "\s+February\s+\++X+\-+")
 
 

From 7490663d9e1cf9296f9937bc4f8610a910b5d8c7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:51:22 -0400
Subject: [PATCH 510/879] CmdHistory: Fixed bug where all strategies were
 rendered in the wrong width

---
 src/commands/CmdHistory.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 55cb7139a..f326488d8 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -60,7 +60,7 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 {
-  auto widthOfBar = context.getWidth () - 15;   // 15 == strlen ("2008 September ")
+  auto widthOfBar = context.getWidth () - HistoryStrategy::labelWidth;
 
   // Now build the view.
   Table view;
@@ -319,6 +319,7 @@ public:
   static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_M;
   static constexpr unsigned int dateFieldCount = 2;
   static constexpr bool graphical              = false;
+  static constexpr unsigned int labelWidth     = 0;  // unused.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -420,6 +421,7 @@ public:
   static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_M;
   static constexpr unsigned int dateFieldCount = 2;
   static constexpr bool graphical              = true;
+  static constexpr unsigned int labelWidth     = 15;  // length '2017 September ' = 15
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -459,6 +461,7 @@ public:
   static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_A;
   static constexpr unsigned int dateFieldCount = 1;
   static constexpr bool graphical              = true;
+  static constexpr unsigned int labelWidth     = 5;  // length '2017 ' = 5
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -498,6 +501,7 @@ public:
   static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_A;
   static constexpr unsigned int dateFieldCount = 1;
   static constexpr bool graphical              = false;
+  static constexpr unsigned int labelWidth     = 0;  // unused.
 };
 
 
@@ -545,6 +549,7 @@ public:
   static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_D;
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = false;
+  static constexpr unsigned int labelWidth     = 0;  // unused.
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -591,6 +596,7 @@ public:
   static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_D;
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = true;
+  static constexpr unsigned int labelWidth     = 19;  // length '2017 September Day ' = 19
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -637,6 +643,7 @@ public:
   static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_W;
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = false;
+  static constexpr unsigned int labelWidth     = 0;  // unused.
 };
 
 ////////////////////////////////////////////////////////////////////////////i
@@ -683,6 +690,7 @@ public:
   static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_W;
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = true;
+  static constexpr unsigned int labelWidth     = 19;  // length '2017 September Day ' = 19
 };
 
 

From fdc37c037f603bd09464192106a8fbfaf52d5d93 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:51:41 -0400
Subject: [PATCH 511/879] CmdHistory: Formatting

---
 src/commands/CmdHistory.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index f326488d8..8a09ce474 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -58,7 +58,7 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 
 ////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
-void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
+void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
 {
   auto widthOfBar = context.getWidth () - HistoryStrategy::labelWidth;
 
@@ -189,7 +189,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
 
 ////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
-void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
+void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
 {
   Table view;
   setHeaderUnderline (view);
@@ -283,7 +283,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
 class MonthlyHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfMonth ();
   }
@@ -385,7 +385,7 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
 class MonthlyGHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfMonth ();
   }
@@ -428,7 +428,7 @@ public:
 class AnnualGHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfYear ();
   }
@@ -468,7 +468,7 @@ public:
 class AnnualHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfYear ();
   }
@@ -509,7 +509,7 @@ public:
 class DailyHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfDay ();
   }
@@ -556,7 +556,7 @@ public:
 class DailyGHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfDay ();
   }
@@ -603,7 +603,7 @@ public:
 class WeeklyHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfWeek ();
   }
@@ -650,7 +650,7 @@ public:
 class WeeklyGHistoryStrategy
 {
 public:
-  static Datetime getRelevantDate (const Datetime & dt)
+  static Datetime getRelevantDate (const Datetime& dt)
   {
     return dt.startOfWeek ();
   }

From 1bb34cb165d26a97e0849bd1258746546e6ca6ff Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:52:43 -0400
Subject: [PATCH 512/879] Tests: Fixed bad duplicate class/method name

---
 test/history.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/history.t b/test/history.t
index 566787f22..5e3a403bf 100755
--- a/test/history.t
+++ b/test/history.t
@@ -67,7 +67,7 @@ class TestHistoryDaily(TestCase):
         self.assertRegexpMatches(out, "2015 January  2\s+\++X+\s")
         self.assertRegexpMatches(out, "\s+February 2\s+\++X+\-+")
 
-class TestHistoryDaily(TestCase):
+class TestHistoryWeekly(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
@@ -85,7 +85,7 @@ class TestHistoryDaily(TestCase):
 ]"""
         self.t("import -", input=self.data)
 
-    def test_history_daily(self):
+    def test_history_weekly(self):
         """Verify 'history.weekly' correctly categorizes data"""
         code, out, err = self.t("history.weekly")
         self.assertRegexpMatches(out, "7\s+1\s+0\s+6")

From 0d6fee4053ce94f8c164a1bcfa06f0b5d5913e3e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 01:53:05 -0400
Subject: [PATCH 513/879] Tests: Fixed bad regexes

---
 test/history.t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/history.t b/test/history.t
index 5e3a403bf..ed5d72d49 100755
--- a/test/history.t
+++ b/test/history.t
@@ -64,8 +64,8 @@ class TestHistoryDaily(TestCase):
         self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.daily")
-        self.assertRegexpMatches(out, "2015 January  2\s+\++X+\s")
-        self.assertRegexpMatches(out, "\s+February 2\s+\++X+\-+")
+        self.assertRegexpMatches(out, "2015\s+January\s+1\s+\++X+\s")
+        self.assertRegexpMatches(out, "\s+February\s+1\s+\++X+\-+")
 
 class TestHistoryWeekly(TestCase):
     def setUp(self):
@@ -97,8 +97,8 @@ class TestHistoryWeekly(TestCase):
         self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.weekly")
-        self.assertRegexpMatches(out, "2014 December 28\s+\++X+\s")
-        self.assertRegexpMatches(out, "2015 February 1\s+\++X+\-+")
+        self.assertRegexpMatches(out, "2014\s+December\s+28\s+\++X+\s")
+        self.assertRegexpMatches(out, "2015\s+February\s+1\s+\++X+\-+")
 
 
 class TestHistoryMonthly(TestCase):

From 79fc4f2d474aeac1533844d96bb1779e1d336994 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 08:26:49 -0400
Subject: [PATCH 514/879] Tests: Made history tests independent of TZ

---
 test/history.t | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/test/history.t b/test/history.t
index ed5d72d49..329ccb433 100755
--- a/test/history.t
+++ b/test/history.t
@@ -40,15 +40,15 @@ class TestHistoryDaily(TestCase):
         self.t = Task()
 
         self.data = """[
-{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T000000Z","wait":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T000000Z","end":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T120000Z","wait":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z","due":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T120000Z","end":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"}
 ]"""
         self.t("import -", input=self.data)
 
@@ -64,8 +64,8 @@ class TestHistoryDaily(TestCase):
         self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.daily")
-        self.assertRegexpMatches(out, "2015\s+January\s+1\s+\++X+\s")
-        self.assertRegexpMatches(out, "\s+February\s+1\s+\++X+\-+")
+        self.assertRegexpMatches(out, "2015\s+January\s+2\s+\++X+\s")
+        self.assertRegexpMatches(out, "\s+February\s+2\s+\++X+\-+")
 
 class TestHistoryWeekly(TestCase):
     def setUp(self):
@@ -73,15 +73,15 @@ class TestHistoryWeekly(TestCase):
         self.t = Task()
 
         self.data = """[
-{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T000000Z","wait":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T000000Z","end":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T120000Z","wait":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z","due":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T120000Z","end":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"}
 ]"""
         self.t("import -", input=self.data)
 
@@ -107,15 +107,15 @@ class TestHistoryMonthly(TestCase):
         self.t = Task()
 
         self.data = """[
-{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T000000Z","wait":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T000000Z","end":"20150102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20150102T120000Z","wait":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z","due":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20150102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20150102T120000Z","end":"20150102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"}
 ]"""
         self.t("import -", input=self.data)
 
@@ -145,15 +145,15 @@ class TestHistoryAnnual(TestCase):
         self.t = Task()
 
         self.data = """[
-{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20140102T000000Z","wait":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20140102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20140102T000000Z","end":"20150202T000000Z","due":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20140102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20140102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20140102T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20140102T000000Z","end":"20140102T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"},
-{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T000000Z","end":"20150202T000000Z"}
+{"uuid":"00000000-0000-0000-0000-000000000000","description":"PLW","status":"pending","entry":"20140102T120000Z","wait":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000001","description":"PL","status":"pending","entry":"20140102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000002","description":"DLN","status":"deleted","entry":"20140102T120000Z","end":"20150202T120000Z","due":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000003","description":"DLN2","status":"deleted","entry":"20140102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000004","description":"DNN","status":"deleted","entry":"20140102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000005","description":"CLN","status":"completed","entry":"20140102T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000006","description":"CLL","status":"completed","entry":"20140102T120000Z","end":"20140102T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000007","description":"CNN","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"},
+{"uuid":"00000000-0000-0000-0000-000000000008","description":"CNN2","status":"completed","entry":"20150202T120000Z","end":"20150202T120000Z"}
 ]"""
         self.t("import -", input=self.data)
 

From 45dda0c9fdcf9c74385d56eafe054d53214b3bc9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 22:47:16 -0400
Subject: [PATCH 515/879] Tests: Added READY tests

---
 test/tag.t | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/tag.t b/test/tag.t
index 98b0db853..0252cac89 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -91,6 +91,8 @@ class TestVirtualTags(TestCase):
         cls.t("add blocked depends:2")
         cls.t("add due_eom due:eom")
         cls.t("add due_eow due:eow")
+        cls.t("add is_recurring due:eonm recur:weekly")
+        cls.t("add is_scheduled scheduled:eonm")
 
     def setUp(self):
         """Executed before each test in the class"""
@@ -359,6 +361,14 @@ class TestVirtualTags(TestCase):
         self.assertIn("nonag", out)
         self.assertIn("tag", out)
 
+    def test_virtual_tag_READY(self):
+        """Verify 'READY' appears when expected"""
+        code, out, err = self.t("+READY all")
+        self.assertNotIn("is_scheduled", out)
+
+        code, out, err = self.t("-READY all")
+        self.assertIn("is_scheduled", out)
+
 
 class TestVirtualTagUDA(TestCase):
     def setUp(self):

From 91b45925e943c9e5c036d52eded8fc41adfaf5d3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 22:47:40 -0400
Subject: [PATCH 516/879] Tests: Added SCHEDULED tests

---
 test/tag.t | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/tag.t b/test/tag.t
index 0252cac89..c27c1d2a5 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -369,6 +369,14 @@ class TestVirtualTags(TestCase):
         code, out, err = self.t("-READY all")
         self.assertIn("is_scheduled", out)
 
+    def test_virtual_tag_SCHEDULED(self):
+        """Verify 'SCHEDULED' appears when expected"""
+        code, out, err = self.t("+SCHEDULED all")
+        self.assertIn("is_scheduled", out)
+
+        code, out, err = self.t("-SCHEDULED all")
+        self.assertNotIn("is_scheduled", out)
+
 
 class TestVirtualTagUDA(TestCase):
     def setUp(self):

From 9078ce597655cfbe3988e0ea206d47623de4d953 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 22:48:58 -0400
Subject: [PATCH 517/879] Tests: Added UNTIL tests

---
 test/tag.t | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/tag.t b/test/tag.t
index c27c1d2a5..fa3c13c9c 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -377,6 +377,14 @@ class TestVirtualTags(TestCase):
         code, out, err = self.t("-SCHEDULED all")
         self.assertNotIn("is_scheduled", out)
 
+    def test_virtual_tag_UNTIL(self):
+        """Verify 'UNTIL' appears when expected"""
+        self.t("add has_until until:eonm")
+        code, out, err = self.t("+UNTIL all")
+        self.assertIn("has_until", out)
+
+        code, out, err = self.t("-UNTIL all")
+        self.assertNotIn("has_until", out)
 
 class TestVirtualTagUDA(TestCase):
     def setUp(self):

From 71ca9e8c4c068f838fa3daa5b2ce71ce02594f2e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 22:49:07 -0400
Subject: [PATCH 518/879] Tests: Added WAITING tests

---
 test/tag.t | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/tag.t b/test/tag.t
index fa3c13c9c..231702d54 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -386,6 +386,15 @@ class TestVirtualTags(TestCase):
         code, out, err = self.t("-UNTIL all")
         self.assertNotIn("has_until", out)
 
+    def test_virtual_tag_WAITING(self):
+        """Verify 'WAITING' appears when expected"""
+        self.t("add is_waiting wait:eonm")
+        code, out, err = self.t("+WAITING all")
+        self.assertIn("is_waiting", out)
+
+        code, out, err = self.t("-WAITING all")
+        self.assertNotIn("is_waiting", out)
+
 class TestVirtualTagUDA(TestCase):
     def setUp(self):
         """Executed before each test in the class"""

From 5a1b069b73baa037fa48d2b2a4677440e8b418cf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Mar 2017 22:49:50 -0400
Subject: [PATCH 519/879] CmdHistory: Corrected date label justification

---
 src/commands/CmdHistory.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 8a09ce474..455cad6a6 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -290,8 +290,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
   }
 
   static void insertRowDate (
@@ -392,8 +392,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
   }
 
   static void insertRowDate (
@@ -435,7 +435,7 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR, false);
+    view.add (STRING_CMD_HISTORY_YEAR, true);
   }
 
   static void insertRowDate (
@@ -475,7 +475,7 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR, false);
+    view.add (STRING_CMD_HISTORY_YEAR, true);
   }
 
   static void insertRowDate (
@@ -516,8 +516,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
     view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
@@ -563,8 +563,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
     view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
@@ -610,8 +610,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
     view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 
@@ -657,8 +657,8 @@ public:
 
   static void setupTableDates (Table& view)
   {
-    view.add (STRING_CMD_HISTORY_YEAR,  false);
-    view.add (STRING_CMD_HISTORY_MONTH, false);
+    view.add (STRING_CMD_HISTORY_YEAR,  true);
+    view.add (STRING_CMD_HISTORY_MONTH, true);
     view.add (STRING_CMD_HISTORY_DAY,   false);
   }
 

From 66e3dc8218cb8b28a8745ce8023661c078e8d3dd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 30 Mar 2017 23:21:14 -0400
Subject: [PATCH 520/879] TW-1903: grammar error -- There are 1 local changes.

- Thanks to Eric Hymowitz.
---
 ChangeLog          | 2 ++
 src/feedback.cpp   | 3 ++-
 src/l10n/deu-DEU.h | 1 +
 src/l10n/eng-USA.h | 3 ++-
 src/l10n/epo-RUS.h | 1 +
 src/l10n/esp-ESP.h | 1 +
 src/l10n/fra-FRA.h | 1 +
 src/l10n/ita-ITA.h | 3 ++-
 src/l10n/jpn-JPN.h | 3 ++-
 src/l10n/pol-POL.h | 1 +
 src/l10n/por-PRT.h | 1 +
 11 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb2522afe..c5061b6ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@
           (thanks to Onion).
 - TW-1885 Task Sync does not send TLS SNI headers
           (thanks to Dan Callahan).
+- TW-1903 grammar error -- There are 1 local changes.
+          (thanks to Eric Hymowitz).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 2c5cc67e3..4e57b251a 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -420,7 +420,8 @@ void feedback_backlog ()
         ++count;
 
     if (count)
-      context.footnote (format (STRING_FEEDBACK_BACKLOG, count));
+      context.footnote (format (count > 1 ? STRING_FEEDBACK_BACKLOG_N
+                                          : STRING_FEEDBACK_BACKLOG, count));
   }
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d31b1ecb0..dfb61b513 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -742,6 +742,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Aufgabe {1} '{2}' entsperrt."
 #define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
+#define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 #define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 
 // helpers
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6e7db41a8..0ee834d9f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -740,7 +740,8 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4a362468f..c6334020d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -742,6 +742,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Malblokis {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
+#define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 #define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 
 // helpers
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index d13e2cb9f..dc5efe9b5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -754,6 +754,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas."
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
+#define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
 #define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
 
 // helpers
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 19e794611..577ea0da1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -744,6 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
+#define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
 #define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
 
 // helpers
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f3febb5fe..5a0081985 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -743,7 +743,8 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Sbloccato {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
-#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 87c066869..37df07dc1 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -744,7 +744,8 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG      "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
 // helpers
 #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f3f61d924..31ecea0fd 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -744,6 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Odblokowane {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
+#define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 #define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 
 // helpers
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 3127e340e..0f8088983 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -744,6 +744,7 @@
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
 #define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
+#define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
 #define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
 
 // helpers

From d81fb1d17f20255070949eab10f27f8fd6d4b606 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 31 Mar 2017 08:34:25 -0400
Subject: [PATCH 521/879] Recurrence: Relocate nag function out of the way

---
 src/CMakeLists.txt |  1 +
 src/main.h         |  2 ++
 src/nag.cpp        | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 src/recur.cpp      | 33 -----------------------
 4 files changed, 68 insertions(+), 33 deletions(-)
 create mode 100644 src/nag.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27ab3587c..382a19502 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ add_library (task CLI2.cpp CLI2.h
                   feedback.cpp
                   i18n.h
                   legacy.cpp
+                  nag.cpp
                   recur.cpp
                   rules.cpp
                   sort.cpp
diff --git a/src/main.h b/src/main.h
index a48380814..650aef1b8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,6 +41,8 @@ void handleRecurrence ();
 Datetime getNextRecurrence (Datetime&, std::string&);
 bool generateDueDates (Task&, std::vector <Datetime>&);
 void updateRecurrenceMask (Task&);
+
+// nag.cpp
 bool nag (Task&);
 
 // rules.cpp
diff --git a/src/nag.cpp b/src/nag.cpp
new file mode 100644
index 000000000..2a5bc0faf
--- /dev/null
+++ b/src/nag.cpp
@@ -0,0 +1,65 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2006 - 2017, 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
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <Context.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+// Returns a Boolean indicator as to whether a nag message was generated, so
+// that commands can control the number of nag messages displayed (ie one is
+// enough).
+//
+// Otherwise generates a nag message, if one is defined, if there are tasks of
+// higher urgency.
+bool nag (Task& task)
+{
+  // Special tag overrides nagging.
+  if (task.hasTag ("nonag"))
+    return false;
+
+  auto msg = context.config.get ("nag");
+  if (msg != "")
+  {
+    // Scan all pending, non-recurring tasks.
+    auto pending = context.tdb2.pending.get_tasks ();
+    for (auto& t : pending)
+    {
+      if ((t.getStatus () == Task::pending ||
+           t.getStatus () == Task::waiting) &&
+          t.urgency () > task.urgency ())
+      {
+        context.footnote (msg);
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/recur.cpp b/src/recur.cpp
index 989cd1467..427d51a48 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -413,36 +413,3 @@ void updateRecurrenceMask (Task& task)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Returns a Boolean indicator as to whether a nag message was generated, so
-// that commands can control the number of nag messages displayed (ie one is
-// enough).
-//
-// Otherwise generates a nag message, if one is defined, if there are tasks of
-// higher urgency.
-bool nag (Task& task)
-{
-  // Special tag overrides nagging.
-  if (task.hasTag ("nonag"))
-    return false;
-
-  auto nagMessage = context.config.get ("nag");
-  if (nagMessage != "")
-  {
-    // Scan all pending, non-recurring tasks.
-    auto pending = context.tdb2.pending.get_tasks ();
-    for (auto& t : pending)
-    {
-      if ((t.getStatus () == Task::pending ||
-           t.getStatus () == Task::waiting) &&
-          t.urgency () > task.urgency ())
-      {
-        context.footnote (nagMessage);
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////

From be594918a99c766d98a3d335af4135b95f0beabf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 1 Apr 2017 23:34:06 -0400
Subject: [PATCH 522/879] libshared: Updated URL

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 919cbabcb..675b3d498 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/libshared"]
 	path = src/libshared
-	url = https://git.tasktools.org/scm/tm/libshared.git
+	url = https://git.tasktools.org/TM/libshared.git

From d6930e89eff2afd80bb3552e526864c140154bdf Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 3 Apr 2017 01:46:22 +0200
Subject: [PATCH 523/879] LICENSE: Use https link instead of http

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index c2b94e5eb..abeb9948c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -20,4 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-http://www.opensource.org/licenses/mit-license.php
+https://www.opensource.org/licenses/mit-license.php

From 5e52acf63ac6edf1f8e3552cf7a625808a695b14 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tbabej@noreply.example.org>
Date: Mon, 3 Apr 2017 00:25:06 +0000
Subject: [PATCH 524/879] INSTALL: Use https link for cmake.org

---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index dd70e9fa9..75a222eb8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,7 @@ Dependencies
 ------------
 
 You will need the CMake build system installed in order to build Taskwarrior
-from source. More information on CMake can be obtained at http://cmake.org
+from source. More information on CMake can be obtained at https://cmake.org
 
 You will also need:
   - make

From a1bdb8f99d536ea0377639f5d2062a412ac7b1f8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 9 Apr 2017 16:47:54 -0400
Subject: [PATCH 525/879] Docs: Updated platform list

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e48504186..76c7e5bf9 100644
--- a/NEWS
+++ b/NEWS
@@ -55,7 +55,7 @@ Known Issues
 
 Taskwarrior has been built and tested on the following configurations:
 
-  * OS X
+  * macOS
   * Fedora
   * Ubuntu
   * Debian

From ac392561c197de38362cb9708f0320ae147b4e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
Date: Mon, 10 Apr 2017 02:33:57 +0200
Subject: [PATCH 526/879] Docs: Typo fix in task.1.in

---
 doc/man/task.1.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 387d7bc77..efad089c8 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -642,7 +642,7 @@ from tasks, or the system.  Supported DOM references are:
   context.args       (Deprecated in 2.6.0)
   context.width      (Deprecated in 2.6.0)
   context.height     (Deprecated in 2.6.0)
-  system.versio
+  system.version
   system.os
   <id>.<attribute>
   <uuid>.<attribute>

From 4afe912f8470f062a4f5a7a660e9228cc0263d63 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 9 Apr 2017 21:00:44 -0400
Subject: [PATCH 527/879] Docs: Added to AUTHORS file

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index b81271d56..c64bd348a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -138,6 +138,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Flavio Poletti
   Antonio Huete Jimenez
   Lukas Barth
+  Øyvind A. Holm
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:

From ee3e8c46dcf226705f1b8c3eb5df49c405337d66 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 28 Apr 2017 12:42:19 -0400
Subject: [PATCH 528/879] DOM: Stubbed DOM tree

---
 src/DOM.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/DOM.h   | 17 +++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 8fd8c7274..06f770e53 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -435,3 +435,72 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// DOM Class
+//
+// References are paths into a tree structure. For example:
+//
+//   1.due.month.number
+//   1.due.day.number
+//
+// Are represented internally as:
+//
+//   1
+//   +- due
+//     +- day
+//     | +- number
+//     +- month
+//       +- number
+//
+// The tree is augmented by other elements:
+//
+//   1
+//   +- due
+//   | +- day
+//   | | +- number
+//   | +- month
+//   |   +- number
+//   +- system
+//      +- os
+//
+// Each node in the tree has a name ("due", "system", "day"), and each node may
+// have a data source attached to it.
+//
+// The DOM class is independent of the project, in that it knows nothing about
+// the internal data or program structure. It knows only that certain DOM path
+// elements have handlers which will provide the data.
+//
+// The DOM class is therefore responsible for maintaining a tree of named nodes
+// with associated proividers. When a reference value is requested, the DOM
+// class will decompose the reference path, and navigate the tree to the lowest
+// level provider, and call it.
+//
+// This makes the DOM class a reusible object.
+
+////////////////////////////////////////////////////////////////////////////////
+bool DOM::valid (const std::string& reference) const
+{
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Variant DOM::get (const std::string& reference) const
+{
+  Variant v ("");
+
+  // Find the provider.
+  // TODO Start at the root of the tree.
+  for (const auto& element : decomposeReference (reference))
+  {
+    // TODO If tree contains a named node 'element', capture the provider, if any.
+  }
+
+  return v;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::vector <std::string> DOM::decomposeReference (const std::string& reference) const
+{
+  return split (reference, '.');
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/DOM.h b/src/DOM.h
index f1cdef7a6..2f6d0704e 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -28,10 +28,27 @@
 #define INCLUDED_DOM
 
 #include <string>
+#include <Tree.h>
 #include <Variant.h>
 #include <Task.h>
 
+// 2017-04-22 Deprecated.
 bool getDOM (const std::string&, Variant&);
 bool getDOM (const std::string&, const Task&, Variant&);
 
+// DOM Tree
+class DOM;
+
+class DOM
+{
+public:
+  void addSource (const std::string&, bool (*)(const std::string&, Variant&));
+  bool valid (const std::string&) const;
+  Variant get (const Task&, const std::string&) const;
+  Variant get (const std::string&) const;
+
+private:
+  std::vector <std::string> decomposeReference (const std::string&) const;
+};
+
 #endif

From f6566838f6a6c3a28cbef427be7b818612d16214 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 10:54:39 -0400
Subject: [PATCH 529/879] DOM: Added framework

---
 src/DOM.cpp | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/DOM.h   | 15 ++++++---
 2 files changed, 103 insertions(+), 5 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 06f770e53..078e00ff1 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -476,9 +476,18 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 //
 // This makes the DOM class a reusible object.
 
+////////////////////////////////////////////////////////////////////////////////
+void DOM::addSource (
+  const std::string&,
+  bool (*provider)(const std::string&, Variant&))
+{
+  // TODO Implement.
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 bool DOM::valid (const std::string& reference) const
 {
+  // TODO Implement.
   return false;
 }
 
@@ -504,3 +513,87 @@ std::vector <std::string> DOM::decomposeReference (const std::string& reference)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+int DOM::count () const
+{
+  // This branch.
+  int total = 1;
+
+  // Recurse and count the branches.
+  for (auto& i : _branches)
+    total += i->count ();
+
+  return total;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::shared_ptr <DOM> DOM::find (const std::string& path)
+{
+  std::vector <std::string> elements = split (path, '.');
+
+  // Must start at the trunk.
+  auto cursor = std::make_shared <DOM> (*this);
+  auto it = elements.begin ();
+  if (cursor->_name != *it)
+    return nullptr;
+
+  // Perhaps the trunk is what is needed?
+  if (elements.size () == 1)
+    return cursor;
+
+  // Now look for the next branch.
+  for (++it; it != elements.end (); ++it)
+  {
+    bool found = false;
+
+    // If the cursor has a branch that matches *it, proceed.
+    for (auto i = cursor->_branches.begin (); i != cursor->_branches.end (); ++i)
+    {
+      if ((*i)->_name == *it)
+      {
+        cursor = *i;
+        found = true;
+        break;
+      }
+    }
+
+    if (! found)
+      return nullptr;
+  }
+
+  return cursor;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string DOM::dumpNode (
+  const std::shared_ptr <DOM> t,
+  int depth) const
+{
+  std::stringstream out;
+
+  // Dump node
+  for (int i = 0; i < depth; ++i)
+    out << "  ";
+
+  out
+      // Useful for debugging tree node new/delete errors.
+      // << std::hex << t << " "
+      << "\033[1m" << t->_name << "\033[0m\n";
+
+  // Recurse for branches.
+  for (auto& b : t->_branches)
+    out << dumpNode (b, depth + 1);
+
+  return out.str ();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string DOM::dump () const
+{
+  std::stringstream out;
+  out << "DOM (" << count () << " nodes)\n"
+      << dumpNode (std::make_shared <DOM> (*this), 1);
+
+  return out.str ();
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/DOM.h b/src/DOM.h
index 2f6d0704e..64a9cb403 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -28,17 +28,13 @@
 #define INCLUDED_DOM
 
 #include <string>
-#include <Tree.h>
 #include <Variant.h>
 #include <Task.h>
 
-// 2017-04-22 Deprecated.
+// 2017-04-22 Deprecated, use DOM::get.
 bool getDOM (const std::string&, Variant&);
 bool getDOM (const std::string&, const Task&, Variant&);
 
-// DOM Tree
-class DOM;
-
 class DOM
 {
 public:
@@ -46,9 +42,18 @@ public:
   bool valid (const std::string&) const;
   Variant get (const Task&, const std::string&) const;
   Variant get (const std::string&) const;
+  int count () const;
+  std::shared_ptr <DOM> find (const std::string&);
+  std::string dump () const;
 
 private:
   std::vector <std::string> decomposeReference (const std::string&) const;
+  std::string dumpNode (const std::shared_ptr <DOM>, int) const;
+
+private:
+  std::string                                              _name     {"Unknown"};
+  std::shared_ptr <bool (*)(const std::string&, Variant&)> _provider {nullptr};
+  std::vector <std::shared_ptr <DOM>>                      _branches {};
 };
 
 #endif

From ba372e106fa72879eed5dcb0dad6b236b14de9a2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 10:56:22 -0400
Subject: [PATCH 530/879] Tests: Renamed dom.t to make way for new DOM object
 tests

---
 test/{dom.t => dom2.t} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{dom.t => dom2.t} (100%)

diff --git a/test/dom.t b/test/dom2.t
similarity index 100%
rename from test/dom.t
rename to test/dom2.t

From d5a7769b4fa96cebec7674ac786d9b9b9cf4125d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 11:10:43 -0400
Subject: [PATCH 531/879] Tests: Added first DOM test

---
 test/.gitignore     |  1 +
 test/CMakeLists.txt |  2 +-
 test/dom.t.cpp      | 46 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 test/dom.t.cpp

diff --git a/test/.gitignore b/test/.gitignore
index 2c85bd59d..7593246a7 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,6 +4,7 @@
 *.log
 *.runlog
 col.t
+dom.t
 eval.t
 lexer.t
 t.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0d9bd2a8c..bf361ef77 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS col.t t.t tdb2.t util.t view.t lexer.t eval.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
+set (test_SRCS col.t dom.t eval.t lexer.t t.t tdb2.t util.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t view.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
new file mode 100644
index 000000000..9edaa2291
--- /dev/null
+++ b/test/dom.t.cpp
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2013 - 2017, Göteborg Bit Factory.
+//
+// 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
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <test.h>
+#include <DOM.h>
+#include <Variant.h>
+#include <Context.h>
+
+Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int, char**)
+{
+  UnitTest t (1);
+
+  DOM dom;
+  t.is (dom.count (), 0, "DOM empty count is zero");
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////

From 0ea3215e7a523949509b3b789aa2096d557854a0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 11:10:57 -0400
Subject: [PATCH 532/879] DOM: Fixed ::count bug

---
 src/DOM.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 078e00ff1..e85010ac5 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -515,10 +515,8 @@ std::vector <std::string> DOM::decomposeReference (const std::string& reference)
 ////////////////////////////////////////////////////////////////////////////////
 int DOM::count () const
 {
-  // This branch.
-  int total = 1;
-
   // Recurse and count the branches.
+  int total {0};
   for (auto& i : _branches)
     total += i->count ();
 

From 8bbc35560f75072fc501c33e160357910445b982 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 11:24:08 -0400
Subject: [PATCH 533/879] DOM: New reference tw.version.

---
 ChangeLog         | 3 ++-
 NEWS              | 2 +-
 doc/man/task.1.in | 1 +
 src/DOM.cpp       | 7 +++++++
 src/Lexer.cpp     | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5061b6ad..8c693fcd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,7 +90,8 @@
 - Added 'history.weekly', 'history.daily', 'ghistory.weekly', 'ghistory.daily'
   report variations, with code refactoring.
           (thanks to Lukas Barth).
-- New DOM references: annotations.count, tw.syncneeded.
+- New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
+  tw.width, tw.height, tw.version.
 - The message telling you to sync now indicates how many local changes will be
   synced.
 
diff --git a/NEWS b/NEWS
index 76c7e5bf9..a9339cdb1 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ New Features in Taskwarrior 2.5.2
     command usage.
   - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
   - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
-    tw.width, tw.height.
+    tw.width, tw.height, tw.version.
   - Renovated 'timesheet' command with a more compact report that accepts a
     filter, and has a default filter showing the last four weeks of completed
     and started tasks.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index efad089c8..8c7f521a7 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -638,6 +638,7 @@ from tasks, or the system.  Supported DOM references are:
   tw.args
   tw.width
   tw.height
+  tw.version
   context.program    (Deprecated in 2.6.0)
   context.args       (Deprecated in 2.6.0)
   context.width      (Deprecated in 2.6.0)
diff --git a/src/DOM.cpp b/src/DOM.cpp
index e85010ac5..996555f49 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -53,6 +53,7 @@ extern Context context;
 //   tw.args
 //   tw.width
 //   tw.height
+//   tw.version
 //
 // System:
 //   context.program         // 2017-02-25 Deprecated in 2.6.0
@@ -137,6 +138,12 @@ bool getDOM (const std::string& name, Variant& value)
       return true;
     }
 
+    else if (name == "tw.version")
+    {
+      value = Variant (VERSION);
+      return true;
+    }
+
     return false;
   }
 
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index bce96212c..e7dea9071 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1190,6 +1190,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
                 "tw.args",
                 "tw.width",
                 "tw.height",
+                "tw.version",
                 "context.program",
                 "context.args",
                 "context.width",

From 0742e5fbbd6631534656dc8a22ea1ad6de979e49 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 11:25:12 -0400
Subject: [PATCH 534/879] Tests: Added tw.version DOM test

---
 test/dom2.t | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/dom2.t b/test/dom2.t
index 92f4651fe..aedf4fb49 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -208,6 +208,12 @@ class TestDOM(TestCase):
         self.assertEqual(code, 0)
         self.assertRegexpMatches(out, r"\d+")
 
+    def test_dom_tw_version(self):
+        """ DOM tw.version """
+        code, out, err = self.t("_get tw.version")
+        self.assertEqual(code, 0)
+        self.assertRegexpMatches(out, r"\d\.\d+\.\d+")
+
     def test_dom_context_program(self):
         """ DOM context.program """
         code, out, err = self.t("_get context.program")

From eba68ac2fff1226545d7c84eb203761c95e71cdd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 29 Apr 2017 23:56:03 -0400
Subject: [PATCH 535/879] DOM: Added dtor that delegate to DOM::Node

---
 src/DOM.cpp |  6 ++++++
 src/DOM.h   | 13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index 996555f49..ea335045c 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -483,6 +483,12 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
 //
 // This makes the DOM class a reusible object.
 
+////////////////////////////////////////////////////////////////////////////////
+DOM::~DOM ()
+{
+  delete _node;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void DOM::addSource (
   const std::string&,
diff --git a/src/DOM.h b/src/DOM.h
index 64a9cb403..4d8cc5269 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -38,6 +38,7 @@ bool getDOM (const std::string&, const Task&, Variant&);
 class DOM
 {
 public:
+  ~DOM ();
   void addSource (const std::string&, bool (*)(const std::string&, Variant&));
   bool valid (const std::string&) const;
   Variant get (const Task&, const std::string&) const;
@@ -47,13 +48,15 @@ public:
   std::string dump () const;
 
 private:
-  std::vector <std::string> decomposeReference (const std::string&) const;
-  std::string dumpNode (const std::shared_ptr <DOM>, int) const;
+  class Node
+  {
+  public:
+    ~Node ();
+  };
 
 private:
-  std::string                                              _name     {"Unknown"};
-  std::shared_ptr <bool (*)(const std::string&, Variant&)> _provider {nullptr};
-  std::vector <std::shared_ptr <DOM>>                      _branches {};
+  DOM::Node* _node {nullptr};
 };
 
 #endif
+////////////////////////////////////////////////////////////////////////////////

From 4c53da5be160c9cc3144280e381b493ea7347169 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 30 Apr 2017 00:00:14 -0400
Subject: [PATCH 536/879] DOM: Implemented DOM::Node object

---
 src/DOM.cpp | 163 ++++++++++++++++++++++++++++++++++++----------------
 src/DOM.h   |  16 +++++-
 2 files changed, 128 insertions(+), 51 deletions(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index ea335045c..9eb9d3d03 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -491,17 +491,19 @@ DOM::~DOM ()
 
 ////////////////////////////////////////////////////////////////////////////////
 void DOM::addSource (
-  const std::string&,
+  const std::string& reference,
   bool (*provider)(const std::string&, Variant&))
 {
-  // TODO Implement.
+  if (_node == nullptr)
+    _node = new DOM::Node ();
+
+  _node->addSource (reference, provider);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool DOM::valid (const std::string& reference) const
 {
-  // TODO Implement.
-  return false;
+  return _node && _node->find (reference) != nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -509,100 +511,161 @@ Variant DOM::get (const std::string& reference) const
 {
   Variant v ("");
 
-  // Find the provider.
-  // TODO Start at the root of the tree.
-  for (const auto& element : decomposeReference (reference))
+  if (_node)
   {
-    // TODO If tree contains a named node 'element', capture the provider, if any.
+    auto node = _node->find (reference);
+    if (node            != nullptr &&
+        node->_provider != nullptr)
+    {
+      if (node->_provider (reference, v))
+        return v;
+    }
   }
 
   return v;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector <std::string> DOM::decomposeReference (const std::string& reference) const
+int DOM::count () const
+{
+  if (_node)
+    return _node->count ();
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::vector <std::string> DOM::decomposeReference (const std::string& reference)
 {
   return split (reference, '.');
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int DOM::count () const
+std::string DOM::dump () const
 {
-  // Recurse and count the branches.
-  int total {0};
-  for (auto& i : _branches)
-    total += i->count ();
+  if (_node)
+    return _node->dump ();
 
-  return total;
+  return "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::shared_ptr <DOM> DOM::find (const std::string& path)
+DOM::Node::~Node ()
 {
-  std::vector <std::string> elements = split (path, '.');
+  for (auto& branch : _branches)
+    delete branch;
+}
 
-  // Must start at the trunk.
-  auto cursor = std::make_shared <DOM> (*this);
-  auto it = elements.begin ();
-  if (cursor->_name != *it)
-    return nullptr;
-
-  // Perhaps the trunk is what is needed?
-  if (elements.size () == 1)
-    return cursor;
-
-  // Now look for the next branch.
-  for (++it; it != elements.end (); ++it)
+////////////////////////////////////////////////////////////////////////////////
+void DOM::Node::addSource (
+  const std::string& reference,
+  bool (*provider)(const std::string&, Variant&))
+{
+  auto cursor = this;
+  for (const auto& element : DOM::decomposeReference (reference))
   {
-    bool found = false;
-
-    // If the cursor has a branch that matches *it, proceed.
-    for (auto i = cursor->_branches.begin (); i != cursor->_branches.end (); ++i)
+    auto found {false};
+    for (auto& branch : cursor->_branches)
     {
-      if ((*i)->_name == *it)
+      if (branch->_name == element)
       {
-        cursor = *i;
+        cursor = branch;
         found = true;
         break;
       }
     }
 
     if (! found)
-      return nullptr;
+    {
+      auto branch = new DOM::Node ();
+      branch->_name = element;
+      cursor->_branches.push_back (branch);
+      cursor = branch;
+    }
   }
 
-  return cursor;
+  cursor->_provider = provider;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string DOM::dumpNode (
-  const std::shared_ptr <DOM> t,
+// A valid reference is one that has a provider function.
+bool DOM::Node::valid (const std::string& reference) const
+{
+  return find (reference) != nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const DOM::Node* DOM::Node::find (const std::string& reference) const
+{
+  auto cursor = this;
+  for (const auto& element : DOM::decomposeReference (reference))
+  {
+    auto found {false};
+    for (auto& branch : cursor->_branches)
+    {
+      if (branch->_name == element)
+      {
+        cursor = branch;
+        found = true;
+        break;
+      }
+    }
+
+    if (! found)
+      break;
+  }
+
+  if (reference.length () && cursor != this)
+    return cursor;
+
+  return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int DOM::Node::count () const
+{
+  // Recurse and count the branches.
+  int total {0};
+  for (auto& branch : _branches)
+  {
+    if (branch->_provider)
+      ++total;
+    total += branch->count ();
+  }
+
+  return total;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string DOM::Node::dumpNode (
+  const DOM::Node* node,
   int depth) const
 {
   std::stringstream out;
 
-  // Dump node
-  for (int i = 0; i < depth; ++i)
-    out << "  ";
+  // Indent.
+  out << std::string (depth * 2, ' ');
 
-  out
-      // Useful for debugging tree node new/delete errors.
-      // << std::hex << t << " "
-      << "\033[1m" << t->_name << "\033[0m\n";
+  out << "\033[31m" << node->_name << "\033[0m";
+
+  if (node->_provider)
+    out << " 0x" << std::hex << (long long) (void*) node->_provider;
+
+  out << '\n';
 
   // Recurse for branches.
-  for (auto& b : t->_branches)
+  for (auto& b : node->_branches)
     out << dumpNode (b, depth + 1);
 
   return out.str ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string DOM::dump () const
+std::string DOM::Node::dump () const
 {
   std::stringstream out;
-  out << "DOM (" << count () << " nodes)\n"
-      << dumpNode (std::make_shared <DOM> (*this), 1);
+  out << "DOM::Node (" << count () << " nodes)\n"
+      << dumpNode (this, 1);
 
   return out.str ();
 }
diff --git a/src/DOM.h b/src/DOM.h
index 4d8cc5269..9a4696996 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -41,10 +41,13 @@ public:
   ~DOM ();
   void addSource (const std::string&, bool (*)(const std::string&, Variant&));
   bool valid (const std::string&) const;
+/*
+  // TODO Task object should register a generic provider.
   Variant get (const Task&, const std::string&) const;
+*/
   Variant get (const std::string&) const;
   int count () const;
-  std::shared_ptr <DOM> find (const std::string&);
+  static std::vector <std::string> decomposeReference (const std::string&);
   std::string dump () const;
 
 private:
@@ -52,6 +55,17 @@ private:
   {
   public:
     ~Node ();
+    void addSource (const std::string&, bool (*)(const std::string&, Variant&));
+    bool valid (const std::string&) const;
+    const DOM::Node* find (const std::string&) const;
+    int count () const;
+    std::string dumpNode (const DOM::Node*, int) const;
+    std::string dump () const;
+
+  public:
+    std::string                                  _name     {"Unknown"};
+    bool (*_provider)(const std::string&, Variant&)        {nullptr};
+    std::vector <DOM::Node*>                     _branches {};
   };
 
 private:

From bbd764d249ff8b068089c31ae6987c7d8ca22cce Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 30 Apr 2017 00:00:30 -0400
Subject: [PATCH 537/879] Tests: Added dom tests

---
 test/dom.t.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 9edaa2291..cd2fd5a10 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <iostream> // TODO Remove.
 #include <test.h>
 #include <DOM.h>
 #include <Variant.h>
@@ -32,13 +33,68 @@
 
 Context context;
 
+////////////////////////////////////////////////////////////////////////////////
+bool providerString (const std::string& path, Variant& var)
+{
+  if (path == "name")
+  {
+    var = Variant ("value");
+    return true;
+  }
+  else if (path == "name.next")
+  {
+    var = Variant ("value.next");
+    return true;
+  }
+  else if (path == "foo")
+  {
+    var = Variant ("bar");
+    return true;
+  }
+  else if (path == "name.size")
+  {
+    var = Variant (6);
+    return true;
+  }
+
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (1);
+  UnitTest t (12);
 
   DOM dom;
-  t.is (dom.count (), 0, "DOM empty count is zero");
+  t.is (dom.count (), 0,               "DOM empty count is zero");
+
+  dom.addSource ("name",      &providerString);
+  dom.addSource ("name.next", &providerString);
+  dom.addSource ("name.size", &providerString);
+  dom.addSource ("foo",       &providerString);
+  std::cout << dom.dump () << '\n';
+  t.is (dom.count (), 4,               "DOM now contains 4 nodes");
+
+  t.ok    (dom.valid ("name"),         "DOM 'name' valid");
+  t.ok    (dom.valid ("name.next"),    "DOM 'name.next' valid");
+  t.ok    (dom.valid ("name.size"),    "DOM 'name.size' valid");
+  t.ok    (dom.valid ("foo"),          "DOM 'foo' valid");
+  t.notok (dom.valid ("missing"),      "DOM 'missing' not valid");
+
+  auto v = dom.get ("name");
+  t.is (v.get_string (), "value",      "DOM get 'name' --> 'value'");
+
+  v = dom.get ("name.next");
+  t.is (v.get_string (), "value.next", "DOM get 'name.next' --> 'value.next'");
+
+  v = dom.get ("name.size");
+  t.is (v.get_integer (), 6,           "DOM get 'name.size' --> 6");
+
+  v = dom.get ("foo");
+  t.is (v.get_string (), "bar",        "DOM get 'name.size' --> 6");
+
+  v = dom.get ("missing");
+  t.is (v.get_string (), "",           "DOM get 'missing' --> ''");
 
   return 0;
 }

From 7fc6d7c5bfac8508cd1088a50eb65398cf0b3847 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 8 May 2017 17:20:36 +0200
Subject: [PATCH 538/879] TW-1910: Remove unreachable statement

- Thanks to Martin Strunz.
---
 src/Variant.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index b955c1f9f..050d7f516 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1953,8 +1953,6 @@ bool Variant::trivial () const
          (_type == type_string   && _string   == "")  ||
          (_type == type_date     && _date     == 0)   ||
          (_type == type_duration && _duration == 0);
-
-  return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From de0b54cfb6843b17e93ecbf89553e832ffa09c2b Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 8 May 2017 17:22:45 +0200
Subject: [PATCH 539/879] Update AUTHORS and ChangeLog file

---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index c64bd348a..1f1fb8277 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -314,3 +314,4 @@ suggestions:
   Hubert Toullec
   Eric Hymowitz
   Dan Callahan
+  Martin Strunz
diff --git a/ChangeLog b/ChangeLog
index 8c693fcd6..e69294d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,8 @@
           (thanks to Dan Callahan).
 - TW-1903 grammar error -- There are 1 local changes.
           (thanks to Eric Hymowitz).
+- TW-1910 unreachable statement
+          (thanks to Martin Strunz).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 3c1157fe5dda37ad5fe310361a4251a4fbb7873f Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 8 May 2017 21:59:03 +0200
Subject: [PATCH 540/879] TLSClient: Remove double include

---
 src/TLSClient.cpp | 1 -
 src/libshared     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index ea16987bc..ce42cc1cd 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -43,7 +43,6 @@
 #include <sys/errno.h>
 #endif
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
 #include <shared.h>
diff --git a/src/libshared b/src/libshared
index f1a3cd6bf..f2ac7ef9c 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit f1a3cd6bfabfb083fe3c26f580a15c0d60a92ee9
+Subproject commit f2ac7ef9cc9f33f634f9aacd65ca9c1f828f50e3

From 9c5e3750c4b3a427f12e9cb1e304605c1b854ad0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 8 May 2017 17:33:44 -0400
Subject: [PATCH 541/879] Revert "TLSClient: Remove double include"

This reverts commit 2321c17d8dbc17c1d544dcd66029b47d6b197cff.
---
 src/TLSClient.cpp | 1 +
 src/libshared     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index ce42cc1cd..ea16987bc 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -43,6 +43,7 @@
 #include <sys/errno.h>
 #endif
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
 #include <shared.h>
diff --git a/src/libshared b/src/libshared
index f2ac7ef9c..f1a3cd6bf 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit f2ac7ef9cc9f33f634f9aacd65ca9c1f828f50e3
+Subproject commit f1a3cd6bfabfb083fe3c26f580a15c0d60a92ee9

From 1f8eae0071ea03da650422fd69031ec75277538d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 8 May 2017 17:47:36 -0400
Subject: [PATCH 542/879] Reapplying include removal without libshared update

---
 src/TLSClient.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index ea16987bc..ce42cc1cd 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -43,7 +43,6 @@
 #include <sys/errno.h>
 #endif
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
 #include <shared.h>

From f10d1432f3525bda5e55bee5e5bc9b67e8568928 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 12 Jun 2017 15:02:24 +0200
Subject: [PATCH 543/879] tests: Add tests for complex and-or queries

---
 test/filter.t | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/test/filter.t b/test/filter.t
index eec18456b..620e008bb 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -1035,6 +1035,70 @@ class Test1634(TestCase):
         self.assertIn("OFF7", out)
 
 
+class TestBug1915(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+        self.t("add project:A thingA")
+        self.t("add project:B thingB")
+        self.t("add project:C thingC")
+
+    def test_complex_and_or_query_variant_one(self):
+        """1915: Make sure parser handles complex and-or queries correctly (1)"""
+        code, out, err = self.t("rc.verbose:nothing '(project:A or project:B) and status:pending' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_two(self):
+        """1915: Make sure parser handles complex and-or queries correctly (2)"""
+        code, out, err = self.t("rc.verbose:nothing '( project:A or project:B ) and status:pending' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_three(self):
+        """1915: Make sure parser handles complex and-or queries correctly (3)"""
+        code, out, err = self.t("rc.verbose:nothing 'status:pending and (project:A or project:B)' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_four(self):
+        """1915: Make sure parser handles complex and-or queries correctly (4)"""
+        code, out, err = self.t("rc.verbose:nothing 'status:pending and ( project:A or project:B )' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_five(self):
+        """1915: Make sure parser handles complex and-or queries correctly (5)"""
+        code, out, err = self.t("rc.verbose:nothing status:pending and '(project:A or project:B)' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_six(self):
+        """1915: Make sure parser handles complex and-or queries correctly (6)"""
+        code, out, err = self.t("rc.verbose:nothing status:pending and '( project:A or project:B )' all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_seven(self):
+        """1915: Make sure parser handles complex and-or queries correctly (7)"""
+        code, out, err = self.t("rc.verbose:nothing status:pending and \\( project:A or project:B \\) all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
+    def test_complex_and_or_query_variant_eight(self):
+        """1915: Make sure parser handles complex and-or queries correctly (8)"""
+        code, out, err = self.t("rc.verbose:nothing status:pending and \\(project:A or project:B\\) all")
+        self.assertIn("thingA", out)
+        self.assertIn("thingB", out)
+        self.assertNotIn("thingC", out)
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())

From bb8092a5e4ccf2e04d44e701d135283b9ba248d3 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 12 Jun 2017 15:02:24 +0200
Subject: [PATCH 544/879] tests: Add tests for complex and-or queries


From d987c9f5cd8b7d7e6cb7b8198542274aba5bfbdc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 22 Jul 2017 12:49:46 +0100
Subject: [PATCH 545/879] Scripts: Updated URLs

---
 scripts/add-ons/update-holidays.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index 0237fa3a9..0aaa8b643 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -130,8 +130,8 @@ my $current = (localtime (time))[5] + 1900;
 my $next    = $current + 1;
 
 # Construct the holidata.net URL.
-my $url_current = "http://holidata.net/${locale}/${current}.json";
-my $url_next    = "http://holidata.net/${locale}/${next}.json";
+my $url_current = "https://holidata.net/${locale}/${current}.json";
+my $url_next    = "https://holidata.net/${locale}/${next}.json";
 
 # Fetch data for the current year.
 my $data_current = get ($url_current);

From 7465410c5afd2d5da34976b10ea66ab442dfb5ff Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Thu, 27 Jul 2017 19:00:40 +0200
Subject: [PATCH 546/879] context: Do not allow show, list or none as new
 context names

- Thanks to silviof.
---
 src/commands/CmdContext.cpp | 6 ++++++
 src/l10n/deu-DEU.h          | 1 +
 src/l10n/eng-USA.h          | 1 +
 src/l10n/epo-RUS.h          | 1 +
 src/l10n/esp-ESP.h          | 1 +
 src/l10n/fra-FRA.h          | 1 +
 src/l10n/ita-ITA.h          | 1 +
 src/l10n/jpn-JPN.h          | 1 +
 src/l10n/pol-POL.h          | 1 +
 src/l10n/por-PRT.h          | 1 +
 src/libshared               | 2 +-
 11 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index ca0e25e35..4ee5cf3ee 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -137,6 +137,12 @@ void CmdContext::defineContext (const std::vector <std::string>& words, std::str
     auto name = "context." + words[1];
     auto value = joinWords (words, 2);
 
+    // Make sure nobody creates a context with name 'list', 'none' or 'show'
+    if (words[1] == "none" or words[1] == "list" or words[1] == "show")
+    {
+      throw format (STRING_CMD_CONTEXT_DEF_INVLD, words[1]);
+    }
+
     // Check if the value is a proper filter by filtering current pending.data
     Filter filter;
     std::vector <Task> filtered;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index dfb61b513..034d71a57 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -525,6 +525,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 0ee834d9f..4e5bc7d31 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -523,6 +523,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definition aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c6334020d..eccb12261 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -525,6 +525,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index dc5efe9b5..cfcb34bb0 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -537,6 +537,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Definición de contexto abortada."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Validación de filtro fallida: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "El filtro '{1}' coincide con 0 tareas pendientes. ¿Quiere continuar?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Contexto '{1}' eliminado."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Contexto '{1}' no eliminado."
 #define STRING_CMD_CONTEXT_DEL_USAG  "El nombre del contexto necesita ser especificado."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 577ea0da1..2f57802dd 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -527,6 +527,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5a0081985..22254f7af 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -526,6 +526,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 37df07dc1..f749a3fb5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -527,6 +527,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 31ecea0fd..3b9096aa3 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -527,6 +527,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 0f8088983..95671d74f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -527,6 +527,7 @@
 #define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
 #define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
 #define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
+#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
 #define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
 #define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
 #define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
diff --git a/src/libshared b/src/libshared
index f1a3cd6bf..198dcd368 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit f1a3cd6bfabfb083fe3c26f580a15c0d60a92ee9
+Subproject commit 198dcd368501076fe31b22d828ae72066d0e6291

From 87bcbeda37a497a25c5362161a277c9af66b98dc Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Fri, 18 Aug 2017 01:04:55 +0200
Subject: [PATCH 547/879] DEVELOPER: Update git repo url

---
 DEVELOPER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER b/DEVELOPER
index fd1cf592a..245e42dc0 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -8,7 +8,7 @@ How to Build Taskwarrior
     - python 2.7 or 3 (optional, for running the test suite)
 
   Obtain and build code:
-    $ git clone --recursive https://git.tasktools.org/scm/tm/task.git task.git
+    $ git clone --recursive https://git.tasktools.org/TM/task.git task.git
     $ cd task.git
     $ git checkout 2.5.2                 # Latest dev branch
     $ git submodule init                 # This is now done by cmake as a test

From 878256306c0ba68ab15b5c0d4573f0d5764db48c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Oct 2017 14:39:00 -0400
Subject: [PATCH 548/879] Error: Changed (1) error format

---
 src/l10n/deu-DEU.h | 2 +-
 src/l10n/eng-USA.h | 2 +-
 src/l10n/epo-RUS.h | 2 +-
 src/l10n/esp-ESP.h | 2 +-
 src/l10n/fra-FRA.h | 2 +-
 src/l10n/ita-ITA.h | 2 +-
 src/l10n/jpn-JPN.h | 2 +-
 src/l10n/pol-POL.h | 2 +-
 src/l10n/por-PRT.h | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 034d71a57..c15a7b5a2 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -456,7 +456,7 @@
 #define STRING_CMD_DIAG_FOUND        "(found)"
 #define STRING_CMD_DIAG_MISSING      "(missing)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Enabled"
 #define STRING_CMD_DIAG_DISABLED     "Disabled"
 #define STRING_CMD_DIAG_CONFIG       "Configuration"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 4e5bc7d31..9a7ec7ad9 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -454,7 +454,7 @@
 #define STRING_CMD_DIAG_FOUND        "(found)"
 #define STRING_CMD_DIAG_MISSING      "(missing)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Enabled"
 #define STRING_CMD_DIAG_DISABLED     "Disabled"
 #define STRING_CMD_DIAG_CONFIG       "Configuration"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index eccb12261..c4a41692e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -456,7 +456,7 @@
 #define STRING_CMD_DIAG_FOUND        "(found)"
 #define STRING_CMD_DIAG_MISSING      "(missing)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Enabled"
 #define STRING_CMD_DIAG_DISABLED     "Disabled"
 #define STRING_CMD_DIAG_CONFIG       "Configuration"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index cfcb34bb0..7875b0ba8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -465,7 +465,7 @@
 #define STRING_CMD_DIAG_FOUND        "(encontrado)"
 #define STRING_CMD_DIAG_MISSING      "(no encontrado)"
 #define STRING_CMD_DIAG_MISS_DEP     "La tarea {1} depende de la tarea inexistente: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "La tarea {1} tiene un modelo de recurrencia inexistente: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "La tarea {1} tiene un modelo de recurrencia inexistente {2}"
 #define STRING_CMD_DIAG_ENABLED      "Habilitado"
 #define STRING_CMD_DIAG_DISABLED     "deshabilitado"
 #define STRING_CMD_DIAG_CONFIG       "Configuración"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2f57802dd..237d5fa23 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -458,7 +458,7 @@
 #define STRING_CMD_DIAG_FOUND        "(found)"
 #define STRING_CMD_DIAG_MISSING      "(missing)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Enabled"
 #define STRING_CMD_DIAG_DISABLED     "Disabled"
 #define STRING_CMD_DIAG_CONFIG       "Configuration"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 22254f7af..d78e1284c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -457,7 +457,7 @@
 #define STRING_CMD_DIAG_FOUND        "(trovato)"
 #define STRING_CMD_DIAG_MISSING      "(mancante)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Abilitato"
 #define STRING_CMD_DIAG_DISABLED     "Disabilitato"
 #define STRING_CMD_DIAG_CONFIG       "Configurazione"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f749a3fb5..c1f582846 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -458,7 +458,7 @@
 #define STRING_CMD_DIAG_FOUND        "(found)"
 #define STRING_CMD_DIAG_MISSING      "(missing)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Enabled"
 #define STRING_CMD_DIAG_DISABLED     "Disabled"
 #define STRING_CMD_DIAG_CONFIG       "Configuration"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 3b9096aa3..8fe920a89 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -458,7 +458,7 @@
 #define STRING_CMD_DIAG_FOUND        "(jest)"
 #define STRING_CMD_DIAG_MISSING      "(brak)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Włączone"
 #define STRING_CMD_DIAG_DISABLED     "Wyłączone"
 #define STRING_CMD_DIAG_CONFIG       "Konfiguracja"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 95671d74f..4301605ad 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -458,7 +458,7 @@
 #define STRING_CMD_DIAG_FOUND        "(presente)"
 #define STRING_CMD_DIAG_MISSING      "(em falta)"
 #define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template: {2}"
+#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
 #define STRING_CMD_DIAG_ENABLED      "Ativado"
 #define STRING_CMD_DIAG_DISABLED     "Desativado"
 #define STRING_CMD_DIAG_CONFIG       "Configuração"

From b3192b94b481b9c763408f6768ebb45d5cd5f5f5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 11 Oct 2017 21:26:01 -0400
Subject: [PATCH 549/879] Docs: Removed obsolete URL

---
 DEVELOPER | 4 ----
 README.md | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/DEVELOPER b/DEVELOPER
index 245e42dc0..f3a800f7e 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -45,10 +45,6 @@ General Statement
     suggestions, testing and discussions have taken place there. It is also
     the quickest way to get help, or confirm a bug.
 
-  - Join https://answers.tasktools.org and help us by asking, answering and
-    voting on questions and answers, directly helping those who ask, and
-    helping future users who search for existing answers.
-
   - Review documentation: there are man pages, online articles, tutorials and
     so on, and these may contain errors, or they may not convey ideas in the
     best way. Perhaps you can help improve it. Contact us - documentation is
diff --git a/README.md b/README.md
index c3331309c..a8d83f66b 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,7 @@ Please send your code patches to:
 
     support@taskwarrior.org
 
-Consider joining bug.tasktools.org, answers.tasktools.org and participating in
-the future of Taskwarrior.
+Consider joining bug.tasktools.org and participating in the future of Taskwarrior.
 
 ---
 

From 3b46553f47a202842ea6172c016a2df64aa3d34e Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Fri, 24 Nov 2017 03:50:52 -0500
Subject: [PATCH 550/879] Improve TAP compliance in test suite

This allows tools like `prove` to operate on our test-suite, allowing us
to do things like run recently-failing tests first, randomising test
order, and fancier reporting options.

Changes made:

- TAP output always goes to STDOUT, never to STDERR
- Skipped tests signaled as `ok 1 # skip` as per standard
- Expected failures signaled as `not ok 1 # TODO` as per standard
- `.prove` added to .gitignore
---
 .gitignore                 |  1 +
 test/simpletap/__init__.py | 12 ++++++++----
 test/test.cpp              |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ba2ade24..03300d5c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ CPackSourceConfig.cmake
 patches
 *.exe
 tutorials
+.prove
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index 357f63f20..6ab4c7fa4 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -155,12 +155,12 @@ class TAPTestResult(unittest.result.TestResult):
         if status:
 
             if status == "SKIP":
-                self.stream.writeln("{0} {1} - {2}: {3}".format(
-                    color("skip", "yellow"), self.testsRun, filename, desc)
+                self.stream.writeln("{0} {1} - {2}: {3} # skip".format(
+                    color("ok", "yellow"), self.testsRun, filename, desc)
                 )
             elif status == "EXPECTED_FAILURE":
-                self.stream.writeln("{0} {1} - {2}: {3}".format(
-                    color("skip", "yellow"), self.testsRun, filename, desc)
+                self.stream.writeln("{0} {1} - {2}: {3} # TODO".format(
+                    color("not ok", "yellow"), self.testsRun, filename, desc)
                 )
             else:
                 self.stream.writeln("{0} {1} - {2}: {3}".format(
@@ -227,6 +227,10 @@ class TAPTestRunner(unittest.runner.TextTestRunner):
         unittest.signals.registerResult(result)
         result.failfast = self.failfast
 
+        # TAP requires output is on STDOUT.
+        # TODO: Define this at __init__ time
+        result.stream = unittest.runner._WritelnDecorator(sys.stdout)
+
         with warnings.catch_warnings():
             if getattr(self, "warnings", None):
                 # if self.warnings is set, use it to filter all the warnings
diff --git a/test/test.cpp b/test/test.cpp
index 9dc7552ca..ecc212e8a 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -452,11 +452,12 @@ void UnitTest::skip (const std::string& text)
 {
   ++_counter;
   ++_skipped;
-  std::cout << yellow ("skip")
+  std::cout << yellow ("ok")
             << " "
             << _counter
             << " - "
             << text
+            << " # skip"
             << "\n";
 }
 

From f767ef2f198951d858471dd74218f0ac62be3386 Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Sun, 26 Nov 2017 17:35:38 -0800
Subject: [PATCH 551/879] test/problems: Updated to handle TAP spec output

---
 test/problems | 51 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/test/problems b/test/problems
index 5bacda419..3e739422f 100755
--- a/test/problems
+++ b/test/problems
@@ -54,6 +54,15 @@ if __name__ == "__main__":
 
     file = re.compile("^# (?:./)?(\S+\.t)(?:\.exe)?$")
     timestamp = re.compile("^# (\d+(?:\.\d+)?) ==>.*$")
+
+    expected_fail = re.compile(r"^not ok.*?#\s*TODO", re.I)
+    unexpected_pass = re.compile(r"^ok .*?#\s*TODO", re.I)
+    skip = re.compile(r"^ok .*?#\s*skip", re.I)
+    ok = re.compile(r"^ok ", re.I)
+    not_ok = re.compile(r"^not ok", re.I)
+    comment = re.compile(r"^#")
+    plan = re.compile(r"^1..\d+\s*(?:#.*)?$")
+
     start = None
     stop = None
 
@@ -68,31 +77,37 @@ if __name__ == "__main__":
             if match:
                 filename = match.group(1)
 
-            if line.startswith("ok "):
-                passed[filename] += 1
-
-            if line.startswith("not "):
-                errors[filename] += 1
-
-            if line.startswith("skip "):
-                skipped[filename] += 1
-
-            if line.startswith("# EXPECTED_FAILURE:"):
+            elif expected_fail.match(line):
                 expected[filename] += 1
 
-            if line.startswith("# UNEXPECTED_SUCCESS:"):
+            elif unexpected_pass.match(line):
                 unexpected[filename] += 1
 
+            elif skip.match(line):
+                skipped[filename] += 1
+
+            # It's important these come last, since they're subpatterns of the above
+
+            elif ok.match(line):
+                passed[filename] += 1
+
+            elif not_ok.match(line):
+                errors[filename] += 1
+
+            elif comment.match(line):
+                pass
+
+            elif plan.match(line):
+                pass
+
+            else:
+                # Uncomment if you want to see malformed things we caught as well...
+                # print(color("Malformed TAP (" + filename + "): " + line, "red"))
+                pass
+
         # Last line contains the ending timestamp
         stop = float(timestamp.match(line).group(1))
 
-    # Remove expected failures from the skipped tests category
-    for filename, value in expected.items():
-        if skipped[filename] == value:
-            del skipped[filename]
-        else:
-            skipped[filename] -= value
-
     v = "{0:>5d}"
     passed_str = "Passed:" + pad(24)
     passed_int = v.format(sum(passed.values()))

From 9d26327ae4ccb4b79dd3e793dbb904d863155a5a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Dec 2017 12:34:47 -0500
Subject: [PATCH 552/879] TW-1936: Tweak tests to have fuller TAP compliance

- Thanks to Paul J. Fenwick.
---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 1f1fb8277..8c3b1131a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -139,6 +139,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Antonio Huete Jimenez
   Lukas Barth
   Øyvind A. Holm
+  Paul J. Fenwick
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index e69294d70..258282dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,8 @@
           (thanks to Eric Hymowitz).
 - TW-1910 unreachable statement
           (thanks to Martin Strunz).
+- TW-1936 Tweak tests to have fuller TAP compliance
+          (thanks to Paul J. Fenwick)
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From aefe16a6e2d3db4c3c44b8e07c4e054473ea5ddc Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Fri, 24 Nov 2017 01:45:39 -0500
Subject: [PATCH 553/879] Docs/CLI2: Additional dev docs for applyOverrides

---
 src/CLI2.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index ddf51e2e2..516bb9504 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -277,16 +277,23 @@ void CLI2::applyOverrides (int argc, const char** argv)
 {
   for (int i = 0; i < argc; ++i)
   {
+
+    // Don't process any arguments after a '--'
     std::string raw = argv[i];
     if (raw == "--")
       break;
 
+    // Overrides always start with 'rc.'
     if (raw.length () > 3 &&
         raw.substr (0, 3) == "rc.")
     {
+
+      // Our separator can either be '=' or ':', so try and find both.
       auto sep = raw.find ('=', 3);
       if (sep == std::string::npos)
         sep = raw.find (':', 3);
+
+      // Process our override if well-formed
       if (sep != std::string::npos)
       {
         std::string name  = raw.substr (3, sep - 3);

From ec31b93447164be513122c0c7c10abeefbd46e41 Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Fri, 24 Nov 2017 01:47:39 -0500
Subject: [PATCH 554/879] CLI2,Config: Add 'override' verbosity option

This allows for 'override' messages to be silenced without requiring
footnotes be completely disabled.

The 'override' verbosity implies 'footnotes'.
---
 doc/man/taskrc.5.in | 7 ++++---
 src/CLI2.cpp        | 4 +++-
 src/Context.cpp     | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 096860210..b3cc179fe 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -280,17 +280,18 @@ control specific occasions when output is generated. This list may contain:
     sync       Feedback about sync
     filter     Shows the filter used in the command
     unwait     Notification when a task leaves the 'waiting' state
+    override   Notification when configuration options are overriden
     recur      Notification when a new recurring task instance is created
 
-"affected", "new-id", "new-uuid" "project" and "unwait" imply "footnote".
+"affected", "new-id", "new-uuid", "project", "override" and "unwait" imply "footnote".
 
 Note that the "1" setting is equivalent to all the tokens being specified,
 and the "nothing" setting is equivalent to none of the tokens being specified.
 
 Here are the shortcut equivalents:
 
-    verbose=1
-    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait
+    verbose=on
+    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait,override
 
     verbose=0
     verbose=blank,label,new-id,edit
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 516bb9504..0e68b38dc 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -299,7 +299,9 @@ void CLI2::applyOverrides (int argc, const char** argv)
         std::string name  = raw.substr (3, sep - 3);
         std::string value = raw.substr (sep + 1);
         context.config.set (name, value);
-        context.footnote (format (STRING_PARSER_OVERRIDE_RC, name, value));
+
+        if (context.verbose("override"))
+          context.footnote (format (STRING_PARSER_OVERRIDE_RC, name, value));
       }
     }
   }
diff --git a/src/Context.cpp b/src/Context.cpp
index fd59ae1bc..3c12187bf 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -88,7 +88,7 @@ std::string configurationDefaults =
   "\n"
   "# Miscellaneous\n"
   "#                                              # Comma-separated list.  May contain any subset of:\n"
-  "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,recur\n"
+  "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,override,recur\n"
   "confirmation=1                                 # Confirmation on delete, big changes\n"
   "recurrence=1                                   # Enable recurrence\n"
   "recurrence.confirmation=prompt                 # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
@@ -949,6 +949,7 @@ bool Context::verbose (const std::string& token)
           v != "sync"     &&  //
           v != "filter"   &&  //
           v != "unwait"   &&  //
+          v != "override" &&  //
           v != "recur")       //
       {
         // This list emulates rc.verbose=off in version 1.9.4.
@@ -960,7 +961,7 @@ bool Context::verbose (const std::string& token)
     if (! verbosity.count ("footnote"))
     {
       // TODO: Some of these may not use footnotes yet.  They should.
-      for (auto flag : {"affected", "new-id", "new-uuid", "project", "unwait", "recur"})
+      for (auto flag : {"affected", "new-id", "new-uuid", "project", "unwait", "override", "recur"})
       {
         if (verbosity.count (flag))
         {

From 8baf5440404dd607ae8fc85eca61c542f5983ac7 Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Fri, 24 Nov 2017 01:49:37 -0500
Subject: [PATCH 555/879] CLI2/Context: Add vim hints

No need for vim to guess indent style with these handy vim hints!
---
 src/CLI2.cpp    | 2 ++
 src/Context.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 0e68b38dc..26b0b82a4 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -2121,3 +2121,5 @@ std::vector <A2> CLI2::lexExpression (const std::string& expression)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+
+// vim: ts=2:sw=2
diff --git a/src/Context.cpp b/src/Context.cpp
index 3c12187bf..e40bd44c0 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1298,3 +1298,5 @@ void Context::debug (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+
+// vim ts=2:sw=2

From 5e93134ea4f63f2fc75cf33e00b27f1a03c74eb2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Dec 2017 13:06:58 -0500
Subject: [PATCH 556/879] TW-1935: Separate verbosity category for rc overrides

- Thanks to Paul J. Fenwick.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 258282dda..abd37541e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,8 @@
           (thanks to Martin Strunz).
 - TW-1936 Tweak tests to have fuller TAP compliance
           (thanks to Paul J. Fenwick)
+- TW-1935 Separate verbosity category for rc overrides
+          (thanks to Paul J. Fenwick)
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From f7dc21d24d81f95f2034eeb539982dc5ea90f69e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Dec 2017 14:21:12 -0500
Subject: [PATCH 557/879] TW-1930: Typo in help

- Thanks to Kai HTML.
---
 AUTHORS            | 1 +
 ChangeLog          | 2 ++
 src/l10n/deu-DEU.h | 4 ++--
 src/l10n/eng-USA.h | 4 ++--
 src/l10n/epo-RUS.h | 4 ++--
 src/l10n/esp-ESP.h | 4 ++--
 src/l10n/fra-FRA.h | 4 ++--
 src/l10n/ita-ITA.h | 4 ++--
 src/l10n/jpn-JPN.h | 4 ++--
 src/l10n/pol-POL.h | 4 ++--
 src/l10n/por-PRT.h | 4 ++--
 11 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8c3b1131a..a305aeaba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -316,3 +316,4 @@ suggestions:
   Eric Hymowitz
   Dan Callahan
   Martin Strunz
+  Kai HTML
diff --git a/ChangeLog b/ChangeLog
index abd37541e..6cd58df79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,8 @@
           (thanks to Eric Hymowitz).
 - TW-1910 unreachable statement
           (thanks to Martin Strunz).
+- TW-1930 Typo in help
+          (thanks to Kai HTML).
 - TW-1936 Tweak tests to have fuller TAP compliance
           (thanks to Paul J. Fenwick)
 - TW-1935 Separate verbosity category for rc overrides
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c15a7b5a2..9de02c5a6 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -896,8 +896,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 9a7ec7ad9..61b03c354 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -893,8 +893,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c4a41692e..6f2413b59 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -895,8 +895,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7875b0ba8..4d032f262 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -923,8 +923,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 237d5fa23..36786aefa 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -897,8 +897,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d78e1284c..3a7b47ed7 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -896,8 +896,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index c1f582846..8bb2b7ebf 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -897,8 +897,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 8fe920a89..4ec5205ca 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -897,8 +897,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 4301605ad..777df615b 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -897,8 +897,8 @@
   "  ----------------  -----------------  -------------------  -------------------------\n" \
   "                    due:today          due = today          Fuzzy match\n" \
   "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < tomorrow       Exact date comparison\n" \
-  "  after, above      due.after:today    due > tomorrow       Exact date comparison\n" \
+  "  before, below     due.before:today   due < today          Exact date comparison\n" \
+  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
   "  none              project.none:      project == ''        Empty\n" \
   "  any               project.any:       project !== ''       Not empty\n" \
   "  is, equals        project.is:x       project == x         Exact match\n" \

From 4e80d5d5fdb317f746a902ba83c891d7b20fe44f Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Mon, 4 Dec 2017 11:27:22 -0800
Subject: [PATCH 558/879] [TW-1938] Resolve conflicts between new-id and
 new-uuid

- new-uuid is *not* set by default
- new-uuid overrides new-id when set

The reasoning is that new-uuid is mostly used by code (eg: Python's
taskw module), whereas new-id is mostly used by humans.

By making new-uuid not set by default, calling code can set it to
receive UUIDs (preserving 2.5.x behaviour), but humans can continue to
use integer task IDs.
---
 src/Context.cpp         |  2 +-
 src/commands/CmdAdd.cpp | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index e40bd44c0..a29d82482 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -88,7 +88,7 @@ std::string configurationDefaults =
   "\n"
   "# Miscellaneous\n"
   "#                                              # Comma-separated list.  May contain any subset of:\n"
-  "verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,unwait,override,recur\n"
+  "verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,unwait,override,recur\n"
   "confirmation=1                                 # Confirmation on delete, big changes\n"
   "recurrence=1                                   # Enable recurrence\n"
   "recurrence.confirmation=prompt                 # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 6993c91c3..9d08287b6 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -60,7 +60,21 @@ int CmdAdd::execute (std::string& output)
 
   // Do not display ID 0, users cannot query by that
   auto status = task.getStatus ();
-  if (context.verbose ("new-id") &&
+
+  // We may have a situation where both new-id and new-uuid config
+  // variables are set. In that case, we'll show the new-uuid, as
+  // it's enduring and never changes, and it's unlikely the caller
+  // asked for this if they just wanted a human-friendly number.
+
+  if (context.verbose ("new-uuid") &&
+           status != Task::recurring)
+    output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + '\n';
+
+  else if (context.verbose ("new-uuid") &&
+           status == Task::recurring)
+    output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + '\n';
+
+  else if (context.verbose ("new-id") &&
       (status == Task::pending ||
        status == Task::waiting))
     output += format (STRING_CMD_ADD_FEEDBACK, task.id) + '\n';
@@ -69,14 +83,6 @@ int CmdAdd::execute (std::string& output)
            status == Task::recurring)
     output += format (STRING_CMD_ADD_RECUR, task.id) + '\n';
 
-  else if (context.verbose ("new-uuid") &&
-           status != Task::recurring)
-    output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + '\n';
-
-  else if (context.verbose ("new-uuid") &&
-           status == Task::recurring)
-    output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + '\n';
-
   if (context.verbose ("project"))
     context.footnote (onProjectChange (task));
 

From ad21e86f06fc2259ed353986729c0ffdbc189bcd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 9 Dec 2017 22:52:56 -0500
Subject: [PATCH 559/879] TW-1938: Adjust behaviour of new-uuid and new-id
 verbosity levels

- Thanks to Paul J. Fenwick.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6cd58df79..351219f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,8 @@
           (thanks to Paul J. Fenwick)
 - TW-1935 Separate verbosity category for rc overrides
           (thanks to Paul J. Fenwick)
+- TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
+          (thanks to Paul J. Fenwick)
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 3ad683a370b13048394181ad871ecaebf6ae0d77 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 9 Dec 2017 23:05:31 -0500
Subject: [PATCH 560/879] Test: Improved C+ Core Guidelines compliance

---
 test/test.cpp | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/test/test.cpp b/test/test.cpp
index ecc212e8a..891f70c8d 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -51,7 +51,7 @@ UnitTest::UnitTest (int planned)
 , _failed (0)
 , _skipped (0)
 {
-  std::cout << "1.." << _planned << "\n";
+  std::cout << "1.." << _planned << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -99,14 +99,14 @@ void UnitTest::plan (int planned)
   _failed = 0;
   _skipped = 0;
 
-  std::cout << "1.." << _planned << "\n";
+  std::cout << "1.." << _planned << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void UnitTest::planMore (int extra)
 {
   _planned += extra;
-  std::cout << "1.." << _planned << "\n";
+  std::cout << "1.." << _planned << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -122,7 +122,7 @@ void UnitTest::ok (bool expression, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -132,7 +132,7 @@ void UnitTest::ok (bool expression, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
 }
 
@@ -149,7 +149,7 @@ void UnitTest::notok (bool expression, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -159,7 +159,7 @@ void UnitTest::notok (bool expression, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
 }
 
@@ -175,7 +175,7 @@ void UnitTest::is (bool actual, bool expected, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -189,7 +189,7 @@ void UnitTest::is (bool actual, bool expected, const std::string& name)
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -205,7 +205,7 @@ void UnitTest::is (size_t actual, size_t expected, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -219,7 +219,7 @@ void UnitTest::is (size_t actual, size_t expected, const std::string& name)
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -235,7 +235,7 @@ void UnitTest::is (int actual, int expected, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -249,7 +249,7 @@ void UnitTest::is (int actual, int expected, const std::string& name)
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -265,7 +265,7 @@ void UnitTest::is (double actual, double expected, const std::string& name)
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -279,7 +279,7 @@ void UnitTest::is (double actual, double expected, const std::string& name)
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -295,7 +295,7 @@ void UnitTest::is (double actual, double expected, double tolerance, const std::
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -309,7 +309,7 @@ void UnitTest::is (double actual, double expected, double tolerance, const std::
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -325,7 +325,7 @@ void UnitTest::is (unsigned char actual, unsigned char expected, const std::stri
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -339,7 +339,7 @@ void UnitTest::is (unsigned char actual, unsigned char expected, const std::stri
               << expected
               << "\n#      got: "
               << actual
-              << "\n";
+              << '\n';
   }
 }
 
@@ -358,7 +358,7 @@ void UnitTest::is (
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -392,7 +392,7 @@ void UnitTest::is (
               << _counter
               << " - "
               << name
-              << "\n";
+              << '\n';
   }
   else
   {
@@ -418,7 +418,7 @@ void UnitTest::diag (const std::string& text)
   auto end   = text.find_last_not_of  (" \t\n\r\f");
   if (start != std::string::npos &&
       end   != std::string::npos)
-    std::cout << "# " << text.substr (start, end - start + 1) << "\n";
+    std::cout << "# " << text.substr (start, end - start + 1) << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -431,7 +431,7 @@ void UnitTest::pass (const std::string& text)
             << _counter
             << " - "
             << text
-            << "\n";
+            << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -444,7 +444,7 @@ void UnitTest::fail (const std::string& text)
             << _counter
             << " - "
             << text
-            << "\n";
+            << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -458,7 +458,7 @@ void UnitTest::skip (const std::string& text)
             << " - "
             << text
             << " # skip"
-            << "\n";
+            << '\n';
 }
 
 ///////////////////////////////////////////////////////////////////////////////

From 2e2bdb0d0d64cb9ae8e133f32da96818a0f313d3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 9 Dec 2017 23:15:36 -0500
Subject: [PATCH 561/879] Docs: Updated ChangeLog

---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 351219f79..6db9753ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,10 +65,10 @@
           (thanks to Martin Strunz).
 - TW-1930 Typo in help
           (thanks to Kai HTML).
-- TW-1936 Tweak tests to have fuller TAP compliance
-          (thanks to Paul J. Fenwick)
 - TW-1935 Separate verbosity category for rc overrides
           (thanks to Paul J. Fenwick)
+- TW-1936 Tweak tests to have fuller TAP compliance
+          (thanks to Paul J. Fenwick)
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
           (thanks to Paul J. Fenwick)
 - Added 'juhannus' as a synonym for 'midsommarafton'

From 018770e8942e344b2b253221a44fa3401479decc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 10 Dec 2017 00:20:50 -0500
Subject: [PATCH 562/879] TI-91: Timewarrior does not compile on DragonFly

- Thanks to Michael Neumann.
---
 AUTHORS                | 1 +
 CMakeLists.txt         | 6 +++---
 ChangeLog              | 2 ++
 cmake.h.in             | 1 +
 cmake/CXXSniffer.cmake | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a305aeaba..ab810b47e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -140,6 +140,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Lukas Barth
   Øyvind A. Holm
   Paul J. Fenwick
+  Michael Neumann
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c49533d0..e7d2a67e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,13 +48,13 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
 
-if (FREEBSD)
+if (FREEBSD OR DRAGONFLY)
 SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
-else (FREEBSD)
+else (FREEBSD OR DRAGONFLY)
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
-endif (FREEBSD)
+endif (FREEBSD OR DRAGONFLY)
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
diff --git a/ChangeLog b/ChangeLog
index 6db9753ae..aa08e7819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 - TD-64   sync conflict deleted all annotations of the task
           (thanks to Markus Beppler, Konstantin Vorobyev).
+- TI-91   Timewarrior does not compile on DragonFly
+          (thanks to Michael Neumann).
 - TW-61   Extract only tasks with annotations
           (thanks to Aikido Guy).
 - TW-213  Align countdown column on boundary between number and text.
diff --git a/cmake.h.in b/cmake.h.in
index 0041e6ea7..aee21418f 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -43,6 +43,7 @@
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
 #cmakedefine NETBSD
+#cmakedefine DRAGONFLY
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
 #cmakedefine KFREEBSD
diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake
index 96062263b..b6aa56dc7 100644
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -33,6 +33,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
   set (OPENBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
   set (NETBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+  set (DRAGONFLY true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
   set (SOLARIS true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")

From 216d4d63bc1f05c64b1f6ee83f9e2e89cfcc04f4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 31 Dec 2017 19:22:07 -0500
Subject: [PATCH 563/879] Copyright 2018

---
 COPYING                            | 2 +-
 LICENSE                            | 2 +-
 doc/man/task-color.5.in            | 2 +-
 doc/man/task-sync.5.in             | 2 +-
 doc/man/task.1.in                  | 2 +-
 doc/man/taskrc.5.in                | 2 +-
 doc/rc/dark-16.theme               | 2 +-
 doc/rc/dark-256.theme              | 2 +-
 doc/rc/dark-blue-256.theme         | 2 +-
 doc/rc/dark-gray-256.theme         | 2 +-
 doc/rc/dark-gray-blue-256.theme    | 2 +-
 doc/rc/dark-green-256.theme        | 2 +-
 doc/rc/dark-red-256.theme          | 2 +-
 doc/rc/dark-violets-256.theme      | 2 +-
 doc/rc/dark-yellow-green.theme     | 2 +-
 doc/rc/light-16.theme              | 2 +-
 doc/rc/light-256.theme             | 2 +-
 doc/rc/no-color.theme              | 2 +-
 doc/rc/solarized-dark-256.theme    | 2 +-
 doc/rc/solarized-light-256.theme   | 2 +-
 scripts/add-ons/update-holidays.pl | 4 ++--
 scripts/bash/task.sh               | 2 +-
 scripts/fish/task.fish             | 2 +-
 scripts/utils/l10n                 | 2 +-
 scripts/vim/README                 | 2 +-
 scripts/vim/ftdetect/task.vim      | 2 +-
 scripts/vim/syntax/taskdata.vim    | 2 +-
 scripts/vim/syntax/taskedit.vim    | 2 +-
 scripts/vim/syntax/taskrc.vim      | 2 +-
 scripts/zsh/_task                  | 2 +-
 src/CLI2.cpp                       | 2 +-
 src/CLI2.h                         | 2 +-
 src/Context.cpp                    | 2 +-
 src/Context.h                      | 2 +-
 src/DOM.cpp                        | 2 +-
 src/DOM.h                          | 2 +-
 src/Eval.cpp                       | 2 +-
 src/Eval.h                         | 2 +-
 src/Filter.cpp                     | 2 +-
 src/Filter.h                       | 2 +-
 src/Hooks.cpp                      | 2 +-
 src/Hooks.h                        | 2 +-
 src/Lexer.cpp                      | 2 +-
 src/Lexer.h                        | 2 +-
 src/TDB2.cpp                       | 2 +-
 src/TDB2.h                         | 2 +-
 src/TLSClient.cpp                  | 2 +-
 src/TLSClient.h                    | 2 +-
 src/Task.cpp                       | 2 +-
 src/Task.h                         | 2 +-
 src/Variant.cpp                    | 2 +-
 src/Variant.h                      | 2 +-
 src/ViewTask.cpp                   | 2 +-
 src/ViewTask.h                     | 2 +-
 src/calc.cpp                       | 2 +-
 src/columns/ColDepends.cpp         | 2 +-
 src/columns/ColDepends.h           | 2 +-
 src/columns/ColDescription.cpp     | 2 +-
 src/columns/ColDescription.h       | 2 +-
 src/columns/ColDue.cpp             | 2 +-
 src/columns/ColDue.h               | 2 +-
 src/columns/ColEnd.cpp             | 2 +-
 src/columns/ColEnd.h               | 2 +-
 src/columns/ColEntry.cpp           | 2 +-
 src/columns/ColEntry.h             | 2 +-
 src/columns/ColID.cpp              | 2 +-
 src/columns/ColID.h                | 2 +-
 src/columns/ColIMask.cpp           | 2 +-
 src/columns/ColIMask.h             | 2 +-
 src/columns/ColMask.cpp            | 2 +-
 src/columns/ColMask.h              | 2 +-
 src/columns/ColModified.cpp        | 2 +-
 src/columns/ColModified.h          | 2 +-
 src/columns/ColParent.cpp          | 2 +-
 src/columns/ColParent.h            | 2 +-
 src/columns/ColProject.cpp         | 2 +-
 src/columns/ColProject.h           | 2 +-
 src/columns/ColRecur.cpp           | 2 +-
 src/columns/ColRecur.h             | 2 +-
 src/columns/ColScheduled.cpp       | 2 +-
 src/columns/ColScheduled.h         | 2 +-
 src/columns/ColStart.cpp           | 2 +-
 src/columns/ColStart.h             | 2 +-
 src/columns/ColStatus.cpp          | 2 +-
 src/columns/ColStatus.h            | 2 +-
 src/columns/ColTags.cpp            | 2 +-
 src/columns/ColTags.h              | 2 +-
 src/columns/ColTypeDate.cpp        | 2 +-
 src/columns/ColTypeDate.h          | 2 +-
 src/columns/ColTypeDuration.cpp    | 2 +-
 src/columns/ColTypeDuration.h      | 2 +-
 src/columns/ColTypeNumeric.cpp     | 2 +-
 src/columns/ColTypeNumeric.h       | 2 +-
 src/columns/ColTypeString.cpp      | 2 +-
 src/columns/ColTypeString.h        | 2 +-
 src/columns/ColUDA.cpp             | 2 +-
 src/columns/ColUDA.h               | 2 +-
 src/columns/ColUUID.cpp            | 2 +-
 src/columns/ColUUID.h              | 2 +-
 src/columns/ColUntil.cpp           | 2 +-
 src/columns/ColUntil.h             | 2 +-
 src/columns/ColUrgency.cpp         | 2 +-
 src/columns/ColUrgency.h           | 2 +-
 src/columns/ColWait.cpp            | 2 +-
 src/columns/ColWait.h              | 2 +-
 src/columns/Column.cpp             | 2 +-
 src/columns/Column.h               | 2 +-
 src/commands/CmdAdd.cpp            | 2 +-
 src/commands/CmdAdd.h              | 2 +-
 src/commands/CmdAliases.cpp        | 2 +-
 src/commands/CmdAliases.h          | 2 +-
 src/commands/CmdAnnotate.cpp       | 2 +-
 src/commands/CmdAnnotate.h         | 2 +-
 src/commands/CmdAppend.cpp         | 2 +-
 src/commands/CmdAppend.h           | 2 +-
 src/commands/CmdAttributes.cpp     | 2 +-
 src/commands/CmdAttributes.h       | 2 +-
 src/commands/CmdBurndown.cpp       | 2 +-
 src/commands/CmdBurndown.h         | 2 +-
 src/commands/CmdCalc.cpp           | 2 +-
 src/commands/CmdCalc.h             | 2 +-
 src/commands/CmdCalendar.cpp       | 2 +-
 src/commands/CmdCalendar.h         | 2 +-
 src/commands/CmdColor.cpp          | 2 +-
 src/commands/CmdColor.h            | 2 +-
 src/commands/CmdColumns.cpp        | 2 +-
 src/commands/CmdColumns.h          | 2 +-
 src/commands/CmdCommands.cpp       | 2 +-
 src/commands/CmdCommands.h         | 2 +-
 src/commands/CmdConfig.cpp         | 2 +-
 src/commands/CmdConfig.h           | 2 +-
 src/commands/CmdContext.cpp        | 2 +-
 src/commands/CmdContext.h          | 2 +-
 src/commands/CmdCount.cpp          | 2 +-
 src/commands/CmdCount.h            | 2 +-
 src/commands/CmdCustom.cpp         | 2 +-
 src/commands/CmdCustom.h           | 2 +-
 src/commands/CmdDelete.cpp         | 2 +-
 src/commands/CmdDelete.h           | 2 +-
 src/commands/CmdDenotate.cpp       | 2 +-
 src/commands/CmdDenotate.h         | 2 +-
 src/commands/CmdDiagnostics.cpp    | 2 +-
 src/commands/CmdDiagnostics.h      | 2 +-
 src/commands/CmdDone.cpp           | 2 +-
 src/commands/CmdDone.h             | 2 +-
 src/commands/CmdDuplicate.cpp      | 2 +-
 src/commands/CmdDuplicate.h        | 2 +-
 src/commands/CmdEdit.cpp           | 2 +-
 src/commands/CmdEdit.h             | 2 +-
 src/commands/CmdExec.cpp           | 2 +-
 src/commands/CmdExec.h             | 2 +-
 src/commands/CmdExport.cpp         | 2 +-
 src/commands/CmdExport.h           | 2 +-
 src/commands/CmdGet.cpp            | 2 +-
 src/commands/CmdGet.h              | 2 +-
 src/commands/CmdHelp.cpp           | 2 +-
 src/commands/CmdHelp.h             | 2 +-
 src/commands/CmdHistory.cpp        | 2 +-
 src/commands/CmdHistory.h          | 2 +-
 src/commands/CmdIDs.cpp            | 2 +-
 src/commands/CmdIDs.h              | 2 +-
 src/commands/CmdImport.cpp         | 2 +-
 src/commands/CmdImport.h           | 2 +-
 src/commands/CmdInfo.cpp           | 2 +-
 src/commands/CmdInfo.h             | 2 +-
 src/commands/CmdLog.cpp            | 2 +-
 src/commands/CmdLog.h              | 2 +-
 src/commands/CmdLogo.cpp           | 2 +-
 src/commands/CmdLogo.h             | 2 +-
 src/commands/CmdModify.cpp         | 2 +-
 src/commands/CmdModify.h           | 2 +-
 src/commands/CmdPrepend.cpp        | 2 +-
 src/commands/CmdPrepend.h          | 2 +-
 src/commands/CmdProjects.cpp       | 2 +-
 src/commands/CmdProjects.h         | 2 +-
 src/commands/CmdPurge.cpp          | 2 +-
 src/commands/CmdPurge.h            | 2 +-
 src/commands/CmdReports.cpp        | 2 +-
 src/commands/CmdReports.h          | 2 +-
 src/commands/CmdShow.cpp           | 2 +-
 src/commands/CmdShow.h             | 2 +-
 src/commands/CmdStart.cpp          | 2 +-
 src/commands/CmdStart.h            | 2 +-
 src/commands/CmdStats.cpp          | 2 +-
 src/commands/CmdStats.h            | 2 +-
 src/commands/CmdStop.cpp           | 2 +-
 src/commands/CmdStop.h             | 2 +-
 src/commands/CmdSummary.cpp        | 2 +-
 src/commands/CmdSummary.h          | 2 +-
 src/commands/CmdSync.cpp           | 2 +-
 src/commands/CmdSync.h             | 2 +-
 src/commands/CmdTags.cpp           | 2 +-
 src/commands/CmdTags.h             | 2 +-
 src/commands/CmdTimesheet.cpp      | 2 +-
 src/commands/CmdTimesheet.h        | 2 +-
 src/commands/CmdUDAs.cpp           | 2 +-
 src/commands/CmdUDAs.h             | 2 +-
 src/commands/CmdUndo.cpp           | 2 +-
 src/commands/CmdUndo.h             | 2 +-
 src/commands/CmdUnique.cpp         | 2 +-
 src/commands/CmdUnique.h           | 2 +-
 src/commands/CmdUrgency.cpp        | 2 +-
 src/commands/CmdUrgency.h          | 2 +-
 src/commands/CmdVersion.cpp        | 2 +-
 src/commands/CmdVersion.h          | 2 +-
 src/commands/Command.cpp           | 2 +-
 src/commands/Command.h             | 2 +-
 src/dependency.cpp                 | 2 +-
 src/feedback.cpp                   | 2 +-
 src/i18n.h                         | 2 +-
 src/l10n/deu-DEU.h                 | 4 ++--
 src/l10n/eng-USA.h                 | 4 ++--
 src/l10n/epo-RUS.h                 | 2 +-
 src/l10n/esp-ESP.h                 | 4 ++--
 src/l10n/fra-FRA.h                 | 4 ++--
 src/l10n/ita-ITA.h                 | 4 ++--
 src/l10n/jpn-JPN.h                 | 4 ++--
 src/l10n/pol-POL.h                 | 6 +++---
 src/l10n/por-PRT.h                 | 4 ++--
 src/legacy.cpp                     | 2 +-
 src/main.cpp                       | 2 +-
 src/main.h                         | 2 +-
 src/nag.cpp                        | 2 +-
 src/recur.cpp                      | 2 +-
 src/rules.cpp                      | 2 +-
 src/sort.cpp                       | 2 +-
 src/util.cpp                       | 2 +-
 src/util.h                         | 2 +-
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/bash_tap.sh                   | 2 +-
 test/bash_tap_tw.sh                | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/col.t.cpp                     | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom.t.cpp                     | 2 +-
 test/dom2.t                        | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/eval.t.cpp                    | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/lexer.t.cpp                   | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/simpletap/__init__.py         | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/t.t.cpp                       | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/tdb2.t.cpp                    | 2 +-
 test/template.t                    | 2 +-
 test/test.cpp                      | 2 +-
 test/test.h                        | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-1837.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/util.t.cpp                    | 2 +-
 test/uuid.t                        | 2 +-
 test/variant_add.t.cpp             | 2 +-
 test/variant_and.t.cpp             | 2 +-
 test/variant_cast.t.cpp            | 2 +-
 test/variant_divide.t.cpp          | 2 +-
 test/variant_equal.t.cpp           | 2 +-
 test/variant_exp.t.cpp             | 2 +-
 test/variant_gt.t.cpp              | 2 +-
 test/variant_gte.t.cpp             | 2 +-
 test/variant_inequal.t.cpp         | 2 +-
 test/variant_lt.t.cpp              | 2 +-
 test/variant_lte.t.cpp             | 2 +-
 test/variant_match.t.cpp           | 2 +-
 test/variant_math.t.cpp            | 2 +-
 test/variant_modulo.t.cpp          | 2 +-
 test/variant_multiply.t.cpp        | 2 +-
 test/variant_nomatch.t.cpp         | 2 +-
 test/variant_not.t.cpp             | 2 +-
 test/variant_or.t.cpp              | 2 +-
 test/variant_partial.t.cpp         | 2 +-
 test/variant_subtract.t.cpp        | 2 +-
 test/variant_xor.t.cpp             | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/view.t.cpp                    | 2 +-
 test/wait.t                        | 2 +-
 383 files changed, 393 insertions(+), 393 deletions(-)

diff --git a/COPYING b/COPYING
index c2b94e5eb..c7aadec98 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2018, 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
diff --git a/LICENSE b/LICENSE
index abeb9948c..9d6090408 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2018, 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
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index d52b8bce9..5b2dd0470 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -303,7 +303,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 \- 2017 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index fb662472a..a8df1e42e 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -155,7 +155,7 @@ Weaknesses:
   - You need to manage your own server, or gain access to a hosted server.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 8c7f521a7..3e63b6660 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1306,7 +1306,7 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" command.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index b3cc179fe..14ddd9df0 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1507,7 +1507,7 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2017 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 This man page was originally written by Federico Hernandez.
 
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index fecc32783..ed8fe7240 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 1230e1960..0c05f1953 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 6905cca62..3eeca69ab 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index 03df132b3..1ba0a0768 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme
index 3ab9b8af5..062e6686a 100644
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index 622fd5b91..936fbec68 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index 614d702d0..11973ee7a 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme
index 6788610cc..df6bd3e61 100644
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index 7949e5bcf..311f4bf96 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index e0a32ce04..2ac3f0d1f 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index c75b7cef5..b9b870509 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme
index 2eee698ea..7c5901d54 100644
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme
index fe402484c..246e839c8 100644
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme
index c6ddcefef..ec370d7e2 100644
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index 0aaa8b643..51a50f5ce 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2018, 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
@@ -189,7 +189,7 @@ if (open my $fh, '>:utf8', $file)
         "# ${url_current}\n",
         "# ${url_next}\n",
         "#\n",
-        "# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2018, 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",
diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index 2671bc37b..05dd4f3b3 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index 74804200e..83808ff8b 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2017, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2018, Roman Inflianskas <infroma@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/utils/l10n b/scripts/utils/l10n
index 4601a2e1a..ae5cacbac 100755
--- a/scripts/utils/l10n
+++ b/scripts/utils/l10n
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.7
 ################################################################################
 ##
-## Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2018, 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
diff --git a/scripts/vim/README b/scripts/vim/README
index 8de0d826c..a9143ac1f 100644
--- 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 - 2017 John Florian
+Copyright 2009 - 2018 John Florian
 
 and are available under the MIT license.
 For the full text of this license, see COPYING.
diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim
index 137881e53..23ac0500c 100644
--- 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 - 2017 John Florian
+" Copyright 2009 - 2018 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskdata.vim b/scripts/vim/syntax/taskdata.vim
index f290f68c8..55cbec701 100644
--- 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 - 2017 John Florian
+" Copyright 2009 - 2018 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskedit.vim b/scripts/vim/syntax/taskedit.vim
index 39b9c51ee..7291729b1 100644
--- 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 - 2017 John Florian
+" Copyright 2009 - 2018 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index 9e2eb8f4c..0279424ba 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 "
-" Copyright (c) 2014 - 2017 Taskwarrior Team
+" Copyright (c) 2014 - 2018 Taskwarrior Team
 " Copyright (c) 2009 - 2014 John Florian
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 8b7ac5354..ce240d9a4 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -1,6 +1,6 @@
 #compdef task
 #
-# Copyright 2010 - 2017 Johannes Schlatow
+# Copyright 2010 - 2018 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 26b0b82a4..67b175660 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/CLI2.h b/src/CLI2.h
index 0e5595ad0..c918cd30d 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Context.cpp b/src/Context.cpp
index a29d82482..eb4a2f824 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Context.h b/src/Context.h
index 670481bf4..f83fe2057 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 9eb9d3d03..da4dfe1b9 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/DOM.h b/src/DOM.h
index 9a4696996..65601888e 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 91e9c31c9..89a75d8a4 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/Eval.h b/src/Eval.h
index dabf2ccdd..94d645b3c 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 5be928cc6..2b36b28ea 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Filter.h b/src/Filter.h
index 48a2f9c32..be74f4d84 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 944e7a0bd..57a14d91b 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Hooks.h b/src/Hooks.h
index f25915a69..bfc484cc4 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index e7dea9071..b6372b29d 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/Lexer.h b/src/Lexer.h
index faab3848e..410843335 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 3a6b4cdc2..3c5117ca4 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/TDB2.h b/src/TDB2.h
index 6ca31bade..ca2db5193 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index ce42cc1cd..5e94f43cc 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/TLSClient.h b/src/TLSClient.h
index d02a7ae8c..64e01dd3a 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Task.cpp b/src/Task.cpp
index ab4423415..210bc0685 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Task.h b/src/Task.h
index a159a3bab..88180ffe6 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 050d7f516..81e517d9d 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/Variant.h b/src/Variant.h
index dd523710e..8cc566a0e 100644
--- a/src/Variant.h
+++ b/src/Variant.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2018, 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
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 6c7017409..cb10653c7 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/ViewTask.h b/src/ViewTask.h
index 58396908b..89789c436 100644
--- a/src/ViewTask.h
+++ b/src/ViewTask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/calc.cpp b/src/calc.cpp
index 2a665b3c6..9016f3f38 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 1f256c086..22e0934b1 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index a0bc87395..4b3efde46 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 1464592aa..116dc78fb 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index 0aeb49fe4..926827065 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index d64b7788b..5a81f4d98 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 3b0e1b7b2..ea5fb98fe 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index fcc4aee47..e945e5d1b 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index e35ac4e55..c06e8a661 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index a28ee3603..b1400e53b 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index a729ae732..3700d0aad 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 28d934fa0..ba96bbe86 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 88ee3ea22..c0f880435 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 1b9c75066..4fab12430 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index 5d5200cb5..86e169d64 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 25858ceae..48db2feb5 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index 7603998f3..c2429e4ac 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index 97f8cc4bf..a61dcba0d 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index a1768f9b8..19d485fd0 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 1a18e61aa..c8d641add 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index 5400776b9..518819916 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index d5141e9f1..d93643bd0 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index e08f74aab..d9e03869d 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 07aa87702..27bbc40fb 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index 14a462427..b3205e341 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index f7e726cc1..1c8f730e9 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index d1aa6de31..031d11916 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 86929da46..eb27cd3a2 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index 2ef61ca5c..1baf9cf24 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 9b41ac303..7c041232f 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index ebd02855b..a2534ea28 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index a76779059..749c17075 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index b980881e9..fcd409718 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 822e8e8ac..1da66eb51 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index 7480fcac5..732c007ea 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index bff60f734..8bf134678 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index f1f81a131..a5a657933 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index e6153bfd4..63db93260 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index 52e1b5de2..b44cc3d4e 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index ba971c2aa..4725b89d1 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index 8bc0c490d..dc306716b 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 95175ba68..b991eb183 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 6bf3b4d1e..f76da0702 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 93fcec9d0..5583e7086 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index 984d80b76..84258eb0e 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index f66ba288c..c233d85d9 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index 7bbcc7c36..2ee0bf7fa 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 16d7725a0..d492d4b0d 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 265bc0817..5f1733c66 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index 2275c1fc7..6d255275b 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index 890f74fb4..0de886ab7 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 685a2cf1f..6e1280328 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/columns/Column.h b/src/columns/Column.h
index 9290d7a21..a276763f3 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 9d08287b6..a7ba6a478 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAdd.h b/src/commands/CmdAdd.h
index a94f3fe17..8f7363984 100644
--- a/src/commands/CmdAdd.h
+++ b/src/commands/CmdAdd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 37b5f8993..9a5effbb7 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAliases.h b/src/commands/CmdAliases.h
index 8ea22d1b8..0b86ac2ca 100644
--- a/src/commands/CmdAliases.h
+++ b/src/commands/CmdAliases.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 1de036853..1ae5b1c9e 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAnnotate.h b/src/commands/CmdAnnotate.h
index cefababfa..4ea691bbf 100644
--- a/src/commands/CmdAnnotate.h
+++ b/src/commands/CmdAnnotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index d564d4ea8..893d9a46c 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAppend.h b/src/commands/CmdAppend.h
index 9de8d8002..35818480c 100644
--- a/src/commands/CmdAppend.h
+++ b/src/commands/CmdAppend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 8c07eafce..489112f60 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdAttributes.h b/src/commands/CmdAttributes.h
index 9199caab0..3e6526f0a 100644
--- a/src/commands/CmdAttributes.h
+++ b/src/commands/CmdAttributes.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index d1500fd68..ec463781a 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdBurndown.h b/src/commands/CmdBurndown.h
index 3eff45fac..1c1e6d192 100644
--- a/src/commands/CmdBurndown.h
+++ b/src/commands/CmdBurndown.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index b812bbde7..32b540409 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCalc.h b/src/commands/CmdCalc.h
index a064aef2b..ba7776e5a 100644
--- a/src/commands/CmdCalc.h
+++ b/src/commands/CmdCalc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index f3b221c57..6ddfd3c64 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index 4c4033a79..6276b2389 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 7bce8376d..f79e97562 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdColor.h b/src/commands/CmdColor.h
index 94481cbcf..d0160ab38 100644
--- a/src/commands/CmdColor.h
+++ b/src/commands/CmdColor.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 28d3113ee..ef923f96e 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdColumns.h b/src/commands/CmdColumns.h
index c52eef2b0..8a16d2edd 100644
--- a/src/commands/CmdColumns.h
+++ b/src/commands/CmdColumns.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 6b62aefc9..3ad08e13e 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCommands.h b/src/commands/CmdCommands.h
index 1544641c0..1468ffbfe 100644
--- a/src/commands/CmdCommands.h
+++ b/src/commands/CmdCommands.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index b0c83836d..dd913740e 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 4e4ee4bda..3db265547 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 4ee5cf3ee..2b63d277b 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdContext.h b/src/commands/CmdContext.h
index b74f2af2b..9a7d611d5 100644
--- a/src/commands/CmdContext.h
+++ b/src/commands/CmdContext.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 005f735fd..8ed278f42 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCount.h b/src/commands/CmdCount.h
index 395ac2601..67b5e5184 100644
--- a/src/commands/CmdCount.h
+++ b/src/commands/CmdCount.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index ffe789a20..ba53b3dd2 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h
index a21688249..73337e4b6 100644
--- a/src/commands/CmdCustom.h
+++ b/src/commands/CmdCustom.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index d524efd55..17e0cadca 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDelete.h b/src/commands/CmdDelete.h
index 22662bc72..8ebefcccb 100644
--- a/src/commands/CmdDelete.h
+++ b/src/commands/CmdDelete.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index d5c92b4a2..8da869b21 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDenotate.h b/src/commands/CmdDenotate.h
index aa3cc74cc..f07c674da 100644
--- a/src/commands/CmdDenotate.h
+++ b/src/commands/CmdDenotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index bcc0f431e..db5f4cc31 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDiagnostics.h b/src/commands/CmdDiagnostics.h
index d537c38e2..c19e74ecf 100644
--- a/src/commands/CmdDiagnostics.h
+++ b/src/commands/CmdDiagnostics.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index b42f7fea9..0d591f022 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDone.h b/src/commands/CmdDone.h
index 9c5923e81..2e76e5097 100644
--- a/src/commands/CmdDone.h
+++ b/src/commands/CmdDone.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 94df029ce..0baefe1b9 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdDuplicate.h b/src/commands/CmdDuplicate.h
index 0ef5ce9bf..6b749d113 100644
--- a/src/commands/CmdDuplicate.h
+++ b/src/commands/CmdDuplicate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 748844ebd..adc61145d 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdEdit.h b/src/commands/CmdEdit.h
index 0bc492015..48d6e874e 100644
--- a/src/commands/CmdEdit.h
+++ b/src/commands/CmdEdit.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 66b37a03c..9925b50c1 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h
index e4dba1cb7..3d59b89e3 100644
--- a/src/commands/CmdExec.h
+++ b/src/commands/CmdExec.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 4dbb2641d..b25e79a9c 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdExport.h b/src/commands/CmdExport.h
index ed080c8ba..7e44b53a1 100644
--- a/src/commands/CmdExport.h
+++ b/src/commands/CmdExport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 377c7a5b3..aac14bfc5 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdGet.h b/src/commands/CmdGet.h
index d1c558ff5..870d22d9f 100644
--- a/src/commands/CmdGet.h
+++ b/src/commands/CmdGet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index fe2eca5bc..36c80680d 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h
index b4ce7e4e4..7241ca1eb 100644
--- a/src/commands/CmdHelp.h
+++ b/src/commands/CmdHelp.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 455cad6a6..2f0da9546 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index b95f6c907..d94eeaf95 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index f9c134a20..aab231093 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdIDs.h b/src/commands/CmdIDs.h
index c39be6ee9..4557532eb 100644
--- a/src/commands/CmdIDs.h
+++ b/src/commands/CmdIDs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index c54fc38b0..bacec9dd3 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdImport.h b/src/commands/CmdImport.h
index 04b2963d0..cb32da704 100644
--- a/src/commands/CmdImport.h
+++ b/src/commands/CmdImport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 2d68813ea..bf2de67ba 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index ad38d4a9e..9c2dd9358 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index c4db8ef48..2a20f7fef 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdLog.h b/src/commands/CmdLog.h
index d3c4682ba..28df12d79 100644
--- a/src/commands/CmdLog.h
+++ b/src/commands/CmdLog.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 801f5ea6f..b495038cf 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h
index 5c6a5ee62..2bcd22216 100644
--- a/src/commands/CmdLogo.h
+++ b/src/commands/CmdLogo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index e1ebdb254..da55775d7 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index 0a1ac32d0..e5e65ecae 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 03657be5e..91bfe4a1e 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdPrepend.h b/src/commands/CmdPrepend.h
index d7704b36e..687dbf9f7 100644
--- a/src/commands/CmdPrepend.h
+++ b/src/commands/CmdPrepend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 344ae6c6c..c9d07fcb5 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdProjects.h b/src/commands/CmdProjects.h
index 7e8f215ff..2a5934681 100644
--- a/src/commands/CmdProjects.h
+++ b/src/commands/CmdProjects.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index f498bd6b7..55d3dc758 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index be3bc340a..e4ef797fb 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index bc812167b..3b3dff41e 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdReports.h b/src/commands/CmdReports.h
index c12b87b59..5c12a72b6 100644
--- a/src/commands/CmdReports.h
+++ b/src/commands/CmdReports.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index fb4ac4798..d74694095 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h
index 26ea77f05..0fa553642 100644
--- a/src/commands/CmdShow.h
+++ b/src/commands/CmdShow.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 860c3ad16..d813c8adf 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStart.h b/src/commands/CmdStart.h
index c2624e8ea..04d499148 100644
--- a/src/commands/CmdStart.h
+++ b/src/commands/CmdStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 89afb18aa..4d9dddeca 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStats.h b/src/commands/CmdStats.h
index 59fd333f7..fbe8d520a 100644
--- a/src/commands/CmdStats.h
+++ b/src/commands/CmdStats.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index b95e8e4ff..b7acbbbcf 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdStop.h b/src/commands/CmdStop.h
index 4acfb06eb..2e8212755 100644
--- a/src/commands/CmdStop.h
+++ b/src/commands/CmdStop.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 617813b3f..0b4ecb9bc 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdSummary.h b/src/commands/CmdSummary.h
index 14b1dab22..c1a62461e 100644
--- a/src/commands/CmdSummary.h
+++ b/src/commands/CmdSummary.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 282532227..670aecc53 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdSync.h b/src/commands/CmdSync.h
index fa53b9f33..551b5d5b6 100644
--- a/src/commands/CmdSync.h
+++ b/src/commands/CmdSync.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index cf99284cc..0dd0302fb 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h
index ab3bcb607..086124fab 100644
--- a/src/commands/CmdTags.h
+++ b/src/commands/CmdTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 3ef082e13..152b4ae6d 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdTimesheet.h b/src/commands/CmdTimesheet.h
index 70cec4727..15d0ad4f4 100644
--- a/src/commands/CmdTimesheet.h
+++ b/src/commands/CmdTimesheet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 647a1548a..62534f371 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUDAs.h b/src/commands/CmdUDAs.h
index a8ef9cec1..dbce4df71 100644
--- a/src/commands/CmdUDAs.h
+++ b/src/commands/CmdUDAs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index c73a09ec1..c2bd3122a 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUndo.h b/src/commands/CmdUndo.h
index 3042e3921..75dda965b 100644
--- a/src/commands/CmdUndo.h
+++ b/src/commands/CmdUndo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index f215e3a58..41366892e 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUnique.h b/src/commands/CmdUnique.h
index 09a9b233f..e0e390d87 100644
--- a/src/commands/CmdUnique.h
+++ b/src/commands/CmdUnique.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 1e6c8dcb9..e07dd08e6 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdUrgency.h b/src/commands/CmdUrgency.h
index 74f035dde..a885a1007 100644
--- a/src/commands/CmdUrgency.h
+++ b/src/commands/CmdUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index ae8640652..192ae1ed5 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h
index 279bef78b..882f60278 100644
--- a/src/commands/CmdVersion.h
+++ b/src/commands/CmdVersion.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index e060f5ca9..ac964b3db 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/commands/Command.h b/src/commands/Command.h
index 449ce8f39..7fe10b721 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 2836bddaf..2b2fa4794 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 4e57b251a..b1ce7f688 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/i18n.h b/src/i18n.h
index 4bad52977..205d9d7ea 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 9de02c5a6..d68d51850 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2}, gebaut für "
 #define STRING_CMD_VERSION_UNKNOWN   "unbekannt"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Zeigt das taskwarrior-Logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "Der Logo-Befehle benötigt aktivierte Farbunterstützung"
 #define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 61b03c354..6bf1385b3 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Displays the Taskwarrior logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "The logo command requires that color support is enabled."
 #define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 6f2413b59..35fa9c39c 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4d032f262..9b5733624 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -204,7 +204,7 @@
 #define STRING_CMD_VERSION_DOCS      "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-color', y 'man task-sync' o en http://taskwarrior.org."
 #define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconocido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."  // |esp-ESP|==|eng-USA|
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."  // |esp-ESP|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Muestra el logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "El comando logo requiere que el soporte de color esté habilitado."
 #define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 36786aefa..799cdbd60 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} compilé pour "
 #define STRING_CMD_VERSION_UNKNOWN   "inconnu"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Affiche le logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "La commande logo nécessite le support des couleurs."
 #define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 3a7b47ed7..0a0167e49 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -202,7 +202,7 @@
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} generato per "
 #define STRING_CMD_VERSION_UNKNOWN   "sconosciuto"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Mostra il logo di Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Il comando logo richiede l'abilitazione del supporto ai colori."
 #define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 8bb2b7ebf..5621aff63 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Taskwarrior ロゴの表示"
 #define STRING_CMD_LOGO_COLOR_REQ    "色のサポートをする logo コマンドが有効になりました。"
 #define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 4ec5205ca..380ceec98 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -1,6 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
+2018////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} zbudowane dla "
 #define STRING_CMD_VERSION_UNKNOWN   "nieznana"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Wyświetla logo Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Polecenie logo wymaga wsparcia kolorowania."
 #define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 777df615b..b83fbb2e4 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
@@ -203,7 +203,7 @@
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
 #define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconhecido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2017 P. Beckingham, F. Hernandez."  // |por-PRT|==|eng-USA|
+#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."  // |por-PRT|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Exibe o logotipo do Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "O comando logo requer que o suporte de cor seja ativado."
 #define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
diff --git a/src/legacy.cpp b/src/legacy.cpp
index b52cb0d39..5c2cc44f7 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/main.cpp b/src/main.cpp
index c96e31261..c0f3a0a2c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/main.h b/src/main.h
index 650aef1b8..d7f8ad25a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/nag.cpp b/src/nag.cpp
index 2a5bc0faf..ab0a7b209 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/recur.cpp b/src/recur.cpp
index 427d51a48..32a80b140 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/rules.cpp b/src/rules.cpp
index bba2451b6..ae4df2db1 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/sort.cpp b/src/sort.cpp
index 9ffd6a7b4..c673b8306 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/util.cpp b/src/util.cpp
index 0c0fb6473..e83cef1a2 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/src/util.h b/src/util.h
index a1b038ec5..d91314a6e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/abbreviation.t b/test/abbreviation.t
index 5165390c4..cec801c9f 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/add.t b/test/add.t
index c2d240b9a..0ec10f816 100755
--- a/test/add.t
+++ b/test/add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/alias.t b/test/alias.t
index 592a3830f..d147b44f1 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/annotate.t b/test/annotate.t
index d72820e4a..49ed0f40d 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/append.t b/test/append.t
index 7efe688aa..f06b9717a 100755
--- a/test/append.t
+++ b/test/append.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/args.t b/test/args.t
index d0013c5dc..f8c328d95 100755
--- a/test/args.t
+++ b/test/args.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/backlog.t b/test/backlog.t
index f88abca30..0c4bd1cfb 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/bash_completion.t b/test/bash_completion.t
index 32b3ddc59..b4e01cb75 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/bash_tap.sh b/test/bash_tap.sh
index 45a0d946b..b9dce0f7c 100644
--- a/test/bash_tap.sh
+++ b/test/bash_tap.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # For more information, see https://github.com/wbsch/bash_tap
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2017 Wilhelm Schürmann
+# Copyright (c) 2015-2018 Wilhelm Schürmann
 
 function bashtap_on_error {
     # A command in the parent script failed, interpret this as a test failure.
diff --git a/test/bash_tap_tw.sh b/test/bash_tap_tw.sh
index 9ee68be95..0c7a10935 100644
--- a/test/bash_tap_tw.sh
+++ b/test/bash_tap_tw.sh
@@ -9,7 +9,7 @@
 # appended to or changed as needed.
 #
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2017 Wilhelm Schürmann
+# Copyright (c) 2015-2018 Wilhelm Schürmann
 
 function setup_taskrc {
     # Configuration
diff --git a/test/blocked.t b/test/blocked.t
index 6ad53fa13..2561df130 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/bulk.t b/test/bulk.t
index 16c97a577..45890a676 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/burndown.t b/test/burndown.t
index cc26f7e59..c976719a1 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/calc.t b/test/calc.t
index 82c375338..cebaae1a9 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/calendar.t b/test/calendar.t
index ee650c762..29f7d8ed9 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/caseless.t b/test/caseless.t
index c2fb8d2ad..8ac5c4e99 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/col.t.cpp b/test/col.t.cpp
index 3fdc97c56..e750239e8 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 5d07267c3..f29afe5df 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/color.rules.t b/test/color.rules.t
index 75f51d8f5..f35c6ba18 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/columns.t b/test/columns.t
index a70a2e561..9573c11a3 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/commands.t b/test/commands.t
index c4f87a490..aa950a7f6 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/completed.t b/test/completed.t
index 381acac37..816f8ef15 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/configuration.t b/test/configuration.t
index 3aacce6e7..6ecca25e0 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/confirmation.t b/test/confirmation.t
index 7f21abaeb..7d311fc36 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/context.t b/test/context.t
index 1883d2bce..c0495b200 100755
--- a/test/context.t
+++ b/test/context.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/count.t b/test/count.t
index 49656e072..55a2fae66 100755
--- a/test/count.t
+++ b/test/count.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/custom.config.t b/test/custom.config.t
index ad8e0bbb1..cdf8690e2 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index 0a5752b5a..b1c4d3471 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/custom.t b/test/custom.t
index e99cd5af4..f3d8d416d 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index 533be0045..b4aa37b77 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/date.iso.t b/test/date.iso.t
index 3993c68f4..89cda212d 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/dateformat.t b/test/dateformat.t
index 3fdfeb53d..cfa70f7c1 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/datesort.t b/test/datesort.t
index 9008a505c..03ac1d429 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index 1d8783f79..fce9a7370 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/debug.t b/test/debug.t
index 238daf388..6193f70c1 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/default.t b/test/default.t
index af583cd8e..ac50548b3 100755
--- a/test/default.t
+++ b/test/default.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/delete.t b/test/delete.t
index a40242bae..419f2f64e 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/denotate.t b/test/denotate.t
index 5d93e3943..fb52a4123 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/dependencies.t b/test/dependencies.t
index e43e599d7..3c4519bcd 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/diag.t b/test/diag.t
index 38bb60bff..2360e4936 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/diag_color.t b/test/diag_color.t
index 1f653c379..ab4f19f9c 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index cd2fd5a10..5296282dc 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/dom2.t b/test/dom2.t
index aedf4fb49..3c960f709 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/due.t b/test/due.t
index 89b000663..9197fb249 100755
--- a/test/due.t
+++ b/test/due.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/duplicate.t b/test/duplicate.t
index 43ddd820d..36294a828 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/edit.t b/test/edit.t
index f733addb0..050d2a54a 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/encoding.t b/test/encoding.t
index f166b706c..1ad71bd20 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/enpassant.t b/test/enpassant.t
index 64fec25c0..e06340a80 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 474dff715..53f485224 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/exec.t b/test/exec.t
index d0ed9436a..9e123158b 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/export.t b/test/export.t
index 87160a10a..8cc7318c5 100755
--- a/test/export.t
+++ b/test/export.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/feature.559.t b/test/feature.559.t
index 043f3929f..84023499c 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index 76c87118f..f1df831bd 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 2955292ee..56dc7e0c0 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 3ce5a2362..780d8f858 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/feedback.t b/test/feedback.t
index 4538962e5..5dc9b7fe9 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/filter.t b/test/filter.t
index 620e008bb..97afdff7d 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/fontunderline.t b/test/fontunderline.t
index d84bc6c2a..5dda96366 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/format.t b/test/format.t
index 69b53f0be..ee2a38b6c 100755
--- a/test/format.t
+++ b/test/format.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/gc.t b/test/gc.t
index aa2896398..510f0bf64 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/helpers.t b/test/helpers.t
index 99c65a90c..e6e829652 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/history.t b/test/history.t
index 329ccb433..56b7f688c 100755
--- a/test/history.t
+++ b/test/history.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hooks.env.t b/test/hooks.env.t
index b5881a072..4b027e760 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index ad5a2abd1..73f26b91e 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index 3a3cadd85..d88cb4732 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 3c577310f..8b8fc2c37 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index bf9a40a01..995dda703 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/hyphenate.t b/test/hyphenate.t
index 294bf9dca..173840522 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/ids.t b/test/ids.t
index 849a5c30d..53999d1d0 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/import.t b/test/import.t
index 50aa0e356..243676c9a 100755
--- a/test/import.t
+++ b/test/import.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/info.t b/test/info.t
index 00b293b2f..2fe7fdde1 100755
--- a/test/info.t
+++ b/test/info.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index f8aaa1299..cc0c2747d 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/limit.t b/test/limit.t
index 518bcd4b1..3c0c94901 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 693646bf4..83ab40cfd 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/log.t b/test/log.t
index b53a1556a..de534ecc9 100755
--- a/test/log.t
+++ b/test/log.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/logo.t b/test/logo.t
index a0d75ad92..1e69b6c7a 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/math.t b/test/math.t
index a5700646f..e7e1e2b3a 100755
--- a/test/math.t
+++ b/test/math.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/modify.t b/test/modify.t
index 59937d160..1f2296d74 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/nag.t b/test/nag.t
index faff5e603..1b6424c77 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/obfuscate.t b/test/obfuscate.t
index 8a569854c..487d84107 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/oldest.t b/test/oldest.t
index 40f23f956..81607f3ab 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/operators.t b/test/operators.t
index a885bb626..71642876b 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/overdue.t b/test/overdue.t
index 4dc6e334a..591f09aaa 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/partial.t b/test/partial.t
index b7e49ee7d..fcf342c3c 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/prepend.t b/test/prepend.t
index 1c52a03e2..5019c3236 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/pri_sort.t b/test/pri_sort.t
index 15390a99a..68f3bce03 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/project.t b/test/project.t
index f3b6665b3..41d1815cc 100755
--- a/test/project.t
+++ b/test/project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/purge.t b/test/purge.t
index 186314e62..646a3c76a 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/quotes.t b/test/quotes.t
index 7e980b0e9..5c550c6ea 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/rc.override.t b/test/rc.override.t
index d4a34abbe..111b34daa 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/recurrence.t b/test/recurrence.t
index c46a09ea5..291ac44fc 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/reports.t b/test/reports.t
index 03bd8cc22..098592902 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/search.t b/test/search.t
index 4d5d0e26f..544d119dd 100755
--- a/test/search.t
+++ b/test/search.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/sequence.t b/test/sequence.t
index ef8d84fde..eac71a0e7 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/shell.t b/test/shell.t
index 0ffd6d611..a01857963 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/show.t b/test/show.t
index 6139af251..a99b2aad8 100755
--- a/test/show.t
+++ b/test/show.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index 6ab4c7fa4..110ae8417 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -1,7 +1,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/sorting.t b/test/sorting.t
index 824b309f0..1d9cc9031 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/special.t b/test/special.t
index ebcbeba28..d62547df5 100755
--- a/test/special.t
+++ b/test/special.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/start.t b/test/start.t
index 7e1e9ad3e..46209704c 100755
--- a/test/start.t
+++ b/test/start.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/stats.t b/test/stats.t
index 1ed3a66c5..ceaf0905b 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/substitute.t b/test/substitute.t
index b1f5290a0..e2bf66080 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/sugar.t b/test/sugar.t
index 39fb45077..d8c07f31b 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/summary.t b/test/summary.t
index cd5c3d2c0..a038e1e8c 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/t.t.cpp b/test/t.t.cpp
index 0508284bb..d6628ed8f 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/tag.t b/test/tag.t
index 231702d54..681b76c2f 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/taskrc.t b/test/taskrc.t
index 384fb67f6..bba5008c1 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index bd6944627..001a09cb0 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/template.t b/test/template.t
index c0bb27679..f7a227a2a 100644
--- a/test/template.t
+++ b/test/template.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/test.cpp b/test/test.cpp
index 891f70c8d..299214731 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/test.h b/test/test.h
index fa65f9bbd..557d9f06d 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/timesheet.t b/test/timesheet.t
index 28796fdf5..b3c0fa610 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-1379.t b/test/tw-1379.t
index a73a9e613..093566254 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-1837.t b/test/tw-1837.t
index 44fb5e548..8d4521d9d 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-20.t b/test/tw-20.t
index 06b3d5bff..e824cd95f 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-262.t b/test/tw-262.t
index 3a7ffca0e..cbba7a877 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-295.t b/test/tw-295.t
index 1b41b222a..65237fb9e 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/tw-46.t b/test/tw-46.t
index dc97402bc..45926bc48 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/uda.t b/test/uda.t
index a42d07417..1cbae6120 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index 914c6e4c5..bfbe9833a 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/uda_report.t b/test/uda_report.t
index 03b9e89a4..d508b8963 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/uda_sort.t b/test/uda_sort.t
index d940a9915..7f74f50b3 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/undo.t b/test/undo.t
index 71f0b23d3..163f88935 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/unicode.t b/test/unicode.t
index 6d02ba3a6..f72b48db7 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/unique.t b/test/unique.t
index 6bf56514c..bf390d089 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/upgrade.t b/test/upgrade.t
index 75d0c9b40..daf3f5ffe 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/urgency.t b/test/urgency.t
index 9b2e8b518..6a29c4191 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index bd55503fa..4c3f77fc6 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 8c0b04b70..3acd11322 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/uuid.t b/test/uuid.t
index 674d07bc5..576ad2f2c 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index 7521888ae..b0b1bf6f7 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index b80553fef..2055bb870 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 0b729c0aa..864e5783f 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index aa821ae6c..1699b942a 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index 47c406fae..21c9c2aa0 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index ffe8820a7..1514a0ebc 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index 847b7f745..9e641da61 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index 620412907..bbd718535 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index 250d72b50..ef6c84790 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index e4836f691..0804d50b2 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index f2fd91da1..9c02aabe3 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index ea7c6b453..54e64f4d0 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index 11471ea4b..5c08da02a 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index 47f552fab..5a807d2b7 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018 Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index f8e278f70..1c006c1f8 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index eb06bb23b..2f22fa3d8 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index 7d8343479..bf378fe11 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index b6b588246..d96d128aa 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index 187c04ec0..ee4086494 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index d8e8cc7f2..83e1c2b07 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index e7417ff9f..154e287ca 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2017, Göteborg Bit Factory.
+// Copyright 2013 - 2018, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/verbose.t b/test/verbose.t
index 36ce1188d..aab5a65ca 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/version.t b/test/version.t
index 5f9e93388..557c72064 100755
--- a/test/version.t
+++ b/test/version.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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
diff --git a/test/view.t.cpp b/test/view.t.cpp
index d3b66a874..45623fa8e 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2018, 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
diff --git a/test/wait.t b/test/wait.t
index 81dbe50cb..5aa89d83b 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2018, 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

From f24ea5e56cbf4c91532aade479ee8301a8b8be70 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 31 Dec 2017 19:39:51 -0500
Subject: [PATCH 564/879] libshared: Updated to
 1fa5dcbf53a280857e35436aef6beb6a37266e33

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 198dcd368..1fa5dcbf5 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 198dcd368501076fe31b22d828ae72066d0e6291
+Subproject commit 1fa5dcbf53a280857e35436aef6beb6a37266e33

From 798cd5b658cd16a85ada92ff8901bf53eef5fd94 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Jan 2018 12:57:21 -0500
Subject: [PATCH 565/879] l10n removal of STRING_UNKNOWN_ERROR

---
 src/CLI2.cpp       | 4 ++--
 src/Context.cpp    | 4 ++--
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/main.cpp       | 3 +--
 12 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 67b175660..ff7e5bca8 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -969,7 +969,7 @@ void CLI2::categorizeArgs ()
                cmd->accepts_miscellaneous ())
     {
       // Error: internally inconsistent.
-      throw std::string (STRING_UNKNOWN_ERROR);
+      throw std::string ("Unknown error. Please report.");
     }
     else if (cmd                             &&
                cmd->accepts_filter ()        &&
@@ -1009,7 +1009,7 @@ void CLI2::categorizeArgs ()
                cmd->accepts_miscellaneous ())
     {
       // Error: internally inconsistent.
-      throw std::string (STRING_UNKNOWN_ERROR);
+      throw std::string ("Unknown error. Please report.");
     }
   }
 
diff --git a/src/Context.cpp b/src/Context.cpp
index eb4a2f824..24a70389d 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -595,7 +595,7 @@ int Context::initialize (int argc, const char** argv)
 
   catch (...)
   {
-    error (STRING_UNKNOWN_ERROR);
+    error ("Unknown error. Please report.");
     rc = 3;
   }
 
@@ -708,7 +708,7 @@ int Context::run ()
 
   catch (...)
   {
-    error (STRING_UNKNOWN_ERROR);
+    error ("Unknown error. Please report.");
     rc = 3;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d68d51850..896b03ef3 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -699,7 +699,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Fehler: "
-#define STRING_UNKNOWN_ERROR         "Unbekannter Fehler."
 #define STRING_TRIVIAL_INPUT         "Sie müssen einen Befehl oder eine Aufgabe zum ändern angeben."
 #define STRING_ASSUME_INFO           "Kein Befehl angegeben - nehme 'information' an."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6bf1385b3..49315b12c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -697,7 +697,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "
-#define STRING_UNKNOWN_ERROR         "Unknown error. Please report."
 #define STRING_TRIVIAL_INPUT         "You must specify a command or a task to modify."
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 35fa9c39c..5e16dccf8 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -699,7 +699,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Eraro: "
-#define STRING_UNKNOWN_ERROR         "Eraro nekonata."
 #define STRING_TRIVIAL_INPUT         "Oni devas specifi komandon, aŭ taskon ke vi volas modifi."
 #define STRING_ASSUME_INFO           "Nenia komando specifita.  Supozanta 'information'."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 9b5733624..a2adea6a8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -711,7 +711,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "  // |esp-ESP|==|eng-USA|
-#define STRING_UNKNOWN_ERROR         "Error desconocido."
 #define STRING_TRIVIAL_INPUT         "Debe especificar un comando o una tarea a modificar."
 #define STRING_ASSUME_INFO           "No especificó un comando - asumido 'information'."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 799cdbd60..3b5197b06 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -701,7 +701,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erreur : "
-#define STRING_UNKNOWN_ERROR         "Erreur inconnue."
 #define STRING_TRIVIAL_INPUT         "Il vous faut spécifier une commande ou une tâche à modifier."
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0a0167e49..2e4c515e4 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -700,7 +700,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Errore: "
-#define STRING_UNKNOWN_ERROR         "Errore sconosciuto."
 #define STRING_TRIVIAL_INPUT         "Specificare un comando o un task da modificare"
 #define STRING_ASSUME_INFO           "Nessun comando specificato - si assume 'information'."
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5621aff63..102f400e5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -701,7 +701,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "エラー: "
-#define STRING_UNKNOWN_ERROR         "不明なエラー。"
 #define STRING_TRIVIAL_INPUT         "変更したいコマンドまたはタスクを指定しなければなりません。"
 #define STRING_ASSUME_INFO           "コマンドが指定されていません - 'information' を仮定します。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 380ceec98..cdc5e78cf 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -701,7 +701,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Błąd: "
-#define STRING_UNKNOWN_ERROR         "Nieznany błąd."
 #define STRING_TRIVIAL_INPUT         "Musisz podać polecenie lub zadanie do zmiany."
 #define STRING_ASSUME_INFO           "Nie podano polecenia - zakładam 'information'."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index b83fbb2e4..2175abf51 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -701,7 +701,6 @@
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erro: "
-#define STRING_UNKNOWN_ERROR         "Erro desconhecido."
 #define STRING_TRIVIAL_INPUT         "Deve específicar um comando ou a tarefa a modificar."
 #define STRING_ASSUME_INFO           "Nenhum comando especificado - assumindo 'information'."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
diff --git a/src/main.cpp b/src/main.cpp
index c0f3a0a2c..0c5133185 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,7 +28,6 @@
 #include <iostream>
 #include <new>
 #include <cstring>
-#include <i18n.h>
 #include <Context.h>
 
 Context context;
@@ -66,7 +65,7 @@ int main (int argc, const char** argv)
 
     catch (...)
     {
-      std::cerr << STRING_UNKNOWN_ERROR << "\n";
+      std::cerr << "Unknown error. Please report.\n";
       status = -2;
     }
   }

From 3f14491e31431b3153fc01a9ad5c83499963084e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Jan 2018 13:10:52 -0500
Subject: [PATCH 566/879] l10n removal of STRING_UDA_NUMERIC

---
 src/columns/ColTypeNumeric.cpp | 3 +--
 src/commands/CmdEdit.cpp       | 2 +-
 src/l10n/deu-DEU.h             | 1 -
 src/l10n/eng-USA.h             | 1 -
 src/l10n/epo-RUS.h             | 1 -
 src/l10n/esp-ESP.h             | 1 -
 src/l10n/fra-FRA.h             | 1 -
 src/l10n/ita-ITA.h             | 1 -
 src/l10n/jpn-JPN.h             | 1 -
 src/l10n/pol-POL.h             | 1 -
 src/l10n/por-PRT.h             | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 63db93260..5d72a269f 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -31,7 +31,6 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 extern Task& contextTask;
@@ -72,7 +71,7 @@ void ColumnTypeNumeric::modify (Task& task, const std::string& value)
   // If the result is not readily convertible to a numeric value, then this is
   // an error.
   if (evaluatedValue.type () == Variant::type_string)
-    throw format (STRING_UDA_NUMERIC, evaluatedValue.get_string ());
+    throw format ("The value '{1}' is not a valid numeric value.", evaluatedValue.get_string ());
 
   task.set (_name, evaluatedValue);
 }
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index adc61145d..eb9149bb3 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -681,7 +681,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
                 pig.eos ())
               task.set (col.first, value);
             else
-              throw format (STRING_UDA_NUMERIC, value);
+              throw format ("The value '{1}' is not a valid numeric value.", value);
           }
           else if (type == "date")
           {
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 896b03ef3..03055a9b1 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -703,7 +703,6 @@
 #define STRING_ASSUME_INFO           "Kein Befehl angegeben - nehme 'information' an."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
-#define STRING_UDA_NUMERIC           "Der Wert '{1}' ist kein zulässiger Zahlenwert."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_INVALID_SORT_COL      "Nach Spalte '{1}' kann nicht sortiert weden."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 49315b12c..22c31daec 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -701,7 +701,6 @@
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 5e16dccf8..9da28c3a3 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -703,7 +703,6 @@
 #define STRING_ASSUME_INFO           "Nenia komando specifita.  Supozanta 'information'."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
-#define STRING_UDA_NUMERIC           "Valoro '{1}' ne estas valida nombra valoro."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_INVALID_SORT_COL      "Kolumno '{1}' ne estas valida kampo por ordigi."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a2adea6a8..4a775a712 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -715,7 +715,6 @@
 #define STRING_ASSUME_INFO           "No especificó un comando - asumido 'information'."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
-#define STRING_UDA_NUMERIC           "El valor '{1}' no es un valor numérico válido."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_INVALID_SORT_COL      "La columna '{1}' no es un campo de ordenación válido."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 3b5197b06..5bdf9c5ae 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -705,7 +705,6 @@
 #define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 2e4c515e4..b8d7e6956 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -704,7 +704,6 @@
 #define STRING_ASSUME_INFO           "Nessun comando specificato - si assume 'information'."
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
-#define STRING_UDA_NUMERIC           "Il valore '{1}' non è un valore numerico valido."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_INVALID_SORT_COL      "La colonna '{1}' non è un campo di ordinamento valido."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 102f400e5..2f0d6238e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -705,7 +705,6 @@
 #define STRING_ASSUME_INFO           "コマンドが指定されていません - 'information' を仮定します。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
-#define STRING_UDA_NUMERIC           "The value '{1}' is not a valid numeric value."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index cdc5e78cf..daf77e345 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -705,7 +705,6 @@
 #define STRING_ASSUME_INFO           "Nie podano polecenia - zakładam 'information'."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
-#define STRING_UDA_NUMERIC           "Wartość '{1}' nie jest poprawną wartością numeryczną."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_INVALID_SORT_COL      "Kolumna '{1}' nie jest poprawnym parametrem sortowania."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 2175abf51..f7c6e38ab 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -705,7 +705,6 @@
 #define STRING_ASSUME_INFO           "Nenhum comando especificado - assumindo 'information'."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
-#define STRING_UDA_NUMERIC           "O valor '{1}' não é um valor numérico válido."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_INVALID_SORT_COL      "A coluna '{1}' não pode ser ordenada."

From b30e19b23c0f10baf8a3b5d24cca451ea2e69739 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Jan 2018 13:37:47 -0500
Subject: [PATCH 567/879] l10n removal of STRING_COLUMN_LABEL_MASK,
 STRING_COLUMN_LABEL_MASK_IDX

---
 src/columns/ColIMask.cpp | 3 +--
 src/columns/ColMask.cpp  | 3 +--
 src/commands/CmdInfo.cpp | 4 ++--
 src/l10n/deu-DEU.h       | 2 --
 src/l10n/eng-USA.h       | 2 --
 src/l10n/epo-RUS.h       | 2 --
 src/l10n/esp-ESP.h       | 2 --
 src/l10n/fra-FRA.h       | 2 --
 src/l10n/ita-ITA.h       | 2 --
 src/l10n/jpn-JPN.h       | 2 --
 src/l10n/pol-POL.h       | 2 --
 src/l10n/por-PRT.h       | 2 --
 12 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 4fab12430..20c574547 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -27,14 +27,13 @@
 #include <cmake.h>
 #include <ColIMask.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnIMask::ColumnIMask ()
 {
   _name       = "imask";
   _style      = "number";
-  _label      = STRING_COLUMN_LABEL_MASK_IDX;
+  _label      = "Mask Index";
   _modifiable = false;
   _styles     = {"number"};
   _examples   = {"12"};
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 48db2feb5..aa029421b 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -27,14 +27,13 @@
 #include <cmake.h>
 #include <ColMask.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnMask::ColumnMask ()
 {
   _name       = "mask";
   _style      = "default";
-  _label      = STRING_COLUMN_LABEL_MASK;
+  _label      = "Mask";
   _modifiable = false;
   _styles     = {"default"};
   _examples   = {"++++---"};
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index bf2de67ba..b66d2687f 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -198,7 +198,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("mask"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_MASK);
+      view.set (row, 0, "Mask");
       view.set (row, 1, task.get ("mask"));
     }
 
@@ -206,7 +206,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("imask"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_MASK_IDX);
+      view.set (row, 0, "Mask Index");
       view.set (row, 1, task.get ("imask"));
     }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 03055a9b1..fb72b5d8f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Wert"
-#define STRING_COLUMN_LABEL_MASK     "Maske"
-#define STRING_COLUMN_LABEL_MASK_IDX "Masken-Index"
 #define STRING_COLUMN_LABEL_PARENT   "Vorgänger-Aufgabe"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_COLUMN   "Spalten"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 22c31daec..d4b8093a3 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_MASK     "Mask"
-#define STRING_COLUMN_LABEL_MASK_IDX "Mask Index"
 #define STRING_COLUMN_LABEL_PARENT   "Parent task"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 9da28c3a3..526073103 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_NAME     "Nomo"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
-#define STRING_COLUMN_LABEL_MASK     "Masko"
-#define STRING_COLUMN_LABEL_MASK_IDX "Mask-indico"
 #define STRING_COLUMN_LABEL_PARENT   "Patra tasko"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4a775a712..071a8bf9e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -156,8 +156,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_NAME     "Nombre"
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_MASK     "Máscara"
-#define STRING_COLUMN_LABEL_MASK_IDX "Máscara de Índice"
 #define STRING_COLUMN_LABEL_PARENT   "Tarea madre"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_COLUMN   "Columnas"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5bdf9c5ae..17bca6dfd 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_NAME     "Nom"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
-#define STRING_COLUMN_LABEL_MASK     "Masque"
-#define STRING_COLUMN_LABEL_MASK_IDX "Indice de masque"
 #define STRING_COLUMN_LABEL_PARENT   "Tâche mère"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b8d7e6956..1b14ab5cb 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
-#define STRING_COLUMN_LABEL_MASK     "Maschera"
-#define STRING_COLUMN_LABEL_MASK_IDX "Indice Maschera"
 #define STRING_COLUMN_LABEL_PARENT   "Task genitore"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonna"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 2f0d6238e..3a14227fc 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_MASK     "Mask"
-#define STRING_COLUMN_LABEL_MASK_IDX "Mask Index"
 #define STRING_COLUMN_LABEL_PARENT   "Parent task"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index daf77e345..5e99261cb 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -155,8 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_NAME     "Nazwa"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
-#define STRING_COLUMN_LABEL_MASK     "Maska"
-#define STRING_COLUMN_LABEL_MASK_IDX "Indeks Maski"
 #define STRING_COLUMN_LABEL_PARENT   "Zadanie rodzic"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f7c6e38ab..e209450f9 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -156,8 +156,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_MASK     "Máscara"
-#define STRING_COLUMN_LABEL_MASK_IDX "Índice de Máscara"
 #define STRING_COLUMN_LABEL_PARENT   "Tarefa mãe"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colunas"

From bfcb3eac4962b68d8a18a69e1bc83ad2ce0a3a2c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 10:53:48 -0500
Subject: [PATCH 568/879] l10n: Eliminated STRING_INVALID_SORT_COL

---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/sort.cpp       | 3 +--
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index fb72b5d8f..86c751ec9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -703,7 +703,6 @@
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
-#define STRING_INVALID_SORT_COL      "Nach Spalte '{1}' kann nicht sortiert weden."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d4b8093a3..9ccfb562a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -701,7 +701,6 @@
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
-#define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 526073103..06a9f12d8 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -703,7 +703,6 @@
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
-#define STRING_INVALID_SORT_COL      "Kolumno '{1}' ne estas valida kampo por ordigi."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 071a8bf9e..e5c2db19b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -715,7 +715,6 @@
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
-#define STRING_INVALID_SORT_COL      "La columna '{1}' no es un campo de ordenación válido."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 17bca6dfd..8e1fc6f17 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -705,7 +705,6 @@
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
-#define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 1b14ab5cb..a6738093c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -704,7 +704,6 @@
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
-#define STRING_INVALID_SORT_COL      "La colonna '{1}' non è un campo di ordinamento valido."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 3a14227fc..246dcac62 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -705,7 +705,6 @@
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
-#define STRING_INVALID_SORT_COL      "The '{1}' column is not a valid sort field."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5e99261cb..be6e281d5 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -705,7 +705,6 @@
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
-#define STRING_INVALID_SORT_COL      "Kolumna '{1}' nie jest poprawnym parametrem sortowania."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e209450f9..d0c5c6261 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -705,7 +705,6 @@
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
-#define STRING_INVALID_SORT_COL      "A coluna '{1}' não pode ser ordenada."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 #define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
diff --git a/src/sort.cpp b/src/sort.cpp
index c673b8306..8dae4a339 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -34,7 +34,6 @@
 #include <Task.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -273,7 +272,7 @@ static bool sort_compare (int left, int right)
       }
     }
     else
-      throw format (STRING_INVALID_SORT_COL, field);
+      throw format ("The '{1}' column is not a valid sort field.", field);
   }
 
   return false;

From 4ad3c48f2d013a146afbdf9a30c98a67a4ea911b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 10:59:25 -0500
Subject: [PATCH 569/879] l10n: Eliminated STRING_DATE_SUNDAY

---
 src/Context.cpp    | 4 +---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 24a70389d..4f57dc1b7 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -121,9 +121,7 @@ std::string configurationDefaults =
   "dateformat.report=                             # Preferred display date format for reports\n"
   "dateformat.annotation=                         # Preferred display date format for annotations\n"
   "date.iso=1                                     # Enable ISO date support\n"
-  "weekstart="
-             STRING_DATE_SUNDAY
-                  "                               # Sunday or Monday only\n"
+  "weekstart=sunday                               # Sunday or Monday only\n"
   "displayweeknumber=1                            # Show week numbers on calendar\n"
   "due=7                                          # Task is considered due in 7 days\n"
   "\n"
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 86c751ec9..821b2ca64 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -602,7 +602,6 @@
 #define STRING_DATE_NOVEMBER         "November"
 #define STRING_DATE_DECEMBER         "Dezember"
 
-#define STRING_DATE_SUNDAY           "Sonntag"
 #define STRING_DATE_MONDAY           "Montag"
 #define STRING_DATE_TUESDAY          "Dienstag"
 #define STRING_DATE_WEDNESDAY        "Mittwoch"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 9ccfb562a..9f8e95477 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -600,7 +600,6 @@
 #define STRING_DATE_NOVEMBER         "november"
 #define STRING_DATE_DECEMBER         "december"
 
-#define STRING_DATE_SUNDAY           "sunday"
 #define STRING_DATE_MONDAY           "monday"
 #define STRING_DATE_TUESDAY          "tuesday"
 #define STRING_DATE_WEDNESDAY        "wednesday"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 06a9f12d8..e14d34f0c 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -602,7 +602,6 @@
 #define STRING_DATE_NOVEMBER         "novembro"
 #define STRING_DATE_DECEMBER         "decembro"
 
-#define STRING_DATE_SUNDAY           "dimanĉo"
 #define STRING_DATE_MONDAY           "lundo"
 #define STRING_DATE_TUESDAY          "mardo"
 #define STRING_DATE_WEDNESDAY        "merkredo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e5c2db19b..af86b5343 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -614,7 +614,6 @@
 #define STRING_DATE_NOVEMBER         "noviembre"
 #define STRING_DATE_DECEMBER         "diciembre"
 
-#define STRING_DATE_SUNDAY           "domingo"
 #define STRING_DATE_MONDAY           "lunes"
 #define STRING_DATE_TUESDAY          "martes"
 #define STRING_DATE_WEDNESDAY        "miércoles"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8e1fc6f17..8bec2d831 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -604,7 +604,6 @@
 #define STRING_DATE_NOVEMBER         "novembre"
 #define STRING_DATE_DECEMBER         "décembre"
 
-#define STRING_DATE_SUNDAY           "dimanche"
 #define STRING_DATE_MONDAY           "lundi"
 #define STRING_DATE_TUESDAY          "mardi"
 #define STRING_DATE_WEDNESDAY        "mercredi"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index a6738093c..ae7744805 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -603,7 +603,6 @@
 #define STRING_DATE_NOVEMBER         "novembre"
 #define STRING_DATE_DECEMBER         "decembre"
 
-#define STRING_DATE_SUNDAY           "domenica"
 #define STRING_DATE_MONDAY           "lunedì"
 #define STRING_DATE_TUESDAY          "martedì"
 #define STRING_DATE_WEDNESDAY        "mercoledì"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 246dcac62..4e9dacfb3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -604,7 +604,6 @@
 #define STRING_DATE_NOVEMBER         "november"
 #define STRING_DATE_DECEMBER         "december"
 
-#define STRING_DATE_SUNDAY           "sunday"
 #define STRING_DATE_MONDAY           "monday"
 #define STRING_DATE_TUESDAY          "tuesday"
 #define STRING_DATE_WEDNESDAY        "wednesday"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index be6e281d5..cb2e082d1 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -604,7 +604,6 @@
 #define STRING_DATE_NOVEMBER         "listopad"
 #define STRING_DATE_DECEMBER         "grudzień"
 
-#define STRING_DATE_SUNDAY           "niedziela"
 #define STRING_DATE_MONDAY           "poniedziałek"
 #define STRING_DATE_TUESDAY          "wtorek"
 #define STRING_DATE_WEDNESDAY        "środa"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d0c5c6261..d489db9f8 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -604,7 +604,6 @@
 #define STRING_DATE_NOVEMBER         "novembro"
 #define STRING_DATE_DECEMBER         "dezembro"
 
-#define STRING_DATE_SUNDAY           "domingo"
 #define STRING_DATE_MONDAY           "segunda-feira"
 #define STRING_DATE_TUESDAY          "terça-feira"
 #define STRING_DATE_WEDNESDAY        "quarta-feira"

From 47e9aa9abbc0523f826c6d5d592f781a830b1d11 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:01:36 -0500
Subject: [PATCH 570/879] l10n: Eliminated STRING_ASSUME_INFO

---
 src/Context.cpp    | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 4f57dc1b7..87cd64d4f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -568,7 +568,7 @@ int Context::initialize (int argc, const char** argv)
       header ("[" + combined + "]");
 
     if (foundAssumed)
-      header (STRING_ASSUME_INFO);
+      header ("No command specified - assuming 'information'.");
 
     ////////////////////////////////////////////////////////////////////////////
     //
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 821b2ca64..83ea0bcfc 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -697,7 +697,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Fehler: "
 #define STRING_TRIVIAL_INPUT         "Sie müssen einen Befehl oder eine Aufgabe zum ändern angeben."
-#define STRING_ASSUME_INFO           "Kein Befehl angegeben - nehme 'information' an."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 9f8e95477..30d8bd494 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -695,7 +695,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "
 #define STRING_TRIVIAL_INPUT         "You must specify a command or a task to modify."
-#define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e14d34f0c..720a9eb85 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -697,7 +697,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Eraro: "
 #define STRING_TRIVIAL_INPUT         "Oni devas specifi komandon, aŭ taskon ke vi volas modifi."
-#define STRING_ASSUME_INFO           "Nenia komando specifita.  Supozanta 'information'."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index af86b5343..85110e266 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -709,7 +709,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "  // |esp-ESP|==|eng-USA|
 #define STRING_TRIVIAL_INPUT         "Debe especificar un comando o una tarea a modificar."
-#define STRING_ASSUME_INFO           "No especificó un comando - asumido 'information'."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8bec2d831..5646699fa 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -699,7 +699,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erreur : "
 #define STRING_TRIVIAL_INPUT         "Il vous faut spécifier une commande ou une tâche à modifier."
-#define STRING_ASSUME_INFO           "No command specified - assuming 'information'."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ae7744805..292f60873 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -698,7 +698,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Errore: "
 #define STRING_TRIVIAL_INPUT         "Specificare un comando o un task da modificare"
-#define STRING_ASSUME_INFO           "Nessun comando specificato - si assume 'information'."
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4e9dacfb3..07ba6ed18 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -699,7 +699,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "エラー: "
 #define STRING_TRIVIAL_INPUT         "変更したいコマンドまたはタスクを指定しなければなりません。"
-#define STRING_ASSUME_INFO           "コマンドが指定されていません - 'information' を仮定します。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index cb2e082d1..3af55116b 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -699,7 +699,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Błąd: "
 #define STRING_TRIVIAL_INPUT         "Musisz podać polecenie lub zadanie do zmiany."
-#define STRING_ASSUME_INFO           "Nie podano polecenia - zakładam 'information'."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d489db9f8..4e1137b47 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -699,7 +699,6 @@
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erro: "
 #define STRING_TRIVIAL_INPUT         "Deve específicar um comando ou a tarefa a modificar."
-#define STRING_ASSUME_INFO           "Nenhum comando especificado - assumindo 'information'."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."

From 487d50448662f91ba95ca8becd1c4aea09276244 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:04:23 -0500
Subject: [PATCH 571/879] l10n: Eliminated STRING_CONFIG_BAD_WRITE

---
 src/Context.cpp    | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 87cd64d4f..1d24ae366 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1125,7 +1125,7 @@ void Context::createDefaultConfig ()
 
     // Write out the new file.
     if (! File::write (rc_file._data, contents.str ()))
-      throw format (STRING_CONFIG_BAD_WRITE, rc_file._data);
+      throw format ("Could not write to '{1}'.", rc_file._data);
   }
 
   // Create data location, if necessary.
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 83ea0bcfc..964bfa8ed 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -575,7 +575,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Konnte eingebundene Datei '{1}' nicht lesen."
 #define STRING_CONFIG_INCLUDE_PATH   "Nur Dateien mit absolutem Pfad können eingebunden werden, nicht '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Fehlerhafter Eintrag '{1}' in Konfigurationsdatei."
-#define STRING_CONFIG_BAD_WRITE      "Konnte '{1}' nicht beschreiben."
 #define STRING_CONFIG_DEPRECATED_COL "Ihre .taskrc-Datei enthält Repots mit veralteten Spalten.  Bitte entfernen Sie entry_time, start_time oder end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Ihre .taskrc-Datei enthält veraltete Optionen:"
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 30d8bd494..ef970a9d9 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -573,7 +573,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_BAD_WRITE      "Could not write to '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 720a9eb85..902890042 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -575,7 +575,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Ne povis legi enkluzivitan dosieron '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Oni sole povas enkluzivi dosierojn kun absoluta pado, ne '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malbone formita enskribo '{1}' en agorda dosiero."
-#define STRING_CONFIG_BAD_WRITE      "Ne povis skribi al '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Via dosiero .taskrc enhavas raportojn kun arkaikaj kolumnoj.  Bonvolu serĉi entry_time, start_time, aŭ end_time ĉe:"
 #define STRING_CONFIG_DEPRECATED_VAR "Via dosiero .taskrc enhavas arkaikajn variablojn:"
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 85110e266..55c34f85d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -587,7 +587,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "No se pudo leer el archivo include '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Sólo se pueden incluir archivos con paths absolutos, no '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Formato incorrecto en entrada '{1}' en archivo de configuración."
-#define STRING_CONFIG_BAD_WRITE      "No se pudo escribir a '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Su archivo .taskrc contiene informes con columnas en desuso. Por favor, consulte entry_time, start_time o end_time en:"
 #define STRING_CONFIG_DEPRECATED_VAR "Su archivo .taskrc contiene variables que están en desuso:"
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5646699fa..b9051f823 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -577,7 +577,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_BAD_WRITE      "Could not write to '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 292f60873..af73e8149 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -576,7 +576,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Impossibile leggere il file di inclusione '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "E` possibile includere solo file con percorso assoluto, non '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Voce malformata '{1}' nel file di configurazione."
-#define STRING_CONFIG_BAD_WRITE      "Impossibile scrivere su'{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Il file .taskrc contiene report con nomi di colonna deprecati. Verificare entry_time, start_time o end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Il file .taskrc contiene variabili deprecate:"
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 07ba6ed18..198fe1e64 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -577,7 +577,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "インクルードファイル '{1}' が読み込めません。"
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_BAD_WRITE      "'{1}' へ書き込みできません。"
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 3af55116b..5d10d7d08 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -577,7 +577,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Nie można przeczytać dołączonego pliku '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Scieżka dołączanych plików musi mieć postać adresu bezwzględnego, nie '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Uszkodzony wpis '{1}' w pliku konfiguracyjnym."
-#define STRING_CONFIG_BAD_WRITE      "Nie można pisać do '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "Twój plik .taskrc zawiera raport z przestarzałymi nazwami kolumn.  Sprawdź proszę entry_time, start_time lub end_time w:"
 #define STRING_CONFIG_DEPRECATED_VAR "Twój plik .taskrc zawiera przestarzałe zmienne:"
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 4e1137b47..ab246365c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -577,7 +577,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Não foi possível ler o ficheiro incluído '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Apenas é permitido incluir ficheiros com caminhos absolutos, não '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Entrada anómala '{1}' no ficheiro de configuração."
-#define STRING_CONFIG_BAD_WRITE      "Não foi possível escrever para '{1}'."
 #define STRING_CONFIG_DEPRECATED_COL "O seu ficheiro .taskrc contém relatórios com colunas obsoletas. Verifique entry_time, start_time e end_time em:"
 #define STRING_CONFIG_DEPRECATED_VAR "O seu ficheiro .taskrc contém variáveis obsoletas:"
 

From efff69bc49d334c6a39c552658037361037d8370 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:06:18 -0500
Subject: [PATCH 572/879] l10n: Eliminated STRING_CONTEXT_NEED_RC

---
 src/Context.cpp    | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 1d24ae366..7348d102f 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1091,7 +1091,7 @@ void Context::createDefaultConfig ()
   {
     if (config.getBoolean ("confirmation") &&
         ! confirm (format (STRING_CONTEXT_CREATE_RC, home_dir, rc_file._data)))
-      throw std::string (STRING_CONTEXT_NEED_RC);
+      throw std::string ("Cannot proceed without rc file.");
 
     // Override data.location in the defaults.
     auto loc = configurationDefaults.find ("data.location=~/.task");
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 964bfa8ed..0ccbcf4ad 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Keine Konfigurationsdatei in {1} gefunden.\n\nMöchten Sie ein Beispiel {2} erstellt haben, sodass taskwarrior fortfahren kann?"
-#define STRING_CONTEXT_NEED_RC       "Kann nicht ohne rc-Datei fortfahren."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC außer Kraft gesetzt durch: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA außer Kraft gesetzt durch: {1}"
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ef970a9d9..d6a74e043 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -578,7 +578,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?"
-#define STRING_CONTEXT_NEED_RC       "Cannot proceed without rc file."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 902890042..d1de0faf4 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Ne povis trovi agordan dosieron ĉe {1}\n\nĈu vi volas, ke ekzemplero {2} kreiĝus por permesi vin procedi?"
-#define STRING_CONTEXT_NEED_RC       "Ne povos procedi sen rc-dosieron."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC-superrego: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA-superrego: {1}"
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 55c34f85d..0d0ea0b0f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -592,7 +592,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "No se pudo encontrar un archivo de configuración en {1}\n\n¿Desearía que se creara un {2} de ejemplo, para que taskwarrior pueda continuar?"
-#define STRING_CONTEXT_NEED_RC       "No se puede continuar sin archivo de configuración (rc)."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC sobreescrito: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA sobreescrito: {1}"
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b9051f823..01a8d39d6 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so taskwarrior can proceed?"
-#define STRING_CONTEXT_NEED_RC       "Cannot proceed without rc file."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index af73e8149..eb26d40e7 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -581,7 +581,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Un file di configurazione non può essere trovato in {1}\n\nSi desidera la creazione di un file di esempio {2}, in modo che taskwarrior possa procedere?"
-#define STRING_CONTEXT_NEED_RC       "Impossibile procedere senza rc file."
 #define STRING_CONTEXT_RC_OVERRIDE   "Modifica TASKRC: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "Modifica TASKDATA: {1}"
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 198fe1e64..86f900288 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "設定ファイルが {1} 中で見つけられませんでした。\n\nサンプルの {2} を作って taskwarrior が処理できるようにして良いですか?"
-#define STRING_CONTEXT_NEED_RC       "Cannot proceed without rc file."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5d10d7d08..ad9bf5c3f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Plik konfiguracji nie może zostać znaleziony w {1}\n\nCzy pragniesz utworzenia przykładowego pliku {2} tak aby taskwarrior mógł kontynuować?"
-#define STRING_CONTEXT_NEED_RC       "Nie można kontynuować bez pliku rc."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC nadpisane: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA nadpisane: {1}"
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ab246365c..e3d1886ee 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "O ficheiro de configuração não foi encontrado em {1}\n\nDeseja criar um {2} como exemplo, para que o taskwarrior possa continuar?"
-#define STRING_CONTEXT_NEED_RC       "Não é possível continuar sem um ficheiro rc."
 #define STRING_CONTEXT_RC_OVERRIDE   "TASKRC alternativo em uso: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA alternativo em uso: {1}"
 

From 4ce0113395fcdeb711c19865b4b31f2a0ad94e26 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:43:44 -0500
Subject: [PATCH 573/879] l10n: Eliminated STRING_CONTEXT_RC_OVERRIDE

---
 src/Context.cpp    | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 7348d102f..f23ef49c9 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -450,7 +450,7 @@ int Context::initialize (int argc, const char** argv)
     if (override)
     {
       rc_file = File (override);
-      header (format (STRING_CONTEXT_RC_OVERRIDE, rc_file._data));
+      header (format ("TASKRC override: {1}", rc_file._data));
     }
 
     // Artificial scope for timing purposes.
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 0ccbcf4ad..36190b700 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Keine Konfigurationsdatei in {1} gefunden.\n\nMöchten Sie ein Beispiel {2} erstellt haben, sodass taskwarrior fortfahren kann?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC außer Kraft gesetzt durch: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA außer Kraft gesetzt durch: {1}"
 
 // Date
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d6a74e043..3b355aa82 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -578,7 +578,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d1de0faf4..df1d04f89 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Ne povis trovi agordan dosieron ĉe {1}\n\nĈu vi volas, ke ekzemplero {2} kreiĝus por permesi vin procedi?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC-superrego: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA-superrego: {1}"
 
 // Date
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0d0ea0b0f..4676443af 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -592,7 +592,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "No se pudo encontrar un archivo de configuración en {1}\n\n¿Desearía que se creara un {2} de ejemplo, para que taskwarrior pueda continuar?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC sobreescrito: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA sobreescrito: {1}"
 
 // Date
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 01a8d39d6..42fd15050 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so taskwarrior can proceed?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index eb26d40e7..b48f6ee9e 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -581,7 +581,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Un file di configurazione non può essere trovato in {1}\n\nSi desidera la creazione di un file di esempio {2}, in modo che taskwarrior possa procedere?"
-#define STRING_CONTEXT_RC_OVERRIDE   "Modifica TASKRC: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "Modifica TASKDATA: {1}"
 
 // Date
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 86f900288..068e5146d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "設定ファイルが {1} 中で見つけられませんでした。\n\nサンプルの {2} を作って taskwarrior が処理できるようにして良いですか?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC override: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index ad9bf5c3f..bfd12b007 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Plik konfiguracji nie może zostać znaleziony w {1}\n\nCzy pragniesz utworzenia przykładowego pliku {2} tak aby taskwarrior mógł kontynuować?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC nadpisane: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA nadpisane: {1}"
 
 // Date
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e3d1886ee..5c48081c3 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "O ficheiro de configuração não foi encontrado em {1}\n\nDeseja criar um {2} como exemplo, para que o taskwarrior possa continuar?"
-#define STRING_CONTEXT_RC_OVERRIDE   "TASKRC alternativo em uso: {1}"
 #define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA alternativo em uso: {1}"
 
 // Date

From e25a64af9b2aa5a867425d334f4866e1e93d5ed6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:45:34 -0500
Subject: [PATCH 574/879] l10n: Eliminated STRING_CONTEXT_DATA_OVERRIDE

---
 src/Context.cpp    | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index f23ef49c9..c6c94409c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -481,7 +481,7 @@ int Context::initialize (int argc, const char** argv)
     {
       data_dir = Directory (override);
       config.set ("data.location", data_dir._data);
-      header (format (STRING_CONTEXT_DATA_OVERRIDE, data_dir._data));
+      header (format ("TASKDATA override: {1}", data_dir._data));
     }
 
     tdb2.set_location (data_dir);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 36190b700..048ec8fc9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Keine Konfigurationsdatei in {1} gefunden.\n\nMöchten Sie ein Beispiel {2} erstellt haben, sodass taskwarrior fortfahren kann?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA außer Kraft gesetzt durch: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ist kein gültiges Datum im '{2}'-Format."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3b355aa82..4ffddc0be 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -578,7 +578,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index df1d04f89..09291be26 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -580,7 +580,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Ne povis trovi agordan dosieron ĉe {1}\n\nĈu vi volas, ke ekzemplero {2} kreiĝus por permesi vin procedi?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA-superrego: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ne estas valida dato laŭ stilo '{2}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4676443af..0cbb2fc73 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -592,7 +592,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "No se pudo encontrar un archivo de configuración en {1}\n\n¿Desearía que se creara un {2} de ejemplo, para que taskwarrior pueda continuar?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA sobreescrito: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' no es una fecha válida según el formato '{2}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 42fd15050..4430cf0f3 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so taskwarrior can proceed?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' n'est pas une date au format '{2}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b48f6ee9e..f8b86e914 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -581,7 +581,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Un file di configurazione non può essere trovato in {1}\n\nSi desidera la creazione di un file di esempio {2}, in modo che taskwarrior possa procedere?"
-#define STRING_CONTEXT_DATA_OVERRIDE "Modifica TASKDATA: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' non è una data valida nel formato '{2}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 068e5146d..3f524741d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "設定ファイルが {1} 中で見つけられませんでした。\n\nサンプルの {2} を作って taskwarrior が処理できるようにして良いですか?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA override: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bfd12b007..bd059fd77 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "Plik konfiguracji nie może zostać znaleziony w {1}\n\nCzy pragniesz utworzenia przykładowego pliku {2} tak aby taskwarrior mógł kontynuować?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA nadpisane: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' nie jest poprawną wartością daty w formacie '{2}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5c48081c3..3427d995d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -582,7 +582,6 @@
 
 // Context
 #define STRING_CONTEXT_CREATE_RC     "O ficheiro de configuração não foi encontrado em {1}\n\nDeseja criar um {2} como exemplo, para que o taskwarrior possa continuar?"
-#define STRING_CONTEXT_DATA_OVERRIDE "TASKDATA alternativo em uso: {1}"
 
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' não é uma data válida no formato '{2}'."

From 398782829461b62a7cd99c48cedc43270dafabe4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:48:15 -0500
Subject: [PATCH 575/879] l10n: Eliminated STRING_CONTEXT_CREATE_RC

---
 src/Context.cpp    | 3 +--
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 10 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index c6c94409c..4b8f4ff19 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -43,7 +43,6 @@
 #include <shared.h>
 #include <format.h>
 #include <main.h>
-#include <i18n.h>
 
 #ifdef HAVE_COMMIT
 #include <commit.h>
@@ -1090,7 +1089,7 @@ void Context::createDefaultConfig ()
   if (rc_file._data != "" && ! rc_file.exists ())
   {
     if (config.getBoolean ("confirmation") &&
-        ! confirm (format (STRING_CONTEXT_CREATE_RC, home_dir, rc_file._data)))
+        ! confirm ( format ("A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?", home_dir, rc_file._data)))
       throw std::string ("Cannot proceed without rc file.");
 
     // Override data.location in the defaults.
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 048ec8fc9..2f5010a76 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -578,9 +578,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Ihre .taskrc-Datei enthält Repots mit veralteten Spalten.  Bitte entfernen Sie entry_time, start_time oder end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Ihre .taskrc-Datei enthält veraltete Optionen:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "Keine Konfigurationsdatei in {1} gefunden.\n\nMöchten Sie ein Beispiel {2} erstellt haben, sodass taskwarrior fortfahren kann?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ist kein gültiges Datum im '{2}'-Format."
 #define STRING_DATE_BAD_WEEKSTART    "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 4ffddc0be..82f4a70e7 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -576,9 +576,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 09291be26..a08d934b9 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -578,9 +578,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Via dosiero .taskrc enhavas raportojn kun arkaikaj kolumnoj.  Bonvolu serĉi entry_time, start_time, aŭ end_time ĉe:"
 #define STRING_CONFIG_DEPRECATED_VAR "Via dosiero .taskrc enhavas arkaikajn variablojn:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "Ne povis trovi agordan dosieron ĉe {1}\n\nĈu vi volas, ke ekzemplero {2} kreiĝus por permesi vin procedi?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ne estas valida dato laŭ stilo '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Argorda variablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0cbb2fc73..4a815179f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -590,9 +590,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Su archivo .taskrc contiene informes con columnas en desuso. Por favor, consulte entry_time, start_time o end_time en:"
 #define STRING_CONFIG_DEPRECATED_VAR "Su archivo .taskrc contiene variables que están en desuso:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "No se pudo encontrar un archivo de configuración en {1}\n\n¿Desearía que se creara un {2} de ejemplo, para que taskwarrior pueda continuar?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' no es una fecha válida según el formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuración 'weekstart' solamente puede contener 'Sunday' (domingo) o 'Monday' (lunes)."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 4430cf0f3..9b78ac261 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -580,9 +580,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so taskwarrior can proceed?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' n'est pas une date au format '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuration 'weekstart' ne peut contenir que 'dimanche' ou 'lundi'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f8b86e914..5c623f384 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -579,9 +579,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Il file .taskrc contiene report con nomi di colonna deprecati. Verificare entry_time, start_time o end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Il file .taskrc contiene variabili deprecate:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "Un file di configurazione non può essere trovato in {1}\n\nSi desidera la creazione di un file di esempio {2}, in modo che taskwarrior possa procedere?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' non è una data valida nel formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variabile di configurazione 'weekstart' può solo contenere 'Domenica' o 'Lunedì'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 3f524741d..60f4d0e45 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -580,9 +580,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "設定ファイルが {1} 中で見つけられませんでした。\n\nサンプルの {2} を作って taskwarrior が処理できるようにして良いですか?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bd059fd77..e90ab7e17 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -580,9 +580,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Twój plik .taskrc zawiera raport z przestarzałymi nazwami kolumn.  Sprawdź proszę entry_time, start_time lub end_time w:"
 #define STRING_CONFIG_DEPRECATED_VAR "Twój plik .taskrc zawiera przestarzałe zmienne:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "Plik konfiguracji nie może zostać znaleziony w {1}\n\nCzy pragniesz utworzenia przykładowego pliku {2} tak aby taskwarrior mógł kontynuować?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' nie jest poprawną wartością daty w formacie '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Zmienna konfiguracji 'weekstart' może przyjmować tylko wartość 'Sunday' lub 'Monday'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 3427d995d..72b0608e2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -580,9 +580,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "O seu ficheiro .taskrc contém relatórios com colunas obsoletas. Verifique entry_time, start_time e end_time em:"
 #define STRING_CONFIG_DEPRECATED_VAR "O seu ficheiro .taskrc contém variáveis obsoletas:"
 
-// Context
-#define STRING_CONTEXT_CREATE_RC     "O ficheiro de configuração não foi encontrado em {1}\n\nDeseja criar um {2} como exemplo, para que o taskwarrior possa continuar?"
-
 // Date
 #define STRING_DATE_INVALID_FORMAT   "'{1}' não é uma data válida no formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."

From b942cae98ed1bd45e80e79a85e26df948980bdef Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 11:55:02 -0500
Subject: [PATCH 576/879] l10n: Eliminated STRING_CMD_HELP_TEXT

---
 src/commands/CmdHelp.cpp | 113 +++++++++++++++++++++++++++++++++-
 src/l10n/deu-DEU.h       | 118 -----------------------------------
 src/l10n/eng-USA.h       | 115 ----------------------------------
 src/l10n/epo-RUS.h       | 115 ----------------------------------
 src/l10n/esp-ESP.h       | 130 ---------------------------------------
 src/l10n/fra-FRA.h       | 115 ----------------------------------
 src/l10n/ita-ITA.h       | 115 ----------------------------------
 src/l10n/jpn-JPN.h       | 115 ----------------------------------
 src/l10n/pol-POL.h       | 115 ----------------------------------
 src/l10n/por-PRT.h       | 115 ----------------------------------
 10 files changed, 112 insertions(+), 1054 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 36c80680d..a9c532c9c 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -64,7 +64,118 @@ int CmdHelp::execute (std::string& output)
     output = '\n'
            + composeUsage ()
            + '\n'
-           + STRING_CMD_HELP_TEXT;
+           + "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man "
+             "task-color', 'man task-sync' or at http://taskwarrior.org\n"
+             "\n"
+             "The general form of commands is:\n"
+             "  task [<filter>] <command> [<mods>]\n"
+             "\n"
+             "The <filter> consists of zero or more restrictions on which tasks to select, "
+             "such as:\n"
+             "  task                                      <command> <mods>\n"
+             "  task 28                                   <command> <mods>\n"
+             "  task +weekend                             <command> <mods>\n"
+             "  task project:Home due.before:today        <command> <mods>\n"
+             "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n"
+             "\n"
+             "By default, filter elements are combined with an implicit 'and' operator, but "
+             "'or' and 'xor' may also be used, provided parentheses are included:\n"
+             "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n"
+             "\n"
+             "A filter may target specific tasks using ID or UUID numbers.  To specify "
+             "multiple tasks use one of these forms:\n"
+             "  task 1,2,3                                    delete\n"
+             "  task 1-3                                      info\n"
+             "  task 1,2-5,19                                 modify pri:H\n"
+             "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n"
+             "\n"
+             "The <mods> consist of zero or more changes to apply to the selected tasks, "
+             "such as:\n"
+             "  task <filter> <command> project:Home\n"
+             "  task <filter> <command> +weekend +garden due:tomorrow\n"
+             "  task <filter> <command> Description/annotation text\n"
+             "  task <filter> <command> /from/to/     <- replace first match\n"
+             "  task <filter> <command> /from/to/g    <- replace all matches\n"
+             "\n"
+             "Tags are arbitrary words, any quantity:\n"
+             "  +tag       The + means add the tag\n"
+             "  -tag       The - means remove the tag\n"
+             "\n"
+             "Built-in attributes are:\n"
+             "  description:    Task description text\n"
+             "  status:         Status of task - pending, completed, deleted, waiting\n"
+             "  project:        Project name\n"
+             "  priority:       Priority\n"
+             "  due:            Due date\n"
+             "  recur:          Recurrence frequency\n"
+             "  until:          Expiration date of a task\n"
+             "  limit:          Desired number of rows in report, or 'page'\n"
+             "  wait:           Date until task becomes pending\n"
+             "  entry:          Date task was created\n"
+             "  end:            Date task was completed/deleted\n"
+             "  start:          Date task was started\n"
+             "  scheduled:      Date task is scheduled to start\n"
+             "  modified:       Date task was last modified\n"
+             "  depends:        Other tasks that this task depends upon\n"
+             "\n"
+             "Attribute modifiers make filters more precise.  Supported modifiers are:\n"
+             "\n"
+             "  Modifiers         Example            Equivalent           Meaning\n"
+             "  ----------------  -----------------  -------------------  -------------------------\n"
+             "                    due:today          due = today          Fuzzy match\n"
+             "  not               due.not:today      due != today         Fuzzy non-match\n"
+             "  before, below     due.before:today   due < today          Exact date comparison\n"
+             "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n"
+             "  none              project.none:      project == ''        Empty\n"
+             "  any               project.any:       project !== ''       Not empty\n"
+             "  is, equals        project.is:x       project == x         Exact match\n"
+             "  isnt              project.isnt:x     project !== x        Exact non-match\n"
+             "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n"
+             "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n"
+             "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n"
+             "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n"
+             "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n"
+             "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n"
+             "\n"
+             "Alternately algebraic expressions support:\n"
+             "  and  or  xor            Logical operators\n"
+             "  <  <=  =  !=  >=  >     Relational operators\n"
+             "  (  )                    Precedence\n"
+             "\n"
+             "  task due.before:eom priority.not:L   list\n"
+             "  task '(due < eom or priority != L)'  list\n"
+             "\n"
+             "The default .taskrc file can be overridden with:\n"
+             "  task ... rc:<alternate file> ...\n"
+             "  task ... rc:~/.alt_taskrc ...\n"
+             "\n"
+             "The values in .taskrc (or alternate) can be overridden with:\n"
+             "  task ... rc.<name>=<value> ...\n"
+             "  task rc.color=off list\n"
+             "\n"
+             "Any command or attribute name may be abbreviated if still unique:\n"
+             "  task list project:Home\n"
+             "  task li       pro:Home\n"
+             "\n"
+             "Some task descriptions need to be escaped because of the shell:\n"
+             "  task add \"quoted ' quote\"\n"
+             "  task add escaped \\' quote\n"
+             "\n"
+             "The argument -- tells Taskwarrior to treat all other args as description, even "
+             "if they would otherwise be attributes or tags:\n"
+             "  task add -- project:Home needs scheduling\n"
+             "\n"
+             "Many characters have special meaning to the shell, including:\n"
+             "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n"
+             "\n";
+
+             /*
+               TODO To be included later, before the 'precedence' line.
+
+               "  +  -                    Addition, Subtraktion\n" \
+               "  !                       Negation\n" \
+               "  ~  !~                   Treffer, kein Treffer\n" \
+             */
 
   return 0;
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 2f5010a76..dbf08170f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -819,124 +819,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' oder auf http://taskwarrior.org\n" \
-  "\n" \
-  "Allgemein sind Befehle folgendermaßen aufgebaut:\n" \
-  "  task [<Filter>] <Befehl> [<Änderungen>]\n" \
-  "\n" \
-  "Der <Filter> besteht aus keiner oder mehr Einschränkungen zur Auswahl von" \
-  "Aufgaben, wie beispielsweise:\n" \
-  "  task                                      <Befehl> <Änderungen>\n" \
-  "  task 28                                   <Befehl> <Änderungen>\n" \
-  "  task +Wochenende                          <Befehl> <Änderungen>\n" \
-  "  task project:Haus due.before:today        <Befehl> <Änderungen>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <Befehl> <Änderungen>\n" \
-  "\n" \
-  "Standardmäßig werden Filterelemente mit impliziten 'and'-Operatoren " \
-  "verknüpft, Sie können jedoch auch 'or' und 'xor' verwenden, sofern Sie" \
-  "Klammern verwenden:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <Befehl> <Änderungen>\n" \
-  "\n" \
-  "Filter können auch bestimmte Aufgaben an Hand ihrer ID oder UUID auswählen.  " \
-  "Mehrere Aufgaben können in folgenden Formaten angegeben werden:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "Sie können keine oder mehr <Änderungen> angeben, welche auf die gewählten " \
-  "Aufgaben angewendet werden, wie beispielsweise:\n" \
-  "  task <Filter> <Befehl> project:Haus\n" \
-  "  task <Filter> <Befehl> +Wochenende +Garten due:tomorrow\n" \
-  "  task <Filter> <Befehl> Beschreibung/Kommentar\n" \
-  "  task <Filter> <Befehl> /von/zu/     <- Ersten Treffer ersetzen\n" \
-  "  task <Filter> <Befehl> /von/zu/g    <- Alle Treffer ersetzen\n" \
-  "\n" \
-  "Es können beliebig viele Worte als Schlagworte angegeben werden.\n" \
-  "  +Schlagwort       + Schlagwort hinzufügen\n" \
-  "  -Schlagwort       - Schlagwort entfernen\n" \
-  "\n" \
-  "Eingebaute Eigenschaften:\n" \
-  "  description:    Aufgabenbeschreibung\n" \
-  "  status:         Status der Aufgabe - pending, completed, deleted, waiting\n" \
-  "  project:        Projektname\n" \
-  "  priority:       Wichtigkeit\n" \
-  "  due:            Fälligkeitsdatum\n" \
-  "  recur:          Wiederholungsregel\n" \
-  "  until:          Verfallsdatum einer Aufgabe\n" \
-  "  limit:          Gewünschte Anzahl Zeilen per Report oder Seite\n" \
-  "  wait:           Datum zu welchem eine Aufgabe in den \"pending\"-Status wechselt\n" \
-  "  entry:          Erstelldatum einer Aufgabe\n" \
-  "  end:            Datum, zu welchem die Aufgabe abgeschlossen/gelöscht wurde\n" \
-  "  start:          Startdatum der Aufgabe\n" \
-  "  scheduled:      Geplantes Datum der Aufgabe\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Andere Aufgaben, von denen die Aufgabe abhängt\n" \
-  "\n" \
-  "Eigenschaften-Operatoren präzisieren Filter.  Unterstützt werden:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Alternativ können folgende algebraische Operatoren genutzt werden:\n" \
-  "  and  or  xor            Logische Operatoren\n" \
-  "  <  <=  =  !=  >=  >     Relationale Operatoren\n" \
-  "  (  )                    Präzedenz\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "Die Standard-.taskrc-Datei kann folgendermaßen außer Kraft gesetzt werden:\n" \
-  "  task ... rc:<Alternativdatei> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "Werte in .taskrc können folgendermaßen außer Kraft gesetzt werden:\n" \
-  "  task ... rc.<Name>=<Wert> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Alle Befehle und Eigenschaften können abgekürzt werden, so lange sie eindeutig " \
-  "bleiben:\n" \
-  "  task list project:Haus\n" \
-  "  task li       pro:Haus\n" \
-  "\n" \
-  "Manchen Beschreibungen muss (auf Grund der Shell) ein Backslash vorangestellt " \
-  "werden:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "Der Parameter -- weist taskwarrior an, alle weiteren Argumente als Beschreibung " \
-  "zu behandeln, auch wenn Sie normalerweise Eigenschaften oder Schlagworte wären:\n" \
-  "  task add -- project:Haus muss geplant werden\n" \
-  "\n" \
-  "Viele Zeichen haben in der Shell eine besondere Bedeutung, beispielsweise:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, Subtraktion\n" \
-  "  !                       Negation\n" \
-  "  ~  !~                   Treffer, kein Treffer\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "ja"
 #define STRING_UTIL_CONFIRM_YES_U    "Ja"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 82f4a70e7..d909e971a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -817,121 +817,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' or at http://taskwarrior.org\n" \
-  "\n" \
-  "The general form of commands is:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "The <filter> consists of zero or more restrictions on which tasks to select, " \
-  "such as:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +weekend                             <command> <mods>\n" \
-  "  task project:Home due.before:today        <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "By default, filter elements are combined with an implicit 'and' operator, but " \
-  "'or' and 'xor' may also be used, provided parentheses are included:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "A filter may target specific tasks using ID or UUID numbers.  To specify " \
-  "multiple tasks use one of these forms:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "The <mods> consist of zero or more changes to apply to the selected tasks, " \
-  "such as:\n" \
-  "  task <filter> <command> project:Home\n" \
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" \
-  "  task <filter> <command> Description/annotation text\n" \
-  "  task <filter> <command> /from/to/     <- replace first match\n" \
-  "  task <filter> <command> /from/to/g    <- replace all matches\n" \
-  "\n" \
-  "Tags are arbitrary words, any quantity:\n" \
-  "  +tag       The + means add the tag\n" \
-  "  -tag       The - means remove the tag\n" \
-  "\n" \
-  "Built-in attributes are:\n" \
-  "  description:    Task description text\n" \
-  "  status:         Status of task - pending, completed, deleted, waiting\n" \
-  "  project:        Project name\n" \
-  "  priority:       Priority\n" \
-  "  due:            Due date\n" \
-  "  recur:          Recurrence frequency\n" \
-  "  until:          Expiration date of a task\n" \
-  "  limit:          Desired number of rows in report, or 'page'\n" \
-  "  wait:           Date until task becomes pending\n" \
-  "  entry:          Date task was created\n" \
-  "  end:            Date task was completed/deleted\n" \
-  "  start:          Date task was started\n" \
-  "  scheduled:      Date task is scheduled to start\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Other tasks that this task depends upon\n" \
-  "\n" \
-  "Attribute modifiers make filters more precise.  Supported modifiers are:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Alternately algebraic expressions support:\n" \
-  "  and  or  xor            Logical operators\n" \
-  "  <  <=  =  !=  >=  >     Relational operators\n" \
-  "  (  )                    Precedence\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "The default .taskrc file can be overridden with:\n" \
-  "  task ... rc:<alternate file> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "The values in .taskrc (or alternate) can be overridden with:\n" \
-  "  task ... rc.<name>=<value> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Any command or attribute name may be abbreviated if still unique:\n" \
-  "  task list project:Home\n" \
-  "  task li       pro:Home\n" \
-  "\n" \
-  "Some task descriptions need to be escaped because of the shell:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "The argument -- tells Taskwarrior to treat all other args as description, even " \
-  "if they would otherwise be attributes or tags:\n" \
-  "  task add -- project:Home needs scheduling\n" \
-  "\n" \
-  "Many characters have special meaning to the shell, including:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precedence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "yes"
 #define STRING_UTIL_CONFIRM_YES_U    "Yes"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a08d934b9..be212e689 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -819,121 +819,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Oni povas trovi dokumentojn por Taskwarrior uzante 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync', aŭ ĉe http://taskwarrior.org\n" \
-  "\n" \
-  "La ĝenerala formo de komandoj estas:\n" \
-  "  task [<filtrilo>] <komando> [<modifantoj>]\n" \
-  "\n" \
-  "La <filtrilo> konsistas de nulo aŭ pli katenoj, kiuj diktas kiajn taskojn elekti, " \
-  "ekzemple:\n" \
-  "  task                                      <komando> <modifantoj>\n" \
-  "  task 28                                   <komando> <modifantoj>\n" \
-  "  task +semajnfino                          <komando> <modifantoj>\n" \
-  "  task project:Domo due.before:today        <komando> <modifantoj>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <komando> <modifantoj>\n" \
-  "\n" \
-  "Implica infikso 'and' unuigas filtrilojn defaŭlte; tamen oni povas uzi 'or' aŭ 'xor'" \
-  "anstataŭe, se li inkluzivas parentezoj:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <komando> <modifantoj>\n" \
-  "\n" \
-  "Filtrilo povas celi specifajn taskojn kun identigilnombro ID aŭ UUID.  Por specifi " \
-  "plurajn taskojn, uzu unu de tiujn ĉi formojn:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "La <modifantoj> konsistas de nulo aŭ pli ŝanĝoj por apliki al la elektataj taskoj, " \
-  "kiel:\n" \
-  "  task <filtrilo> <komando> project:Domo\n" \
-  "  task <filtrilo> <komando> +semajnfino +ĝardeno due:tomorrow\n" \
-  "  task <filtrilo> <komando> Priskribo/komentara teksto\n" \
-  "  task <filtrilo> <komando> /from/to/     <- replace first match\n" \
-  "  task <filtrilo> <komando> /from/to/g    <- replace all matches\n" \
-  "\n" \
-  "Etikedoj estas ajnaj vortoj, de ajna kvanto:\n" \
-  "  +etikedo       La + signifas aldoni la etikedon\n" \
-  "  -etikedo       La - signifas elpreni la etikedon\n" \
-  "\n" \
-  "La enkonstruitajn atributojn estas:\n" \
-  "  description:    Priskriba teksto de la tasko\n" \
-  "  status:         Stato de la tasko - pending, completed, deleted, waiting\n" \
-  "  project:        Nomo de projekto\n" \
-  "  priority:       Graveco\n" \
-  "  due:            Datlimo\n" \
-  "  recur:          Reokaza periodo\n" \
-  "  until:          Dato de fortempiĝi de la tasko\n" \
-  "  limit:          Dezirata nombro de vicoj en raporto, aŭ 'page' por unu plena paĝo\n" \
-  "  wait:           Dato kiam la tasko pendiĝos\n" \
-  "  entry:          Dato kiam la tasko estis kreata\n" \
-  "  end:            Dato kiam la tasko estis finata/viŝata\n" \
-  "  start:          Dato kiam la tasko estis ekita\n" \
-  "  scheduled:      Fiksa dato kiam vi projektas eki la taskon\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Aliaj taskoj, de kioj ĉi tiu tasko dependas\n" \
-  "\n" \
-  "Atributaj modifantoj igas filtrilojn pli precizaj.  La subtenataj modifantoj estas:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Alterne, algebraj esprimoj subtenas:\n" \
-  "  and  or  xor            Logical operators\n" \
-  "  <  <=  =  !=  >=  >     Relational operators\n" \
-  "  (  )                    Precedence\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "Oni povas superregi la defaŭltan dosieron .taskrc kun:\n" \
-  "  task ... rc:<alterna dosiero> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "Oni povas superregi la valorojn en .taskrc (aŭ alterno) kun:\n" \
-  "  task ... rc.<nomo>=<valoro> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Oni povas mallongigi ajnan komandon aŭ ajnan atributan nomon se ĝi estas ankoraŭ unika:\n" \
-  "  task list project:Domo\n" \
-  "  task li       pro:Domo\n" \
-  "\n" \
-  "Oni devas eskapi kelkajn task-priskribojn pro la ŝelo:\n" \
-  "  task add \"citilata ' cito\"\n" \
-  "  task add eskapata \\' cito\n" \
-  "\n" \
-  "La argumento -- al taskwarrior ordonas interpreti ĉian restantan argumenton kiel " \
-  "priskribo, eĉ se ili aspektas esti atributoj aŭ etikedoj:\n" \
-  "  task add -- project:Domo bezonas fiksajn datojn\n" \
-  "\n" \
-  "Pluraj signoj havas specialan signifon por la ŝelo, inkluzive:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "jes"
 #define STRING_UTIL_CONFIRM_YES_U    "Jes"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4a815179f..99a6461a0 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -832,136 +832,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}."
 
-// ****************************************************************************************************
-// Usage text.  This is an exception, and contains \n characters and formatting.
-/* FIXME más abajo
-  "  task project:Casa due.before:hoy          <command> <mods>\n"
-  "  task project:Home due.before:today        <command> <mods>\n"
- y
-  "  task <filter> <command> project:Casa\n"
-  "  task <filter> <command> +finde +jardín due:mañana\n"
-  "  task <filter> <command> Texto anotación/descripción\n"
- en vez de:
-  "  task <filter> <command> project:Home\n"
-  "  task <filter> <command> +weekend +garden due:tomorrow\n"
-  "  task <filter> <command> Description/annotation text\n"
- y
-  "  task add -- project:Casa necesita programación\n"
-  "  task add -- project:Home needs scheduling\n" */
- #define STRING_CMD_HELP_TEXT \
-  "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc'" \
-  "man task-color', 'man task-sync' o en http://taskwarrior.org\n" \
-  "\n" \
-  "La forma general para los comandos es:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "<filter> consiste en cero o más restricciones sobre qué tareas seleccionar, " \
-  "como en:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +finde                             <command> <mods>\n" \
-  "  task project:Casa due.before:today        <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "Por defecto, los elementos filtro son combinados con un operador 'and' implícito, pero " \
-  "'or' y 'xor' también se pueden usar, siempre que se incluyan paréntesis:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "Un filtro puede dirigirse a tareas específicas mediante números ID o UUID. Para especificar " \
-  "múltiples tareas use una de estas formas:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "<mods> consiste en cero o más cambios para aplicar a las tareas seleccionadas, " \
-  "como en:\n" \
-  "  task <filter> <command> project:Casa\n" \
-  "  task <filter> <command> +finde +jardín due:tomorrow\n" \
-  "  task <filter> <command> Descripción/anotación\n" \
-  "  task <filter> <command> /de/para/     <- cambia la primera ocurrencia\n" \
-  "  task <filter> <command> /de/para/g    <- cambia todas las ocurrencias\n" \
-  "\n" \
-  "Las marcas son palabras arbitrarias, en cualquier número:\n" \
-  "  +marca     El + significa añade la marca\n" \
-  "  -marca     El - significa quita la marca\n" \
-  "\n" \
-  "Son atributos internos:\n" \
-  "  description:    Texto descriptivo de la tarea\n" \
-  "  status:         Estatus de la tarea - pendiente, completada, eliminada, esperando\n" \
-  "  project:        Nombre del proyecto\n" \
-  "  priority:       Prioridad\n" \
-  "  due:            Fecha de vencimiento\n" \
-  "  recur:          Frecuencia de recurrencia\n" \
-  "  until:          Fecha de caducidad de la tarea\n" \
-  "  limit:          Número de filas deseado en un informe, o 'page'\n" \
-  "  wait:           Fecha en la que la tarea se transforma en pendiente\n" \
-  "  entry:          Fecha en la que la tarea fue creada\n" \
-  "  end:            Fecha en la que la tarea fue completada/eliminada\n" \
-  "  start:          Fecha en la que la tarea fue comenzada\n" \
-  "  scheduled:      Fecha programada para que la tarea comience\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Otras tareas de las que esta tarea depende\n" \
-  "\n" \
-  "Los modificadores de atributos hacen a los filtros más precisos. Modificadores soportados son:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Soporte de expresiones algebraicas alternativas:\n" \
-  "  and  or  xor            Operadores lógicos\n" \
-  "  <  <=  =  !=  >=  >     Operadores relacionales\n" \
-  "  (  )                    Precedencia\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "El archivo .taskrc por defecto puede ser sobreescrito mediante:\n" \
-  "  task ... rc:<alternate file> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "Los valores en .taskrc (u otro) pueden ser sobreescritos mediante:\n" \
-  "  task ... rc.<name>=<value> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Cualquier nombre de comando o atributo puede ser abreviado mientras permanezca único:\n" \
-  "  task list project:Casa\n" \
-  "  task li       pro:Casa\n" \
-  "\n" \
-  "Algunas descripciones de tarea necesitan ser escapadas debido al entorno de comandos:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "El argumento -- indica a taskwarrior que trate todos los restantes argumentos como descripción, incluso " \
-  "aunque de otra manera hubieran sido argumentos o marcas:\n" \
-  "  task add -- project:Casa necesita fechas fijadas\n" \
-  "\n" \
-  "Muchos caracteres tienen significado especial para el entorno de comandos, incluyendo:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "sí"
 #define STRING_UTIL_CONFIRM_YES_U    "Sí"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 9b78ac261..667790963 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -821,121 +821,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' or at http://taskwarrior.org\n" \
-  "\n" \
-  "The general form of commands is:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "The <filter> consists of zero or more restrictions on which tasks to select, " \
-  "such as:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +weekend                             <command> <mods>\n" \
-  "  task project:Home due.before:today        <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "By default, filter elements are combined with an implicit 'and' operator, but " \
-  "'or' and 'xor' may also be used, provided parentheses are included:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "A filter may target specific tasks using ID or UUID numbers.  To specify " \
-  "multiple tasks use one of these forms:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "The <mods> consist of zero or more changes to apply to the selected tasks, " \
-  "such as:\n" \
-  "  task <filter> <command> project:Home\n" \
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" \
-  "  task <filter> <command> Description/annotation text\n" \
-  "  task <filter> <command> /from/to/     <- replace first match\n" \
-  "  task <filter> <command> /from/to/g    <- replace all matches\n" \
-  "\n" \
-  "Tags are arbitrary words, any quantity:\n" \
-  "  +tag       The + means add the tag\n" \
-  "  -tag       The - means remove the tag\n" \
-  "\n" \
-  "Built-in attributes are:\n" \
-  "  description:    Task description text\n" \
-  "  status:         Status of task - pending, completed, deleted, waiting\n" \
-  "  project:        Project name\n" \
-  "  priority:       Priority\n" \
-  "  due:            Due date\n" \
-  "  recur:          Recurrence frequency\n" \
-  "  until:          Expiration date of a task\n" \
-  "  limit:          Desired number of rows in report, or 'page'\n" \
-  "  wait:           Date until task becomes pending\n" \
-  "  entry:          Date task was created\n" \
-  "  end:            Date task was completed/deleted\n" \
-  "  start:          Date task was started\n" \
-  "  scheduled:      Date task is scheduled to start\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Other tasks that this task depends upon\n" \
-  "\n" \
-  "Attribute modifiers make filters more precise.  Supported modifiers are:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Alternately algebraic expressions support:\n" \
-  "  and  or  xor            Logical operators\n" \
-  "  <  <=  =  !=  >=  >     Relational operators\n" \
-  "  (  )                    Precedence\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "The default .taskrc file can be overridden with:\n" \
-  "  task ... rc:<alternate file> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "The values in .taskrc (or alternate) can be overridden with:\n" \
-  "  task ... rc.<name>=<value> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Any command or attribute name may be abbreviated if still unique:\n" \
-  "  task list project:Home\n" \
-  "  task li       pro:Home\n" \
-  "\n" \
-  "Some task descriptions need to be escaped because of the shell:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "The argument -- tells taskwarrior to treat all other args as description, even " \
-  "if they would otherwise be attributes or tags:\n" \
-  "  task add -- project:Home needs scheduling\n" \
-  "\n" \
-  "Many characters have special meaning to the shell, including:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "oui"
 #define STRING_UTIL_CONFIRM_YES_U    "Oui"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5c623f384..7defc6090 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -820,121 +820,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "La documentazione di Taskwarrior può essere consultata con 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' o presso http://taskwarrior.org\n" \
-  "\n" \
-  "La forma generale del comando è:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "<filter> considte di zero o più condizioni sui task da selezionare, " \
-  "come:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +weekend                             <command> <mods>\n" \
-  "  task project:Home due.before:today        <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "Di default, i filtri sono combinati implicitamente con un operatore 'and', ma " \
-  "'or' e 'xor' possono essere usati includendo le parentesi:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "Un filtro può far riferimento a task specifici usando gli ID o UUID. Per specificare " \
-  "più task una delle seguenti forme può essere usata:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "<mods> consiste di zero o più modifiche da applicare ai task selezionati, " \
-  "come:\n" \
-  "  task <filter> <command> project:Home\n" \
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" \
-  "  task <filter> <command> Description/annotation text\n" \
-  "  task <filter> <command> /from/to/     <- sostituisce la prima occorrenza\n" \
-  "  task <filter> <command> /from/to/g    <- sostituisce tutte le occorrenze\n" \
-  "\n" \
-  "I tag sono parole arbitrarie, in quantità a discrezione dell'utente:\n" \
-  "  +tag       Il + aggiunge il tag\n" \
-  "  -tag       Il - rimuove il tag\n" \
-  "\n" \
-  "Gli attributi standard sono:\n" \
-  "  description:    Testo di descrizione del task\n" \
-  "  status:         Stato del task - pending, completed, deleted, waiting\n" \
-  "  project:        Nome del progetto\n" \
-  "  priority:       Priorità\n" \
-  "  due:            Scadenza\n" \
-  "  recur:          Frequenza di un task periodico\n" \
-  "  until:          Data oltre la quale il task non è più valido\n" \
-  "  limit:          Numero di righe desiderate in un report, o 'pagina'\n" \
-  "  wait:           Data dalla quale un task diviene pending\n" \
-  "  entry:          Data di creazione del task\n" \
-  "  end:            Data di completamento/cancellazione del task\n" \
-  "  start:          Data di inizio del task\n" \
-  "  scheduled:      Data prevista per l'avvio del task\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Altri task dai quali dipende il task\n" \
-  "\n" \
-  "I modificatori rendono i filtri più precisi. Modificatori supportati sono:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Sono supportati i seguenti operatori:\n" \
-  "  and  or  xor            Operatori logici\n" \
-  "  <  <=  =  !=  >=  >     Operatori relazionali\n" \
-  "  (  )                    Precedenza\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "Il file .taskrc di default può essere reimpostato con:\n" \
-  "  task ... rc:<alternate file> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "I valori di default nel file .taskrc possono essere modificati con:\n" \
-  "  task ... rc.<name>=<value> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Ogni comando o attributo può essere abbreviato se l'abbreviazione è unica:\n" \
-  "  task list project:Home\n" \
-  "  task li       pro:Home\n" \
-  "\n" \
-  "Talune descrizioni richiedono i caratteri di escape per non confondere la shell:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "L'argomento -- comunica a taskwarrior di trattare i rimanenti argomenti come descrizione, anche " \
-  "se coincidono con attributi o task:\n" \
-  "  task add -- project:Home needs scheduling\n" \
-  "\n" \
-  "Diversi caratteri hanno significato speciale per la shell, incluso:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "si"
 #define STRING_UTIL_CONFIRM_YES_U    "Si"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 60f4d0e45..7a1f53907 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -821,121 +821,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Taskwarrior のドキュメンテーションは、'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' または http://taskwarrior.org にあります。\n" \
-  "\n" \
-  "一般的なコマンド形式は以下の通りです:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "<filter> は、選択するタスクに対して、0個以上使えます。" \
-  "例は以下の通り:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +weekend                             <command> <mods>\n" \
-  "  task project:Home due.before:today        <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "既定値では、フィルタの各要素は暗黙の 'and' 演算子で結合されていますが、 " \
-  "'or' と 'xor' も括弧も使えます:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "フィルタは、IDまたはUUID数を使って固有のタスクをターゲットにすることも出来ます。" \
-  "複数のタスクを指定するには、以下の形式のどれかを使います:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "<mods> は0個以上の、選択されたタスクに対して変更を加えます。 " \
-  "例は以下の通り:\n" \
-  "  task <filter> <command> project:Home\n" \
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" \
-  "  task <filter> <command> Description/annotation text\n" \
-  "  task <filter> <command> /from/to/     <- replace first match\n" \
-  "  task <filter> <command> /from/to/g    <- replace all matches\n" \
-  "\n" \
-  "タグは任意の単語、文字数を取れます:\n" \
-  "  +tag       + はタグを追加します\n" \
-  "  -tag       - はタグを削除します\n" \
-  "\n" \
-  "内蔵の属性は以下の通り:\n" \
-  "  description:    タスクの説明文\n" \
-  "  status:         タスクのステータス - pending, completed, deleted, waiting\n" \
-  "  project:        プロジェクト名\n" \
-  "  priority:       優先度\n" \
-  "  due:            期日\n" \
-  "  recur:          繰り返し頻度\n" \
-  "  until:          タスクの満了日\n" \
-  "  limit:          レポートまたは'ページ'内の行数'\n" \
-  "  wait:           タスクが保留になるまでの日時\n" \
-  "  entry:          タスク生成日\n" \
-  "  end:            タスク完了/削除日" \
-  "  start:          タスク開始日\n" \
-  "  scheduled:      タスク開始をスケジュールした日\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        このタスクが依存する他のタスク\n" \
-  "\n" \
-  "属性修飾子はフィルタの効果をより正確にします。使える変更子は以下の通りです:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "さらに、代数演算もサポートします:\n" \
-  "  and  or  xor            論理演算子\n" \
-  "  <  <=  =  !=  >=  >     比較演算子\n" \
-  "  (  )                    優先度変更\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "既定値の .taskrc ファイルは以下で切替られます:\n" \
-  "  task ... rc:<alternate file> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  ".taskrc (またはその代替) 中の値は以下で上書きできます:\n" \
-  "  task ... rc.<name>=<value> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "コマンドまたは属性名のどれでも、それが一意ならば省略形を使えます:\n" \
-  "  task list project:Home\n" \
-  "  task li       pro:Home\n" \
-  "\n" \
-  "タスクの説明では、シェルに対する副作用を防ぐ為にエスケープする必要があります:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "引数 -- は、たとえそれらが属性またはタグだとしても、その他すべての引数を" \
-  "taskwarrior が 説明 として取り扱うようにさせます:\n" \
-  "  task add -- project:Home needs scheduling\n" \
-  "\n" \
-  "以下に示すいくつかの文字はシェルに対して特別な意味があります:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "yes"
 #define STRING_UTIL_CONFIRM_YES_U    "Yes"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e90ab7e17..101b13115 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -821,121 +821,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "Dokumentację dla Taskwarrior można przeglądać za pomocą 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync', lub na http://taskwarrior.org\n" \
-  "\n" \
-  "Ogólna postać poleceń jest następująca:\n" \
-  "  task [<filtr>] <polecenie> [<mody>]\n" \
-  "\n" \
-  "Wyrażenie <filtr> składa się z zera lub więcej przybliżeń zmniejszających " \
-  "wynikowy zbiór zadań, np.:\n" \
-  "  task                                      <polecenie> <mody>\n" \
-  "  task 28                                   <polecenie> <mody>\n" \
-  "  task +weekend                             <polecenie> <mody>\n" \
-  "  task project:Home due.before:today        <polecenie> <mody>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <polecenie> <mody>\n" \
-  "\n" \
-  "Domyślnie, elementy składowe filtra są łączone logicznym 'and', ale " \
-  "'or' lub 'xor' może być również użyte:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <polecenie> <mody>\n" \
-  "\n" \
-  "Filtr może wybrać konkretne zadania na podstawie numerów ID lub UUID.  Aby wybrać " \
-  "więcej niż jedno zadanie użyj jednej z form:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "Wyrażenia <mody> składają się na zera lub więcej zmian we właściwościach wybranych zadań," \
-  "np.:\n" \
-  "  task <filtr> <polecenie> project:Home\n" \
-  "  task <filtr> <polecenie> +weekend +garden due:tomorrow\n" \
-  "  task <filtr> <polecenie> Description/annotation text\n" \
-  "  task <filtr> <polecenie> /from/to/     <- zastąpić pierwszego wystąpienia\n" \
-  "  task <filtr> <polecenie> /from/to/g    <- zastąpić wszystkie wystąpienia\n" \
-  "\n" \
-  "Tagi są dowolnymi słowami występującymi w nieograniczonej ilości:\n" \
-  "  +tag       + oznacza dodanie taga\n" \
-  "  -tag       - oznacza usunięcie taga\n" \
-  "\n" \
-  "Wbudowanymi atrybutami są:\n" \
-  "  description:    Tekst opisu zadania\n" \
-  "  status:         Status zadania - zawieszone, zakończone, usunięte, czekające\n" \
-  "  project:        Nazwa projektu\n" \
-  "  priority:       Priorytet\n" \
-  "  due:            Termin\n" \
-  "  recur:          Częstotliwość powtarzania\n" \
-  "  until:          Data przedawnienia zadania\n" \
-  "  limit:          Oczekiwana liczba wierszy w raporcie lub 'stron'\n" \
-  "  wait:           Data do kiedy zadanie pozostaje zawieszone\n" \
-  "  entry:          Data utworzenia zadania\n" \
-  "  end:            Data ukończenia/usunięcia zadania\n" \
-  "  start:          Data wystartowania zadania\n" \
-  "  scheduled:      Data zaplanowanego startu zadania\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Inne zadania od których zależy dane zadanie\n" \
-  "\n" \
-  "Modyfikatory atrybutów zwiększają precyzję filtrów.  Dostępne modyfikatory:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Dostępne wyrażenia algebraiczne:\n" \
-  "  and  or  xor            Operatory logiczne\n" \
-  "  <  <=  =  !=  >=  >     Operatory relacji\n" \
-  "  (  )                    Pierwszeństwa\n" \
-  "\n" \
-  "  task due.before:eom priority.not:L   list\n" \
-  "  task '(due < eom or priority != L)'  list\n" \
-  "\n" \
-  "Domyślne .taskrc może być nadpisane, np.:\n" \
-  "  task ... rc:<inny plik> ...\n" \
-  "  task ... rc:~/.inny_taskrc ...\n" \
-  "\n" \
-  "Wartości w .taskrc (lub inne) mogą być nadpisane, np.:\n" \
-  "  task ... rc.<nazwa>=<wartość> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Dowolne polecenie może być wyrażone w formie skrótowej jeśli pozostaje jednoznaczne:\n" \
-  "  task list project:Home\n" \
-  "  task li       pro:Home\n" \
-  "\n" \
-  "Niektóre opisy zadań muszą być poprzedzone znakiem ucieczki z powodu zastrzeżonych symboli powłoki:\n" \
-  "  task add \"quoted ' quote\"\n" \
-  "  task add escaped \\' quote\n" \
-  "\n" \
-  "Argument -- mówi programowi taskwarrior aby traktował wszystkie pozostałe argumenty jako opis " \
-  "zadania, nawet jeśli w innym przypadku zinterpretowałby je jako atrybuty lub tagi:\n" \
-  "  task add -- project:Home needs scheduling\n" \
-  "\n" \
-  "Wiele znaków ma specialne znaczenie dla powłoki, włączając:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Addition, subtraction\n" \
-  "  !                       Inversion\n" \
-  "  ~  !~                   Match, no match\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "tak"
 #define STRING_UTIL_CONFIRM_YES_U    "Tak"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 72b0608e2..d57a9098c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -821,121 +821,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}."
 
-// Usage text.  This is an exception, and contains \n characters and formatting.
-#define STRING_CMD_HELP_TEXT \
-  "A documentação do Taskwarrior pode ser encontrada usando 'man task', 'man taskrc', 'man " \
-  "task-color', 'man task-sync' ou em http://taskwarrior.org\n" \
-  "\n" \
-  "A forma geral dos comandos é:\n" \
-  "  task [<filter>] <command> [<mods>]\n" \
-  "\n" \
-  "<filter> consiste de zero ou mais restrições com base nas quais as tarefas são selecionadas, " \
-  "como:\n" \
-  "  task                                      <command> <mods>\n" \
-  "  task 28                                   <command> <mods>\n" \
-  "  task +fimdesemana                         <command> <mods>\n" \
-  "  task project:Casa due.before:hoje         <command> <mods>\n" \
-  "  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>\n" \
-  "\n" \
-  "Por defeito, elementros filtro são combinados com um implícito operador 'and', mas " \
-  "'or' ou 'xor' também podem ser usados, desde que sejam utilizados parêntesis:\n" \
-  "  task '(/[Cc]at|[Dd]og/ or /[0-9]+/)'      <command> <mods>\n" \
-  "\n" \
-  "Um filtro pode dizer respeito a tarefas específicas utilizando o ID ou UUID da mesma. " \
-  "Para especificar múltiplas tarefas use uma das seguintes formas:\n" \
-  "  task 1,2,3                                    delete\n" \
-  "  task 1-3                                      info\n" \
-  "  task 1,2-5,19                                 modify pri:H\n" \
-  "  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info\n" \
-  "\n" \
-  "<mods> consiste em zero ou mais alterações a aplicar nas tarefas selecionadas, " \
-  "como:\n" \
-  "  task <filter> <command> project:Home\n" \
-  "  task <filter> <command> +weekend +garden due:tomorrow\n" \
-  "  task <filter> <command> Description/annotation text\n" \
-  "  task <filter> <command> /de/para/     <- substitui a primeira ocorrência\n" \
-  "  task <filter> <command> /de/para/g    <- substitui todas as ocorrências\n" \
-  "\n" \
-  "Marcas são palavras arbitrárias, em qualquer quantidade:\n" \
-  "  +marca       + significa adiciona a marca\n" \
-  "  -marca       - significa remove a marca\n" \
-  "\n" \
-  "Atributos internos:\n" \
-  "  description:    Descrição da tarefa\n" \
-  "  status:         Estado da tarefa - pendente, concluída, eliminada, adiada\n" \
-  "  project:        Nome de projeto\n" \
-  "  priority:       Prioridade\n" \
-  "  due:            Data de vencimento\n" \
-  "  recur:          Frequência de recorrência\n" \
-  "  until:          Data de caducidade da tarefa\n" \
-  "  limit:          Número desejado de linhas num relatório ou 'page'\n" \
-  "  wait:           Data a partir da qual a tarefa fica pendente\n" \
-  "  entry:          Data de criação da tarefa\n" \
-  "  end:            Data de conclusão/remoção da tarefa\n" \
-  "  start:          Data de início da tarefa\n" \
-  "  scheduled:      Data de agendamento de início de tarefa\n" \
-  "  modified:       Date task was last modified\n" \
-  "  depends:        Outras tarefas das quais esta depende\n" \
-  "\n" \
-  "Os modificadores de atributos tornam os filtros mais precisos. Modificados suportados são:\n" \
-  "\n" \
-  "  Modifiers         Example            Equivalent           Meaning\n" \
-  "  ----------------  -----------------  -------------------  -------------------------\n" \
-  "                    due:today          due = today          Fuzzy match\n" \
-  "  not               due.not:today      due != today         Fuzzy non-match\n" \
-  "  before, below     due.before:today   due < today          Exact date comparison\n" \
-  "  after, above      due.after:today    due >= tomorrow      Exact date comparison\n" \
-  "  none              project.none:      project == ''        Empty\n" \
-  "  any               project.any:       project !== ''       Not empty\n" \
-  "  is, equals        project.is:x       project == x         Exact match\n" \
-  "  isnt              project.isnt:x     project !== x        Exact non-match\n" \
-  "  has, contains     desc.has:Hello     desc ~ Hello         Pattern match\n" \
-  "  hasnt,            desc.hasnt:Hello   desc !~ Hello        Pattern non-match\n" \
-  "  startswith, left  desc.left:Hel      desc ~ '^Hel'        Beginning match\n" \
-  "  endswith, right   desc.right:llo     desc ~ 'llo$'        End match\n" \
-  "  word              desc.word:Hello    desc ~ '\\bHello\\b'   Boundaried word match\n" \
-  "  noword            desc.noword:Hello  desc !~ '\\bHello\\b'  Boundaried word non-match\n" \
-  "\n" \
-  "Em alternativa, as seguintes operações algebraicas são suportadas:\n" \
-  "  and  or  xor            Operadores lógicos\n" \
-  "  <  <=  =  !=  >=  >     Operadores relacionais\n" \
-  "  (  )                    Precedência\n" \
-  "\n" \
-  "  task due.before:eom priority.not:B   list\n" \
-  "  task '(due < eom or priority != B)'  list\n" \
-  "\n" \
-  "O ficheiro .taskrc por defeito pode ser alterado usando:\n" \
-  "  task ... rc:<ficheiro alternativo> ...\n" \
-  "  task ... rc:~/.alt_taskrc ...\n" \
-  "\n" \
-  "Os valores no ficheiro .taskrc (ou alternativo) podem ser alterados com:\n" \
-  "  task ... rc.<nome>=<valor> ...\n" \
-  "  task rc.color=off list\n" \
-  "\n" \
-  "Qualquer nome de comando ou atributo pode ser abreviado desde que seja único:\n" \
-  "  task list project:Casa\n" \
-  "  task li       pro:Casa\n" \
-  "\n" \
-  "As descrições de algumas tarefas têm que ser 'escapadas' caso contrário serão interpretadas pela 'shell':\n" \
-  "  task add \"citando ' citação\"\n" \
-  "  task add escapando \\' citação\n" \
-  "\n" \
-  "O argumento -- diz ao taskwarrior para considerar todos os argumentos seguintes como parte da descrição, " \
-  "mesmo se à primeira vista fossem interpretados como atributos ou marcas:\n" \
-  "  task add -- project:Casa precisa revisão\n" \
-  "\n" \
-  "Muitos caracteres têm significado especial na 'shell', incluindo:\n" \
-  "  $ ! ' \" ( ) ; \\ ` * ? { } [ ] < > | & % # ~\n" \
-  "\n"
-
-/*
-  To be included later, before the 'precendence' line.
-
-  "  +  -                    Adição, subtração\n" \
-  "  !                       Inversão\n" \
-  "  ~  !~                   Coíncide, Não coíncide\n" \
-*/
-
 // util
 #define STRING_UTIL_CONFIRM_YES      "sim"
 #define STRING_UTIL_CONFIRM_YES_U    "Sim"

From fc418d1195e3821894e207678ccd4b8269914ac6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:11:06 -0500
Subject: [PATCH 577/879] l10n: Eliminated STRING_CMD_HELP_TEXT

---
 src/commands/CmdHelp.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index a9c532c9c..dd4927581 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -41,7 +41,7 @@ CmdHelp::CmdHelp ()
 {
   _keyword               = "help";
   _usage                 = "task          help ['usage']";
-  _description           = STRING_CMD_HELP_USAGE;
+  _description           = "Displays this usage help text";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index dbf08170f..299fca8e0 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -557,7 +557,6 @@
 #define STRING_CMD_BURN_DONE         "Beendet"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Offen"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Keine Konvergenz"
-#define STRING_CMD_HELP_USAGE        "Zeigt diesen Hilfe-Text"
 #define STRING_CMD_HELP_USAGE_LABEL  "Benutzung:"
 #define STRING_CMD_HELP_USAGE_DESC   "Führt rc.default.command aus, sofern angegeben"
 #define STRING_CMD_HELP_ALIASED      "Alias zu '{1}'"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d909e971a..bc9af0877 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -555,7 +555,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE        "Displays this usage help text"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_HELP_USAGE_DESC   "Runs rc.default.command, if specified."
 #define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index be212e689..79b5a40ab 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -557,7 +557,6 @@
 #define STRING_CMD_BURN_DONE         "Finis"         // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pendas"        // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Nenia konverĝo"
-#define STRING_CMD_HELP_USAGE        "Montras ĉi tiun helpantan tekston"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uzo:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lanĉas rc.default.command, se specifita."
 #define STRING_CMD_HELP_ALIASED      "Alinomo de '{1}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 99a6461a0..73edd0977 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -569,7 +569,6 @@
 #define STRING_CMD_BURN_DONE         "Hechas"              // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pend."               // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No converge"
-#define STRING_CMD_HELP_USAGE        "Muestra este texto de ayuda al uso"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lanza rc.default.command, si está especificado."
 #define STRING_CMD_HELP_ALIASED      "Es alias de '{1}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 667790963..34b295fea 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE        "Displays this usage help text"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lance rc.default.command, si spécifié."
 #define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7defc6090..df49e94a6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -558,7 +558,6 @@
 #define STRING_CMD_BURN_DONE         "Chiuso"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Da fare"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergenza"
-#define STRING_CMD_HELP_USAGE        "Mostra questo testo di aiuto"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Esegue rc.default.command, se specificato."
 #define STRING_CMD_HELP_ALIASED      "Sinonimo: '{1}'"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 7a1f53907..b5b385a04 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE        "Displays this usage help text"
 #define STRING_CMD_HELP_USAGE_LABEL  "使用法:"
 #define STRING_CMD_HELP_USAGE_DESC   "もしも指定されていれば rc.default.command を実行します。"
 #define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 101b13115..b76145e15 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Brak konwergencji" // ?
-#define STRING_CMD_HELP_USAGE        "Wyświetla tą pomoc"
 #define STRING_CMD_HELP_USAGE_LABEL  "Użycie:"
 #define STRING_CMD_HELP_USAGE_DESC   "Wykonuje rc.default.command, jeśli podano."
 #define STRING_CMD_HELP_ALIASED      "Alias na '{1}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d57a9098c..8fbbdb1a8 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Conclu."          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Penden."          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Não converge"
-#define STRING_CMD_HELP_USAGE        "Mostra este texto de ajuda"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Executa rc.default.command, se especificado."
 #define STRING_CMD_HELP_ALIASED      "'Alias'ado para '{1}'"

From 5cf7c12dc9b9f37c26131b7d8ec812e4dff86d2d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:12:53 -0500
Subject: [PATCH 578/879] l10n: Eliminated STRING_CMD_HELP_ALIASED

---
 src/commands/CmdHelp.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index dd4927581..2f6d4b4c7 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -235,7 +235,7 @@ std::string CmdHelp::composeUsage () const
     {
       row = view.addRow ();
       view.set (row, 1, alias.first.substr (6));
-      view.set (row, 2, format (STRING_CMD_HELP_ALIASED, alias.second));
+      view.set (row, 2, format ("Aliased to '{1}'", alias.second));
     }
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 299fca8e0..d737f1906 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "Keine Konvergenz"
 #define STRING_CMD_HELP_USAGE_LABEL  "Benutzung:"
 #define STRING_CMD_HELP_USAGE_DESC   "Führt rc.default.command aus, sofern angegeben"
-#define STRING_CMD_HELP_ALIASED      "Alias zu '{1}'"
 #define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index bc9af0877..37ac149b8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -557,7 +557,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_HELP_USAGE_DESC   "Runs rc.default.command, if specified."
-#define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 79b5a40ab..5dab6ca0a 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "Nenia konverĝo"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uzo:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lanĉas rc.default.command, se specifita."
-#define STRING_CMD_HELP_ALIASED      "Alinomo de '{1}'"
 #define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 73edd0977..357abd9bf 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -571,7 +571,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "No converge"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lanza rc.default.command, si está especificado."
-#define STRING_CMD_HELP_ALIASED      "Es alias de '{1}'"
 #define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 34b295fea..cbf1eb766 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -561,7 +561,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_HELP_USAGE_DESC   "Lance rc.default.command, si spécifié."
-#define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index df49e94a6..03d6a6bea 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -560,7 +560,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergenza"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Esegue rc.default.command, se specificato."
-#define STRING_CMD_HELP_ALIASED      "Sinonimo: '{1}'"
 #define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index b5b385a04..beb07b99d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -561,7 +561,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "使用法:"
 #define STRING_CMD_HELP_USAGE_DESC   "もしも指定されていれば rc.default.command を実行します。"
-#define STRING_CMD_HELP_ALIASED      "Aliased to '{1}'"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b76145e15..c8410ceb8 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -561,7 +561,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "Brak konwergencji" // ?
 #define STRING_CMD_HELP_USAGE_LABEL  "Użycie:"
 #define STRING_CMD_HELP_USAGE_DESC   "Wykonuje rc.default.command, jeśli podano."
-#define STRING_CMD_HELP_ALIASED      "Alias na '{1}'"
 #define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 8fbbdb1a8..fafe5fd0f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -561,7 +561,6 @@
 #define STRING_CMD_BURN_NO_CONVERGE  "Não converge"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_HELP_USAGE_DESC   "Executa rc.default.command, se especificado."
-#define STRING_CMD_HELP_ALIASED      "'Alias'ado para '{1}'"
 #define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."

From 3576e8f784d017411a072470268cc98f5e07041d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:14:36 -0500
Subject: [PATCH 579/879] l10n: Eliminated STRING_CMD_HELP_USAGE_DESC

---
 src/commands/CmdHelp.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 2f6d4b4c7..08d280154 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -193,7 +193,7 @@ std::string CmdHelp::composeUsage () const
   auto row = view.addRow ();
   view.set (row, 0, STRING_CMD_HELP_USAGE_LABEL);
   view.set (row, 1, "task");
-  view.set (row, 2, STRING_CMD_HELP_USAGE_DESC);
+  view.set (row, 2, "Runs rc.default.command, if specified.");
 
   // Obsolete method of getting a list of all commands.
   std::vector <std::string> all;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d737f1906..0e20b37ed 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -558,7 +558,6 @@
 #define STRING_CMD_BURN_PENDING      "Offen"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Keine Konvergenz"
 #define STRING_CMD_HELP_USAGE_LABEL  "Benutzung:"
-#define STRING_CMD_HELP_USAGE_DESC   "Führt rc.default.command aus, sofern angegeben"
 #define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 37ac149b8..e82534eb8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -556,7 +556,6 @@
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
-#define STRING_CMD_HELP_USAGE_DESC   "Runs rc.default.command, if specified."
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 5dab6ca0a..a368b9124 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -558,7 +558,6 @@
 #define STRING_CMD_BURN_PENDING      "Pendas"        // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Nenia konverĝo"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uzo:"
-#define STRING_CMD_HELP_USAGE_DESC   "Lanĉas rc.default.command, se specifita."
 #define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 357abd9bf..ea5ec8d3f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -570,7 +570,6 @@
 #define STRING_CMD_BURN_PENDING      "Pend."               // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No converge"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
-#define STRING_CMD_HELP_USAGE_DESC   "Lanza rc.default.command, si está especificado."
 #define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index cbf1eb766..9925a4c54 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -560,7 +560,6 @@
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
-#define STRING_CMD_HELP_USAGE_DESC   "Lance rc.default.command, si spécifié."
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 03d6a6bea..ffcb8f219 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_PENDING      "Da fare"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergenza"
 #define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
-#define STRING_CMD_HELP_USAGE_DESC   "Esegue rc.default.command, se specificato."
 #define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index beb07b99d..2e1a9f05b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -560,7 +560,6 @@
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_HELP_USAGE_LABEL  "使用法:"
-#define STRING_CMD_HELP_USAGE_DESC   "もしも指定されていれば rc.default.command を実行します。"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index c8410ceb8..534d4e8e8 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -560,7 +560,6 @@
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Brak konwergencji" // ?
 #define STRING_CMD_HELP_USAGE_LABEL  "Użycie:"
-#define STRING_CMD_HELP_USAGE_DESC   "Wykonuje rc.default.command, jeśli podano."
 #define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."

From aefe06b29629bd2914b87e073704a0993d87b857 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:16:24 -0500
Subject: [PATCH 580/879] l10n: Eliminated STRING_CMD_HELP_USAGE_LABEL

---
 src/commands/CmdHelp.cpp | 3 +--
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 2 --
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 08d280154..d80ae8b99 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -29,7 +29,6 @@
 #include <algorithm>
 #include <Table.h>
 #include <Context.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 #include <util.h>
@@ -191,7 +190,7 @@ std::string CmdHelp::composeUsage () const
 
   // Static first row.
   auto row = view.addRow ();
-  view.set (row, 0, STRING_CMD_HELP_USAGE_LABEL);
+  view.set (row, 0, "Usage:");
   view.set (row, 1, "task");
   view.set (row, 2, "Runs rc.default.command, if specified.");
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 0e20b37ed..58df22886 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -557,7 +557,6 @@
 #define STRING_CMD_BURN_DONE         "Beendet"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Offen"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Keine Konvergenz"
-#define STRING_CMD_HELP_USAGE_LABEL  "Benutzung:"
 #define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e82534eb8..1ca9cfd8f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -555,7 +555,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a368b9124..4867b2a06 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -557,7 +557,6 @@
 #define STRING_CMD_BURN_DONE         "Finis"         // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pendas"        // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Nenia konverĝo"
-#define STRING_CMD_HELP_USAGE_LABEL  "Uzo:"
 #define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ea5ec8d3f..098bd84bf 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -569,7 +569,6 @@
 #define STRING_CMD_BURN_DONE         "Hechas"              // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pend."               // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No converge"
-#define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 9925a4c54..154ef4b82 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE_LABEL  "Usage:"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ffcb8f219..154ea5519 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -558,7 +558,6 @@
 #define STRING_CMD_BURN_DONE         "Chiuso"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Da fare"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergenza"
-#define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
 #define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 2e1a9f05b..81328d1b3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
-#define STRING_CMD_HELP_USAGE_LABEL  "使用法:"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 534d4e8e8..49789adfd 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -559,7 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Brak konwergencji" // ?
-#define STRING_CMD_HELP_USAGE_LABEL  "Użycie:"
 #define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index fafe5fd0f..ac8f71fcc 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -559,8 +559,6 @@
 #define STRING_CMD_BURN_DONE         "Conclu."          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_PENDING      "Penden."          // Must be 7 or fewer characters
 #define STRING_CMD_BURN_NO_CONVERGE  "Não converge"
-#define STRING_CMD_HELP_USAGE_LABEL  "Uso:"
-#define STRING_CMD_HELP_USAGE_DESC   "Executa rc.default.command, se especificado."
 #define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."

From 06734487eef9422f3c641677385b179b5c849e72 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:18:48 -0500
Subject: [PATCH 581/879] Docs: Added note about translations no longer being
 supported

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index a9339cdb1..43ab95e5f 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,7 @@ Removed Features in 2.5.2
     been replaced by something less icky. Estimates are now based on the net
     completion rate after the peak number of pending tasks.
   - The unused 'dom' and 'shell.prompt' configuration settings were removed.
+  - Translations are no longer supported.
 
 Known Issues
 

From 8d1f66cd41bbdca5889b220ad8f21ff2229e8c5a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:20:34 -0500
Subject: [PATCH 582/879] Utils: Removed l10n utility

---
 scripts/utils/l10n | 195 ---------------------------------------------
 1 file changed, 195 deletions(-)
 delete mode 100755 scripts/utils/l10n

diff --git a/scripts/utils/l10n b/scripts/utils/l10n
deleted file mode 100755
index ae5cacbac..000000000
--- a/scripts/utils/l10n
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env python2.7
-################################################################################
-##
-## Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included
-## in all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-## SOFTWARE.
-##
-## http://www.opensource.org/licenses/mit-license.php
-##
-################################################################################
-
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import os
-import sys
-import argparse
-import re
-import fnmatch
-
-REFERENCE = 'eng-USA.h'
-
-def find_localizations(source, single=''):
-  '''Finds all [a-z][a-z]-[A-Z][A-Z].h files in the source tree.'''
-  found = []
-  for path, dirs, files in os.walk(source, topdown=True, onerror=None, followlinks=False):
-    matches = map(lambda x: os.path.join(path, x),
-                  fnmatch.filter(files, '[a-z][a-z][a-z]-[A-Z][A-Z][A-Z].h'))
-
-    if single:
-      # Accept both cases - if user specified es-ES.h or only es-ES
-      if not single.endswith('.h'):
-        single = '%s.h' % single
-
-      for match in matches:
-        if match.endswith(single) or match.endswith(REFERENCE):
-          found.append(match)
-    else:
-      found.extend(matches)
-
-  # Make sure REFERENCE is the first column.
-  # NOTE Empty string is always sorted first than any string
-  found.sort(key=lambda x: "" if x.endswith(REFERENCE) else x)
-
-  return found
-
-def read_file(translations, file):
-  '''Reads all the localized strings from a file.'''
-  translations[file] = {}
-  with open(file, 'r') as fh:
-    for match in re.findall(r'^\s*#define\s+(STRING_[^\s]+)(\s|\\)+"([^"]*)"', fh.read(), re.MULTILINE):
-      translations[file][match[0]] = match[2]
-
-def is_present(translations, file, string):
-  '''Determines if the string is defined in a translation.'''
-  return string in translations[file]
-
-def used_in_source(source, string):
-  '''Determines if the string is used in the source.'''
-  command = "git grep %s %s | grep -v [a-z][a-z][a-z]-[A-Z][A-Z][A-Z].h >/dev/null 2>&1" % (string, source)
-  return True if os.system(command) == 0 else False
-
-def is_translated(translations, file, string):
-  '''Determines whether the string is the same in the base version as in the
-     translation, indicating work needed.'''
-  if file == base:
-    return True
-  elif string not in translations[base]:
-    return True
-  elif string not in translations[file]:
-    return False
-  else:
-    return bool(translations[file][string] != translations[base][string])
-
-def main(args):
-  '''Processes all the localized files.'''
-  errors = 0
-  translations = {}
-
-  for file in args.files:
-    # Verify all files exist.
-    if not os.path.exists(file):
-      raise Exception("Localized file '%s' not readable." % file)
-    read_file(translations, file)
-
-  strings = set()
-  for file in translations:
-    for string in translations[file]:
-      strings.add(string)
-
-  if len(strings) == 0:
-    if not args.quiet:
-      print("There are no localized strings found.")
-    errors = 1
-
-  # Get length of longest string ID.
-  longest_string = len(max(strings, key=len))
-
-  # Display info.
-  if not args.quiet:
-    print('Scanning in', args.source)
-    print()
-
-  # Print header line.
-  files = map(lambda x: os.path.basename(x), args.files)
-
-  if not args.quiet:
-    print('%-*s' % (longest_string, 'String ID'), end='')
-    print(*map(lambda x: '%10s' % x, files), sep='')
-    print('-' * longest_string, ' '.join(['---------'] * len(files)))
-
-  for string in sorted(strings):
-    # assess status of 'string':
-    # - clean
-
-    line = ''
-    line_errors = 0
-    for file in args.files:
-      message = '        '
-      if is_present(translations, file, string):
-        if is_translated(translations, file, string):
-          message = ' Ok       '
-        else:
-          message = ' TODO     '
-      else:
-        message = ' Missing  '
-        line_errors = 1
-
-      line += message
-
-    if args.all or line_errors != 0:
-      if args.search:
-        if used_in_source(args.source, string):
-          if not args.quiet:
-            print('%-*s' % (longest_string, string), line, sep='')
-        else:
-          if not args.quiet:
-            print('%-*s' % (longest_string, string), line, sep='')
-          line_errors = 1
-      else:
-        if not args.quiet:
-          print('%-*s' % (longest_string, string), line, sep='')
-
-    if line_errors:
-      errors = 1
-
-  if not args.quiet:
-    print('-' * longest_string, ' '.join(['---------'] * len(files)))
-    print('%-*s' % (longest_string, 'Total'), end='')
-    for file in args.files:
-      print('%10d' % len(translations[file]), end='')
-    print()
-
-  sys.exit(errors)
-
-if __name__ == "__main__":
-  usage="""Utility for checking localized string status across translations."""
-
-  parser = argparse.ArgumentParser(description=usage)
-  parser.add_argument('--source', action='store', required=True, help='The source code tree.')
-  parser.add_argument('--single', action='store', help='Show only given localization next to reference.')
-  parser.add_argument('--all', action='store_true', help='Show all string IDs.')
-  parser.add_argument('--search', action='store_true', help='Search source for use.')
-  parser.add_argument('--quiet', action='store_true', help='Produces no output.')
-  args = parser.parse_args()
-
-  if args.source:
-    args.files = find_localizations(args.source)
-
-    if args.single:
-      args.files = find_localizations(args.source, args.single)
-
-  base = filter(lambda x: x.endswith(REFERENCE), args.files)[0]
-
-  try:
-    main(args)
-  except Exception as msg:
-    print('Error:', msg)
-

From fe93e72f0bf1a4c9695c241aa5993744a585e466 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:24:57 -0500
Subject: [PATCH 583/879] l10n: Eliminated STRING_COLUMN_LABEL_PARENT

---
 src/columns/ColParent.cpp | 3 +--
 src/commands/CmdInfo.cpp  | 2 +-
 src/l10n/deu-DEU.h        | 1 -
 src/l10n/eng-USA.h        | 1 -
 src/l10n/epo-RUS.h        | 1 -
 src/l10n/esp-ESP.h        | 1 -
 src/l10n/fra-FRA.h        | 1 -
 src/l10n/ita-ITA.h        | 1 -
 src/l10n/jpn-JPN.h        | 1 -
 src/l10n/pol-POL.h        | 1 -
 src/l10n/por-PRT.h        | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index c8d641add..e51fc28fb 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -27,14 +27,13 @@
 #include <cmake.h>
 #include <ColParent.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnParent::ColumnParent ()
 {
   _name       = "parent";
   _style      = "long";
-  _label      = STRING_COLUMN_LABEL_PARENT;
+  _label      = "Parent task";
   _modifiable = false;
   _styles     = {"long", "short"};
   _examples   = {"f30cb9c3-3fc0-483f-bfb2-3bf134f00694", "f30cb9c3"};
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index b66d2687f..318c8379a 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -190,7 +190,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("parent"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_PARENT);
+      view.set (row, 0, "Parent task");
       view.set (row, 1, task.get ("parent"));
     }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 58df22886..dc1d276d2 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Wert"
-#define STRING_COLUMN_LABEL_PARENT   "Vorgänger-Aufgabe"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_COLUMN   "Spalten"
 #define STRING_COLUMN_LABEL_STYLES   "Unterstützte Formate"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1ca9cfd8f..e8b13923a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_PARENT   "Parent task"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4867b2a06..f801eab1a 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_NAME     "Nomo"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
-#define STRING_COLUMN_LABEL_PARENT   "Patra tasko"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
 #define STRING_COLUMN_LABEL_STYLES   "Formaĝoj Subtenataj"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 098bd84bf..77e59a012 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -156,7 +156,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_NAME     "Nombre"
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_PARENT   "Tarea madre"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_COLUMN   "Columnas"
 #define STRING_COLUMN_LABEL_STYLES   "Formatos soportados"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 154ef4b82..c4efe12c0 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_NAME     "Nom"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
-#define STRING_COLUMN_LABEL_PARENT   "Tâche mère"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
 #define STRING_COLUMN_LABEL_STYLES   "Formats supportés"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 154ea5519..d60cb63ab 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
-#define STRING_COLUMN_LABEL_PARENT   "Task genitore"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonna"
 #define STRING_COLUMN_LABEL_STYLES   "Formati Supportati"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 81328d1b3..6e8b9ce23 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_PARENT   "Parent task"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 49789adfd..a4f7fef7b 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -155,7 +155,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_NAME     "Nazwa"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
-#define STRING_COLUMN_LABEL_PARENT   "Zadanie rodzic"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
 #define STRING_COLUMN_LABEL_STYLES   "Formaty"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ac8f71fcc..c3d12ac29 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -156,7 +156,6 @@
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_PARENT   "Tarefa mãe"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colunas"
 #define STRING_COLUMN_LABEL_STYLES   "Formatos Suportados"

From f1049b4a7aa1699f5ab8c447772bbe8b0a055df3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:28:52 -0500
Subject: [PATCH 584/879] l10n: Eliminated STRING_TASK_INVALID_DUR

---
 src/columns/ColRecur.cpp        | 2 +-
 src/columns/ColTypeDuration.cpp | 3 +--
 src/l10n/deu-DEU.h              | 1 -
 src/l10n/eng-USA.h              | 1 -
 src/l10n/epo-RUS.h              | 1 -
 src/l10n/esp-ESP.h              | 1 -
 src/l10n/fra-FRA.h              | 1 -
 src/l10n/ita-ITA.h              | 1 -
 src/l10n/jpn-JPN.h              | 1 -
 src/l10n/pol-POL.h              | 1 -
 src/l10n/por-PRT.h              | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 27bbc40fb..57e2350af 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -127,7 +127,7 @@ void ColumnRecur::modify (Task& task, const std::string& value)
     task.set (_name, value);
   }
   else
-    throw format (STRING_TASK_INVALID_DUR, value);
+    throw format ("The duration value '{1}' is not supported.", value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 8bf134678..a869dcfc5 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -31,7 +31,6 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 extern Task& contextTask;
@@ -76,7 +75,7 @@ void ColumnTypeDuration::modify (Task& task, const std::string& value)
     task.set (_name, evaluatedValue);
   }
   else
-    throw format (STRING_TASK_INVALID_DUR, value);
+    throw format ("The duration value '{1}' is not supported.", value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index dc1d276d2..97cb3c6da 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -784,7 +784,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
-#define STRING_TASK_INVALID_DUR      "Zeitdauer '{1}' nicht unterstützt."
 #define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
 
 // TDB2
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e8b13923a..893c4e13c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -782,7 +782,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f801eab1a..8cb0d8e1d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -784,7 +784,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 77e59a012..005f20fe3 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -796,7 +796,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
-#define STRING_TASK_INVALID_DUR      "El valor de duración '{1}' no está soportado."
 #define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
 
 // TDB2
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index c4efe12c0..57850f701 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -786,7 +786,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d60cb63ab..090884ef0 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -785,7 +785,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6e8b9ce23..0e6a3f8c5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -786,7 +786,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index a4f7fef7b..e1194ff4d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -786,7 +786,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
-#define STRING_TASK_INVALID_DUR      "Wartość czas trwania '{1}' jest niewspierana."
 #define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
 
 // TDB2
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c3d12ac29..e417aed57 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -786,7 +786,6 @@
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
-#define STRING_TASK_INVALID_DUR      "The duration value '{1}' is not supported."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
 // TDB2

From f2e725b3c958f9c271fe18fb52d1f015fdcf6cbe Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 12:51:56 -0500
Subject: [PATCH 585/879] l10n: Eliminated STRING_HOOKS_*

---
 src/Hooks.cpp      | 12 +++++++++++-
 src/l10n/deu-DEU.h | 12 ------------
 src/l10n/eng-USA.h | 12 ------------
 src/l10n/epo-RUS.h | 12 ------------
 src/l10n/esp-ESP.h | 12 ------------
 src/l10n/fra-FRA.h | 12 ------------
 src/l10n/ita-ITA.h | 12 ------------
 src/l10n/jpn-JPN.h | 12 ------------
 src/l10n/pol-POL.h | 12 ------------
 src/l10n/por-PRT.h | 12 ------------
 10 files changed, 11 insertions(+), 109 deletions(-)

diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 57a14d91b..e1adf364e 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -46,7 +46,17 @@
 #include <format.h>
 #include <shared.h>
 #include <util.h>
-#include <i18n.h>
+
+#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
+#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
+#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
+#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
+#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
+#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
+#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
+#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
 extern Context context;
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 97cb3c6da..7ba9b558b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -733,18 +733,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Leerer Datensatz in der Eingabe."
 #define STRING_RECORD_JUNK_AT_EOL    "Unerkannte Zeichen am Ende der Eingabe."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 893c4e13c..e6ad7da5b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -731,18 +731,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 8cb0d8e1d..c4c94a090 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -733,18 +733,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Malplena rikordo en la inigo."
 #define STRING_RECORD_JUNK_AT_EOL    "Nekonataj signoj ĉe vicfino."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 005f20fe3..edf2e8529 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -745,18 +745,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} de {2} tareas restantes)."
 #define STRING_HELPER_PROJECT_REM1   "({1} tarea restante)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: se esperaba 0bjeto JSON '{...}' hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: falta atributo 'description' en objeto JSON hook script: {1}."
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: falta atributo 'uuid' en objeto JSON hook script: {1}."
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: error de sintaxis JSON en: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "  // |esp-ESP|==|eng-USA|
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: fallo al interpretar JSON: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: se esperaba {1} tarea(s) JSON, se encontraron {2}, hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON debe ser para la misma tarea: {1}, hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON debe ser para la misma tarea: {1} != {2}, hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: se esperaba retro-alimentación desde un hook script que falló: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Registro vacío en la entrada."
 #define STRING_RECORD_JUNK_AT_EOL    "Caracteres no reconocidos al final de línea."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 57850f701..0989165aa 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -735,18 +735,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 090884ef0..b907fc45d 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -734,18 +734,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} di {2} task rimanenti)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Voce vuota in ingresso."
 #define STRING_RECORD_JUNK_AT_EOL    "Carattere non riconosciuto a fine riga."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0e6a3f8c5..982c6e3e4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -735,18 +735,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Empty record in input."
 #define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e1194ff4d..2d2241990 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -735,18 +735,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Pusty wpis na wejściu."
 #define STRING_RECORD_JUNK_AT_EOL    "Nierozpoznawalny znak na koncu lini."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e417aed57..dd1d097ba 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -735,18 +735,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Hooks
-#define STRING_HOOK_ERROR_OBJECT     "Hook Error: JSON Object '{...}' expected from hook script: {1}"
-#define STRING_HOOK_ERROR_NODESC     "Hook Error: JSON Object missing 'description' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_NOUUID     "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}"
-#define STRING_HOOK_ERROR_SYNTAX     "Hook Error: JSON syntax error in: {1}"
-#define STRING_HOOK_ERROR_JSON       "Hook Error: JSON "
-#define STRING_HOOK_ERROR_NOPARSE    "Hook Error: JSON failed to parse: "
-#define STRING_HOOK_ERROR_BAD_NUM    "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_SAME1      "Hook Error: JSON must be for the same task: {1}, in hook script: {2}"
-#define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
-#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
-
 // Record
 #define STRING_RECORD_EMPTY          "Registo vazio na entrada fornecida."
 #define STRING_RECORD_JUNK_AT_EOL    "Caracteres desconhecidos no fim da linha."

From 12865e3b85ea7b58b4e7bf819a8eeef7e6ca7185 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:10:52 -0500
Subject: [PATCH 586/879] l10n: Eliminated STRING_CMD_VERSION_*

---
 src/calc.cpp                | 7 +++----
 src/commands/CmdVersion.cpp | 6 +++---
 src/l10n/deu-DEU.h          | 3 ---
 src/l10n/eng-USA.h          | 3 ---
 src/l10n/epo-RUS.h          | 3 ---
 src/l10n/esp-ESP.h          | 3 ---
 src/l10n/fra-FRA.h          | 3 ---
 src/l10n/ita-ITA.h          | 3 ---
 src/l10n/jpn-JPN.h          | 3 ---
 src/l10n/pol-POL.h          | 3 ---
 src/l10n/por-PRT.h          | 3 ---
 11 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index 9016f3f38..0e77d8423 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -36,7 +36,6 @@
 #include <Duration.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 Context context;
 
@@ -90,13 +89,13 @@ int main (int argc, char** argv)
       else if (!strcmp (argv[i], "-v") || !strcmp (argv[i], "--version"))
       {
         std::cout << '\n'
-                  << format (STRING_CMD_VERSION_BUILT, "calc", VERSION)
+                  << format ("calc {2} built for ", VERSION)
                   << osName ()
                   << '\n'
-                  << STRING_CMD_VERSION_COPY
+                  << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
                   << '\n'
                   << '\n'
-                  << STRING_CMD_VERSION_MIT
+                  << "Taskwarrior may be copied only under the terms of the MIT license, which may be found in the Taskwarrior source kit."
                   << '\n'
                   << '\n';
 
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index 192ae1ed5..d40647afc 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -64,7 +64,7 @@ int CmdVersion::execute (std::string& output)
   Table disclaimer;
   disclaimer.width (width);
   disclaimer.add ("");
-  disclaimer.set (disclaimer.addRow (), 0, STRING_CMD_VERSION_MIT);
+  disclaimer.set (disclaimer.addRow (), 0, "Taskwarrior may be copied only under the terms of the MIT license, which may be found in the Taskwarrior source kit.");
 
   // Create a table for the URL.
   Table link;
@@ -77,7 +77,7 @@ int CmdVersion::execute (std::string& output)
     bold = Color ("bold");
 
   out << '\n'
-      << format (STRING_CMD_VERSION_BUILT, bold.colorize (PACKAGE), bold.colorize (VERSION))
+      << format ("{1} {2} built for ", bold.colorize (PACKAGE), bold.colorize (VERSION))
 
 #if defined (DARWIN)
       << "darwin"
@@ -109,7 +109,7 @@ int CmdVersion::execute (std::string& output)
 #endif
 
       << '\n'
-      << STRING_CMD_VERSION_COPY
+      << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
       << '\n'
       << '\n'
       << disclaimer.render ()
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7ba9b558b..d86c078aa 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Benutzerdefinierter Report '{1}' steht mit eingebautem task-Befehl in Konflikt."
 #define STRING_CMD_VERSION_USAGE     "Zeigt die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_USAGE2    "Zeigt ausschließlich die taskwarrior-Versionsnummer"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior darf unter den Bedingungen der MIT-Lizenz vervielfältigt werden, welche sich im Quellpaket befindet."
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2}, gebaut für "
 #define STRING_CMD_VERSION_UNKNOWN   "unbekannt"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Zeigt das taskwarrior-Logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "Der Logo-Befehle benötigt aktivierte Farbunterstützung"
 #define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e6ad7da5b..dddea214a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "Shows the Taskwarrior version number"
 #define STRING_CMD_VERSION_USAGE2    "Shows only the Taskwarrior version number"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior may be copied only under the terms of the MIT license, which may be found in the Taskwarrior source kit."
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Displays the Taskwarrior logo"
 #define STRING_CMD_LOGO_COLOR_REQ    "The logo command requires that color support is enabled."
 #define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c4c94a090..b1e45deca 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Personala raporto '{1}' konfliktas kun enkonstruita taskkomando."
 #define STRING_CMD_VERSION_USAGE     "Montras la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Montras sole la versinombro de taskwarrior"
-#define STRING_CMD_VERSION_MIT       "Oni sole povas kopii Taskwarrior sur la MIT-permisilo, kiun oni povas trovi en la fontkodpako."
 #define STRING_CMD_VERSION_DOCS      "Oni povas trovi la dokumentojn por Taskwarrior kun 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq', aŭ ĉe http://taskwarrior.org."
-#define STRING_CMD_VERSION_BUILT     "{1} {2} kompilita por "
 #define STRING_CMD_VERSION_UNKNOWN   "nekonata"
-#define STRING_CMD_VERSION_COPY      "Kopirajto © 2006 - 2016 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Montras la logotipon de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "La komando 'logo' bezonas, ke la kolor-subtenado estus ebligata."
 #define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index edf2e8529..738281cd4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -196,12 +196,9 @@
 #define STRING_CMD_CONFLICT          "informe personalizado '{1}' en conflicto con comando interno de taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Muestra el número de versión de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Muestra el número de versión (solamente) de taskwarrior"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior solamente se puede copiar bajo los términos de la licencia MIT, que se pueden encontrar en el conjunto de código fuente de taskwarrior."
 
 #define STRING_CMD_VERSION_DOCS      "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-color', y 'man task-sync' o en http://taskwarrior.org."
-#define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconocido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."  // |esp-ESP|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Muestra el logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "El comando logo requiere que el soporte de color esté habilitado."
 #define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 0989165aa..55cb3dfd8 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Le rapport personnalisé '{1}' entre en conflit avec une commande prédéfinie de task."
 #define STRING_CMD_VERSION_USAGE     "Affiche le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Affiche uniquement le numéro de version de taskwarrior"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior ne peut être copié que selon les termes de la licence MIT, qui peuvent être trouvés dans les sources de taskwarrior."
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} compilé pour "
 #define STRING_CMD_VERSION_UNKNOWN   "inconnu"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Affiche le logo de Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "La commande logo nécessite le support des couleurs."
 #define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b907fc45d..d07313076 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -195,11 +195,8 @@
 #define STRING_CMD_CONFLICT          "Report personalizzato '{1}' provoca conflitto con un comando standard."
 #define STRING_CMD_VERSION_USAGE     "Mostra il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Mostra solo il numero di versione di taskwarrior"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior può essere copiato solo nei termini della licenza MIT, reperibile nei sorgenti di taskwarrior."
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} generato per "
 #define STRING_CMD_VERSION_UNKNOWN   "sconosciuto"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Mostra il logo di Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Il comando logo richiede l'abilitazione del supporto ai colori."
 #define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 982c6e3e4..aacf24c4c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "taskwarrior バージョン番号の表示"
 #define STRING_CMD_VERSION_USAGE2    "taskwarrior バージョン番号のみの表示"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior はMITライセンス下でのみコピーでき、それは taskwarrior source kit 中にあります。"
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} built for "
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Taskwarrior ロゴの表示"
 #define STRING_CMD_LOGO_COLOR_REQ    "色のサポートをする logo コマンドが有効になりました。"
 #define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 2d2241990..22b8e26c4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Raport urzytkownika '{1}' jest w konflikcie z wbudowanym poleceniem."
 #define STRING_CMD_VERSION_USAGE     "Pokazuje wersję programu taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Pokazuje numer wersji programu taskwarrior"
-#define STRING_CMD_VERSION_MIT       "Taskwarrior może być kopiowany tylko na zasadach licencji MIT, którą znaleźć można w źródłach programu taskwarrior."
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} zbudowane dla "
 #define STRING_CMD_VERSION_UNKNOWN   "nieznana"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
 #define STRING_CMD_LOGO_USAGE        "Wyświetla logo Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "Polecenie logo wymaga wsparcia kolorowania."
 #define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index dd1d097ba..9b7e9bb27 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -196,11 +196,8 @@
 #define STRING_CMD_CONFLICT          "Conflito entre relatório personalizado '{1}' e um comando interno do taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Exibe o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Exibe apenas o número de versão do taskwarrior"
-#define STRING_CMD_VERSION_MIT       "O Taskwarrior pode ser copiado apenas ao abrigo dos termos da licença MIT, que pode ser encontrada junto do código fonte."
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
-#define STRING_CMD_VERSION_BUILT     "{1} {2} construido para "
 #define STRING_CMD_VERSION_UNKNOWN   "desconhecido"
-#define STRING_CMD_VERSION_COPY      "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."  // |por-PRT|==|eng-USA|
 #define STRING_CMD_LOGO_USAGE        "Exibe o logotipo do Taskwarrior"
 #define STRING_CMD_LOGO_COLOR_REQ    "O comando logo requer que o suporte de cor seja ativado."
 #define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"

From d4edf577eb8d61686fe035290792847780e963b9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:11:12 -0500
Subject: [PATCH 587/879] l10n: Eliminated translation instructions

---
 src/l10n/deu-DEU.h | 65 --------------------------------------------
 src/l10n/eng-USA.h | 66 ---------------------------------------------
 src/l10n/epo-RUS.h | 65 --------------------------------------------
 src/l10n/esp-ESP.h | 65 --------------------------------------------
 src/l10n/fra-FRA.h | 65 --------------------------------------------
 src/l10n/ita-ITA.h | 65 --------------------------------------------
 src/l10n/jpn-JPN.h | 65 --------------------------------------------
 src/l10n/pol-POL.h | 67 +---------------------------------------------
 src/l10n/por-PRT.h | 65 --------------------------------------------
 9 files changed, 1 insertion(+), 587 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d86c078aa..2af938db0 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index dddea214a..974dd0996 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
@@ -327,7 +262,6 @@
 #define STRING_CMD_DELETE_1          "Deleted {1} task."
 #define STRING_CMD_DELETE_N          "Deleted {1} tasks."
 
-
 #define STRING_CMD_DUPLICATE_USAGE   "Duplicates the specified tasks"
 #define STRING_CMD_DUPLICATE_REC     "Note: task {1} was a parent recurring task.  The duplicated task is too."
 #define STRING_CMD_DUPLICATE_NON_REC "Note: task {1} was a recurring task.  The duplicated task is not."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index b1e45deca..72b815df1 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 738281cd4..f90cf1515 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 55cb3dfd8..15225c85a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d07313076..ee0414e17 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index aacf24c4c..e4de5922e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 22b8e26c4..14a22f277 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -1,4 +1,4 @@
-2018////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
 //
 // Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
 //
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9b7e9bb27..c3c75ea41 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -24,71 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// This file contains all the strings that should be localized.  If a string is
-// *not* in this file, then either:
-//   (a) it should not be localized, or
-//   (b) you have found a bug - please report it
-//
-// Strings that should be localized:
-//   - text output that the user sees
-//
-// Strings that should NOT be localized:
-//   - .taskrc configuration variable names
-//   - command names
-//   - extension function names
-//   - certain literals associated with parsing
-//   - debug strings
-//   - attribute names
-//   - modifier names
-//   - logical operators (and, or, xor)
-//
-// Rules:
-//   - Localized strings should not in general  contain leading or trailing
-//     white space, including \n, thus allowing the code to compose strings.
-//   - Retain the tense of the original string.
-//   - Retain the same degree of verbosity of the original string.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Translators:
-//   1. Copy this file (eng-USA.h) to a new file with the target locale as the
-//      file name.  Using German as an example, do this:
-//
-//        cp eng-USA.h deu-DEU.h
-//
-//   2. Modify all the strings below.
-//        i.e. change "Unknown error." to "Unbekannter Fehler.".
-//
-//   3. Add your new translation to the task.git/src/i18n.h file, if necessary,
-//      by inserting:
-//
-//        #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-//        #include <deu-DEU.h>
-//
-//   4. Add your new language to task.git/CMakeLists.txt, making sure that
-//      number is unique:
-//
-//        set (LANGUAGE_DEU_DEU 3)
-//
-//   5. Add your new language to task.git/cmake.h.in:
-//
-//        #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-//
-//   6. Build your localized Taskwarrior with these commands:
-//
-//      cd task.git
-//      cmake -D LANGUAGE=3 .
-//      make
-//
-//   7. Submit your translation to support@taskwarrior.org, where it will be
-//      shared with others.
-//
-////////////////////////////////////////////////////////////////////////////////
-
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 

From bd41582b971e2f869d2ce0aa8a8cc7245b331c34 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:28:43 -0500
Subject: [PATCH 588/879] l10n: Eliminated STRING_EVAL_*

---
 src/Eval.cpp               | 13 +++++++------
 src/columns/ColProject.cpp |  2 +-
 src/l10n/deu-DEU.h         |  8 --------
 src/l10n/eng-USA.h         |  8 --------
 src/l10n/epo-RUS.h         |  8 --------
 src/l10n/esp-ESP.h         |  8 --------
 src/l10n/fra-FRA.h         |  8 --------
 src/l10n/ita-ITA.h         |  8 --------
 src/l10n/jpn-JPN.h         |  8 --------
 src/l10n/pol-POL.h         |  8 --------
 src/l10n/por-PRT.h         |  8 --------
 11 files changed, 8 insertions(+), 79 deletions(-)

diff --git a/src/Eval.cpp b/src/Eval.cpp
index 89a75d8a4..bc9f62031 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -33,7 +33,8 @@
 #include <Color.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
+
+#define STRING_EVAL_NO_EVAL "The expression could not be evaluated."
 
 extern Context context;
 extern Task& contextTask;
@@ -221,7 +222,7 @@ void Eval::evaluatePostfixStack (
   Variant& result) const
 {
   if (tokens.size () == 0)
-    throw std::string (STRING_EVAL_NO_EXPRESSION);
+    throw std::string ("No expression to evaluate.");
 
   // This is stack used by the postfix evaluator.
   std::vector <Variant> values;
@@ -303,7 +304,7 @@ void Eval::evaluatePostfixStack (
       else if (token.first == "_hastag_") result = left.operator_hastag (right, contextTask);
       else if (token.first == "_notag_")  result = left.operator_notag (right, contextTask);
       else
-        throw format (STRING_EVAL_UNSUPPORTED, token.first);
+        throw format ("Unsupported operator '{1}'.", token.first);
 
       values.push_back (result);
 
@@ -333,7 +334,7 @@ void Eval::evaluatePostfixStack (
         break;
 
       case Lexer::Type::op:
-        throw std::string (STRING_EVAL_OP_EXPECTED);
+        throw std::string ("Operator expected.");
         break;
 
       case Lexer::Type::dom:
@@ -388,7 +389,7 @@ void Eval::evaluatePostfixStack (
   // If there is more than one variant left on the stack, then the original
   // expression was not valid.
   if (values.size () != 1)
-    throw std::string (STRING_EVAL_NOT_EXPRESSION);
+    throw std::string ("The value is not an expression.");
 
   result = values[0];
 }
@@ -796,7 +797,7 @@ void Eval::infixToPostfix (
   {
     if (op_stack.back ().first == "(" ||
         op_stack.back ().first == ")")
-      throw std::string (STRING_PAREN_MISMATCH);
+      throw std::string ("Mismatched parentheses in expression");
 
     postfix.push_back (op_stack.back ());
     op_stack.pop_back ();
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index d93643bd0..1c6afc4a7 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -134,7 +134,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
     {
       // If the expression failed because it didn't look like an expression,
       // simply store it as-is.
-      if (e == STRING_EVAL_NOT_EXPRESSION)
+      if (e == "The value is not an expression.")
       {
         task.set (_name, value);
         context.debug (label + _name + " <-- '" + value + '\'');
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 2af938db0..e7d8f0587 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -537,14 +537,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Unbekannten Namen nicht erkannt '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "Kein Ausdruck auszuwerten."
-#define STRING_EVAL_UNSUPPORTED      "Nicht unterstützter Operator: '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operator erwartet."
-#define STRING_EVAL_NO_EVAL          "Der Ausdruck konnte nicht ausgewertet werden."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Ungültige Klammerung in Ausdruck."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Keine Änderungen entdeckt."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 974dd0996..6bbdd6d5b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -534,14 +534,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "No expression to evaluate."
-#define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operator expected."
-#define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 72b815df1..1c0db7f53 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -537,14 +537,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Ne povis inspekti nekonatan nomon '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "Nenia esprimo por kalkuli."
-#define STRING_EVAL_UNSUPPORTED      "Ne subtenas infikson '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Anticipis infikson."
-#define STRING_EVAL_NO_EVAL          "Ne povis kalkuli la esprimon."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Malbalancataj parentezoj en esprimo"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Ne detektis nenian redakton."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index f90cf1515..2d2b90021 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -549,14 +549,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: No se pudo obtener el nombre no reconocido '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "Ninguna expresión para evaluar."
-#define STRING_EVAL_UNSUPPORTED      "Operador no soportado '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Se esperaba operador."
-#define STRING_EVAL_NO_EVAL          "La expresión podría no ser evaluada."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Paréntesis desemparejados en expresión"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No se detectaron modificaciones."
 #define STRING_EDIT_FAILED           "Edición fallida con código de salida {1}."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 15225c85a..0dcca65de 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -539,14 +539,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "No expression to evaluate."
-#define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operator expected."
-#define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Aucunes modifications détectées."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ee0414e17..bb2b23f28 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -538,14 +538,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Impossibile ottenere il nome non riconosciuto '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "No expression to evaluate."
-#define STRING_EVAL_UNSUPPORTED      "Operatore non supportato '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operator expected."
-#define STRING_EVAL_NO_EVAL          "The expression could not be evaluated."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nessuna modifica riscontrata."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index e4de5922e..312c476cf 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -539,14 +539,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "No expression to evaluate."
-#define STRING_EVAL_UNSUPPORTED      "Unsupported operator '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operator expected."
-#define STRING_EVAL_NO_EVAL          "式を評価出来ません。"
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Mismatched parentheses in expression"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 14a22f277..385e7783e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -539,14 +539,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Nie mogę pobrać nierozpoznanej nazwy '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "Brak wyrażenia do przetworzenia."
-#define STRING_EVAL_UNSUPPORTED      "Niewspierany operator '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Oczekiwany operator."
-#define STRING_EVAL_NO_EVAL          "Wyrażenie nie może być przetworzone."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Niedopasowane nawiasy w wyrażeniu"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nie znaleziono żadnych edycji."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c3c75ea41..6c1bd0423 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -539,14 +539,6 @@
 // DOM
 #define STRING_DOM_UNREC             "DOM: Não foi possível obter nome não reconhecido '{1}'."
 
-// Eval
-#define STRING_EVAL_NO_EXPRESSION    "Nenhuma expressão a calcular."
-#define STRING_EVAL_UNSUPPORTED      "Operador não suportado '{1}'."
-#define STRING_EVAL_OP_EXPECTED      "Operador em falta."
-#define STRING_EVAL_NO_EVAL          "Não foi possível calcular a expressão."
-#define STRING_EVAL_NOT_EXPRESSION   "The value is not an expression."
-#define STRING_PAREN_MISMATCH        "Parentesis incompatíveis na expressão."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Não foram detetadas alterações."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."

From 73614317990b8f518c8aad295b68956e6fc2ade7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:32:32 -0500
Subject: [PATCH 589/879] l10n: Eliminated STRING_DOM_UNREC

---
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 9 files changed, 27 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e7d8f0587..1e9d454d9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -534,9 +534,6 @@
 #define STRING_DEPEND_BLOCKING       "und blockiert:"
 #define STRING_DEPEND_FIX_CHAIN      "Möchten Sie, dass diese Abhängigkeitskette korrigiert wird?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Unbekannten Namen nicht erkannt '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Keine Änderungen entdeckt."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6bbdd6d5b..38272f48b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -531,9 +531,6 @@
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1c0db7f53..38cdbd535 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -534,9 +534,6 @@
 #define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
 #define STRING_DEPEND_FIX_CHAIN      "Ĉu vi volas, ke la dependeca ĉeno repariĝus?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Ne povis inspekti nekonatan nomon '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Ne detektis nenian redakton."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 2d2b90021..782ca7fe4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -546,9 +546,6 @@
 #define STRING_DEPEND_BLOCKING       "y está bloqueando:"
 #define STRING_DEPEND_FIX_CHAIN      "¿Desea que la cadena de dependencias sea arreglada?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: No se pudo obtener el nombre no reconocido '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No se detectaron modificaciones."
 #define STRING_EDIT_FAILED           "Edición fallida con código de salida {1}."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 0dcca65de..21becccb3 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -536,9 +536,6 @@
 #define STRING_DEPEND_BLOCKING       "et bloque :"
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Aucunes modifications détectées."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index bb2b23f28..6b723cb03 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -535,9 +535,6 @@
 #define STRING_DEPEND_BLOCKING       "e sta bloccando:"
 #define STRING_DEPEND_FIX_CHAIN      "Si desidera riparare la catena delle dipendenze?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Impossibile ottenere il nome non riconosciuto '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nessuna modifica riscontrata."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 312c476cf..6a022425e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -536,9 +536,6 @@
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
 #define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Cannot get unrecognized name '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 385e7783e..921a5b821 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -536,9 +536,6 @@
 #define STRING_DEPEND_BLOCKING       "oraz blokuje:"
 #define STRING_DEPEND_FIX_CHAIN      "Czy chcesz naprawić łańcuch zależności?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Nie mogę pobrać nierozpoznanej nazwy '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nie znaleziono żadnych edycji."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6c1bd0423..25648e3dd 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -536,9 +536,6 @@
 #define STRING_DEPEND_BLOCKING       "e está a bloquear:"
 #define STRING_DEPEND_FIX_CHAIN      "Deseja que a cadeia de dependências seja corrigida?"
 
-// DOM
-#define STRING_DOM_UNREC             "DOM: Não foi possível obter nome não reconhecido '{1}'."
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Não foram detetadas alterações."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."

From ff02cf8613adac0650c1bd1f7074013a95c7b0e0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:39:48 -0500
Subject: [PATCH 590/879] l10n: Eliminated STRING_ERROR_CONFIRM_SIGINT

---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/util.cpp       | 2 +-
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1e9d454d9..7f71b4675 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -612,7 +612,6 @@
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 38272f48b..f5e3e61d1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -609,7 +609,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 38cdbd535..70fa7e013 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -612,7 +612,6 @@
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 782ca7fe4..c340c1c3f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -624,7 +624,6 @@
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "El estatus '{1}' no es válido."
 
 // Feedback
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 21becccb3..1c4e1169c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -614,7 +614,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 6b723cb03..ab50c8317 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -613,7 +613,6 @@
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6a022425e..7f5062b8b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -614,7 +614,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 921a5b821..84fe51551 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -614,7 +614,6 @@
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 25648e3dd..ad38a44cc 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -614,7 +614,6 @@
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_CONFIRM_SIGINT  "Interrupted: No changes made."
 #define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
diff --git a/src/util.cpp b/src/util.cpp
index e83cef1a2..a5ff2e19f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -67,7 +67,7 @@ static void signal_handler (int s)
 {
   if (s == SIGINT)
   {
-    std::cout << "\n\n" << STRING_ERROR_CONFIRM_SIGINT << '\n';
+    std::cout << "\n\nInterrupted: No changes made.\n";
     exit (1);
   }
 }

From bc90b9a4e1e7e059a50c39dc75132884bb4f3b17 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:43:34 -0500
Subject: [PATCH 591/879] l10n: Eliminated STRING_UTIL_CONFIRM_*

---
 src/l10n/deu-DEU.h | 8 --------
 src/l10n/eng-USA.h | 8 --------
 src/l10n/epo-RUS.h | 8 --------
 src/l10n/esp-ESP.h | 8 --------
 src/l10n/fra-FRA.h | 8 --------
 src/l10n/ita-ITA.h | 8 --------
 src/l10n/jpn-JPN.h | 8 --------
 src/l10n/pol-POL.h | 8 --------
 src/l10n/por-PRT.h | 8 --------
 src/util.cpp       | 9 +++++++--
 10 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7f71b4675..5559264fd 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -721,14 +721,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "ja"
-#define STRING_UTIL_CONFIRM_YES_U    "Ja"
-#define STRING_UTIL_CONFIRM_NO       "nein"
-#define STRING_UTIL_CONFIRM_ALL      "alle"
-#define STRING_UTIL_CONFIRM_ALL_U    "Alle"
-#define STRING_UTIL_CONFIRM_QUIT     "abbrechen"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f5e3e61d1..164145997 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -718,14 +718,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "yes"
-#define STRING_UTIL_CONFIRM_YES_U    "Yes"
-#define STRING_UTIL_CONFIRM_NO       "no"
-#define STRING_UTIL_CONFIRM_ALL      "all"
-#define STRING_UTIL_CONFIRM_ALL_U    "All"
-#define STRING_UTIL_CONFIRM_QUIT     "quit"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 70fa7e013..240cb7666 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -721,14 +721,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "jes"
-#define STRING_UTIL_CONFIRM_YES_U    "Jes"
-#define STRING_UTIL_CONFIRM_NO       "ne"
-#define STRING_UTIL_CONFIRM_ALL      "ĉia"
-#define STRING_UTIL_CONFIRM_ALL_U    "Ĉia"
-#define STRING_UTIL_CONFIRM_QUIT     "eliru"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c340c1c3f..69f389300 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -734,14 +734,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "sí"
-#define STRING_UTIL_CONFIRM_YES_U    "Sí"
-#define STRING_UTIL_CONFIRM_NO       "no"  // |esp-ESP|==|eng-USA|
-#define STRING_UTIL_CONFIRM_ALL      "todos"
-#define STRING_UTIL_CONFIRM_ALL_U    "Todos"
-#define STRING_UTIL_CONFIRM_QUIT     "canc"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Encontrado atributo anticuado.  Por favor, cambie '{1}' a '{2}'."
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 1c4e1169c..6ab638be1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -723,14 +723,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "oui"
-#define STRING_UTIL_CONFIRM_YES_U    "Oui"
-#define STRING_UTIL_CONFIRM_NO       "non"
-#define STRING_UTIL_CONFIRM_ALL      "tous"
-#define STRING_UTIL_CONFIRM_ALL_U    "Tous"
-#define STRING_UTIL_CONFIRM_QUIT     "quitter"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ab50c8317..9a80f12f5 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -722,14 +722,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "si"
-#define STRING_UTIL_CONFIRM_YES_U    "Si"
-#define STRING_UTIL_CONFIRM_NO       "no"
-#define STRING_UTIL_CONFIRM_ALL      "tutti"
-#define STRING_UTIL_CONFIRM_ALL_U    "Tutti"
-#define STRING_UTIL_CONFIRM_QUIT     "esci"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 7f5062b8b..8d4ddb591 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -723,14 +723,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "yes"
-#define STRING_UTIL_CONFIRM_YES_U    "Yes"
-#define STRING_UTIL_CONFIRM_NO       "no"
-#define STRING_UTIL_CONFIRM_ALL      "all"
-#define STRING_UTIL_CONFIRM_ALL_U    "All"
-#define STRING_UTIL_CONFIRM_QUIT     "quit"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "古い属性が見つかった。'{1}' を '{2}' に変更してください。"
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 84fe51551..4df09a577 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -723,14 +723,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "tak"
-#define STRING_UTIL_CONFIRM_YES_U    "Tak"
-#define STRING_UTIL_CONFIRM_NO       "nie"
-#define STRING_UTIL_CONFIRM_ALL      "wszystko"
-#define STRING_UTIL_CONFIRM_ALL_U    "Wszystko"
-#define STRING_UTIL_CONFIRM_QUIT     "wyjście"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ad38a44cc..eb5d22dcc 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -723,14 +723,6 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}."
 
-// util
-#define STRING_UTIL_CONFIRM_YES      "sim"
-#define STRING_UTIL_CONFIRM_YES_U    "Sim"
-#define STRING_UTIL_CONFIRM_NO       "não"
-#define STRING_UTIL_CONFIRM_ALL      "todas"
-#define STRING_UTIL_CONFIRM_ALL_U    "Todas"
-#define STRING_UTIL_CONFIRM_QUIT     "Sair"
-
 // Legacy
 #define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
 
diff --git a/src/util.cpp b/src/util.cpp
index a5ff2e19f..b5aa15873 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -50,12 +50,17 @@
 #include <pwd.h>
 #include <signal.h>
 #include <sys/select.h>
-
 #include <Lexer.h>
 #include <utf8.h>
 #include <util.h>
 #include <main.h>
-#include <i18n.h>
+
+#define STRING_UTIL_CONFIRM_YES      "yes"
+#define STRING_UTIL_CONFIRM_YES_U    "Yes"
+#define STRING_UTIL_CONFIRM_NO       "no"
+#define STRING_UTIL_CONFIRM_ALL      "all"
+#define STRING_UTIL_CONFIRM_ALL_U    "All"
+#define STRING_UTIL_CONFIRM_QUIT     "quit"
 
 extern Context context;
 

From 8e87f3f9691330cef1043654e049280bccbeaaa7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 15 Jan 2018 13:59:07 -0500
Subject: [PATCH 592/879] l10n: Eliminated STRING_LEGACY_PRIORITY

---
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 src/legacy.cpp     | 2 ++
 10 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 5559264fd..0b4ca9d9c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -721,7 +721,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 164145997..c70684526 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -718,7 +718,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 240cb7666..f6b0577ce 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -721,7 +721,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 69f389300..05b23dee1 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -734,7 +734,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Encontrado atributo anticuado.  Por favor, cambie '{1}' a '{2}'."
-
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 6ab638be1..f9e85791f 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -723,7 +723,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 9a80f12f5..96db758dd 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -722,7 +722,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 8d4ddb591..66cefaaff 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -723,7 +723,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "古い属性が見つかった。'{1}' を '{2}' に変更してください。"
-
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 4df09a577..522a26656 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -723,7 +723,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index eb5d22dcc..3044c9649 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -723,7 +723,4 @@
 // View
 #define STRING_VIEW_TOO_SMALL        "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}."
 
-// Legacy
-#define STRING_LEGACY_PRIORITY       "Legacy attribute found.  Please change '{1}' to '{2}'."
-
 #endif
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 5c2cc44f7..1a4b7a459 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -31,6 +31,8 @@
 #include <format.h>
 #include <i18n.h>
 
+#define STRING_LEGACY_PRIORITY "Legacy attribute found.  Please change '{1}' to '{2}'."
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////

From 1fc7dc39510ff8a59417afb280585658d31bc8fe Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 17 Jan 2018 21:12:10 -0500
Subject: [PATCH 593/879] l10n: Eliminated STRING_CMD_EXPORT_USAGE

---
 src/commands/CmdExport.cpp | 3 +--
 src/l10n/deu-DEU.h         | 1 -
 src/l10n/eng-USA.h         | 1 -
 src/l10n/epo-RUS.h         | 1 -
 src/l10n/esp-ESP.h         | 1 -
 src/l10n/fra-FRA.h         | 1 -
 src/l10n/ita-ITA.h         | 1 -
 src/l10n/jpn-JPN.h         | 1 -
 src/l10n/pol-POL.h         | 1 -
 src/l10n/por-PRT.h         | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index b25e79a9c..449fb8259 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -29,7 +29,6 @@
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -38,7 +37,7 @@ CmdExport::CmdExport ()
 {
   _keyword               = "export";
   _usage                 = "task <filter> export";
-  _description           = STRING_CMD_EXPORT_USAGE;
+  _description           = "Exports tasks in JSON format";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 0b4ca9d9c..cae7db4a2 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_EXPORT_USAGE      "Exportiert Aufgaben im JSON-Format"
 #define STRING_CMD_INFO_USAGE        "Zeigt alle Daten und Metadaten"
 #define STRING_CMD_INFO_BLOCKED      "Aufgabe blockiert durch"
 #define STRING_CMD_INFO_BLOCKING     "Aufgabe blockiert"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index c70684526..3a072a903 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -153,7 +153,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_EXPORT_USAGE      "Exports tasks in JSON format"
 #define STRING_CMD_INFO_USAGE        "Shows all data and metadata"
 #define STRING_CMD_INFO_BLOCKED      "This task blocked by"
 #define STRING_CMD_INFO_BLOCKING     "This task is blocking"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f6b0577ce..480d548f4 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
-#define STRING_CMD_EXPORT_USAGE      "Eksportas taskojn, je JSON-aranĝo"
 #define STRING_CMD_INFO_USAGE        "Montras datumojn kaj metadatumojn"
 #define STRING_CMD_INFO_BLOCKED      "Tiu tasko blokata per"
 #define STRING_CMD_INFO_BLOCKING     "Tiu tasko blokas"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 05b23dee1..b500f8cad 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -155,7 +155,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_EXPORT_USAGE      "Exporta tareas en formato JSON"
 // metadatos: RAE 3ªed
 #define STRING_CMD_INFO_USAGE        "Muestra todos los datos y metadatos"
 #define STRING_CMD_INFO_BLOCKED      "Esta tarea está bloqueada por"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f9e85791f..01175e410 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
-#define STRING_CMD_EXPORT_USAGE      "Exporte les tâches au format JSON"
 #define STRING_CMD_INFO_USAGE        "Affiche toutes les données et méta-données"
 #define STRING_CMD_INFO_BLOCKED      "Cette tâche est bloquée par"
 #define STRING_CMD_INFO_BLOCKING     "Cette tâche bloque"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 96db758dd..8a0da1411 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -155,7 +155,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_EXPORT_USAGE      "Esporta i task in formato JSON"
 #define STRING_CMD_INFO_USAGE        "Mostra tutti i dati e i metadati"
 #define STRING_CMD_INFO_BLOCKED      "Questo task è bloccato da"
 #define STRING_CMD_INFO_BLOCKING     "Questo task sta bloccando"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 66cefaaff..ac522d3b2 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_EXPORT_USAGE      "JSON 形式で タスク をエクスポート"
 #define STRING_CMD_INFO_USAGE        "すべてのデータとメタデータを表示"
 #define STRING_CMD_INFO_BLOCKED      "This task blocked by"
 #define STRING_CMD_INFO_BLOCKING     "This task is blocking"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 522a26656..d3dc3b4a1 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
-#define STRING_CMD_EXPORT_USAGE      "Eksportuje zadania do formatu JSON"
 #define STRING_CMD_INFO_USAGE        "Pokazuje wszystkie dane i metadane"
 #define STRING_CMD_INFO_BLOCKED      "To zadanie jest blokowane przez"
 #define STRING_CMD_INFO_BLOCKING     "To zadanie blokuje"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 3044c9649..fa07c825e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -156,7 +156,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
-#define STRING_CMD_EXPORT_USAGE      "Exporta tarefas para o formato JSON"
 #define STRING_CMD_INFO_USAGE        "Exibe todos os dados e meta-dados"
 #define STRING_CMD_INFO_BLOCKED      "Esta tarefa está bloqueada por"
 #define STRING_CMD_INFO_BLOCKING     "Esta tarefa bloqueia"

From 72383a7d7f61aa5bb825d71a8fee251c4b79ee7d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 17 Jan 2018 21:16:20 -0500
Subject: [PATCH 594/879] l10n: Eliminated STRING_TASK_VALID_RECUR

---
 src/Task.cpp       | 3 ++-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/recur.cpp      | 2 +-
 11 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 210bc0685..3f0f81dec 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1646,7 +1646,8 @@ void Task::validate (bool applyDefault /* = true */)
       Duration p;
       std::string::size_type i = 0;
       if (! p.parse (value, i))
-        throw format (STRING_TASK_VALID_RECUR, value);
+        // TODO Ideal location to map unsupported old recurrence periods to supported values.
+        throw format ("The recurrence value '{1}' is not valid.", value);
     }
   }
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index cae7db4a2..7b26d49c6 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -687,7 +687,6 @@
 #define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
 #define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
 #define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
-#define STRING_TASK_VALID_RECUR      "Wiederhol-Periode '{1}' ist ungültig."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3a072a903..a0a5c0e77 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -684,7 +684,6 @@
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 480d548f4..33b85c713 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -687,7 +687,6 @@
 #define STRING_TASK_VALID_BLANK      "Ne povas krei blankan taskon."
 #define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
-#define STRING_TASK_VALID_RECUR      "Reokaz-valoro '{1}' ne estas valida."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b500f8cad..5ea626298 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -699,7 +699,6 @@
 #define STRING_TASK_VALID_BLANK      "No se puede añadir una tarea que está en blanco."
 #define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
-#define STRING_TASK_VALID_RECUR      "El valor de recurrencia '{1}' no es válido."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 01175e410..19843eda0 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -689,7 +689,6 @@
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8a0da1411..0a4de2151 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -688,7 +688,6 @@
 #define STRING_TASK_VALID_BLANK      "Impossibile aggiungere un task vuoto."
 #define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
-#define STRING_TASK_VALID_RECUR      "Il valore di periodicità '{1}' non è valido."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ac522d3b2..6e22afdac 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -689,7 +689,6 @@
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index d3dc3b4a1..e0247ab39 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -689,7 +689,6 @@
 #define STRING_TASK_VALID_BLANK      "Nie można dodać pustego zadania."
 #define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
-#define STRING_TASK_VALID_RECUR      "Wartość '{1}' określająca okres zadania jest niepoprawna."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index fa07c825e..b1358d7da 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -689,7 +689,6 @@
 #define STRING_TASK_VALID_BLANK      "Não é possível adicionar uma tarefa em branco."
 #define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."
-#define STRING_TASK_VALID_RECUR      "O valor de recorrência '{1}' não é válido."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 #define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
diff --git a/src/recur.cpp b/src/recur.cpp
index 32a80b140..422cdbc8a 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -368,7 +368,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
   std::string::size_type idx = 0;
   Duration p;
   if (! p.parse (period, idx))
-    throw std::string (format (STRING_TASK_VALID_RECUR, period));
+    throw std::string (format ("The recurrence value '{1}' is not valid.", period));
 
   return current + p.toTime_t ();
 }

From 61d4cb2a6e8b04549397ad507dae55bc75ebcd63 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 17 Jan 2018 21:19:11 -0500
Subject: [PATCH 595/879] l10n: Eliminated STRING_RECUR_CREATE

---
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 src/recur.cpp      | 2 +-
 10 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7b26d49c6..420b349a4 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -713,9 +713,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Beende mit ungeschriebenen Änderungen auf {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}."
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a0a5c0e77..922b75c2f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -710,9 +710,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 33b85c713..322e83a81 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -713,9 +713,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Eliranta kun neskribitajn ŝanĝojn al {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}."
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5ea626298..bc9778359 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -726,9 +726,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Saliendo con cambios sin escribir a {1}"
 #define STRING_TDB2_UNWAIT           "Tarea no en espera '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creando instancia de tarea recurrente '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}."
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 19843eda0..4948ff6c2 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -715,9 +715,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0a4de2151..6a43be4b3 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -714,9 +714,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}."
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6e22afdac..f742c351a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -715,9 +715,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e0247ab39..2a8e3e894 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -715,9 +715,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Zamykanie z niezapisanymi zmianami w {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}."
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index b1358d7da..6668dc8e3 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -715,9 +715,6 @@
 #define STRING_TDB2_DIRTY_EXIT       "Saindo com modificações por gravar de {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// recur.cpp
-#define STRING_RECUR_CREATE          "Creating recurring task instance '{1}'"
-
 // View
 #define STRING_VIEW_TOO_SMALL        "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}."
 
diff --git a/src/recur.cpp b/src/recur.cpp
index 422cdbc8a..15d71a9bf 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -131,7 +131,7 @@ void handleRecurrence ()
         context.tdb2.modify (t);
 
         if (context.verbose ("recur"))
-          context.footnote (format (STRING_RECUR_CREATE, t.get ("description")));
+          context.footnote (format ("Creating recurring task instance '{1}'", t.get ("description")));
       }
     }
 

From b1a593d27ee6ee70f73597dd659438cf5033ff64 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 17 Jan 2018 21:21:44 -0500
Subject: [PATCH 596/879] l10n: Eliminated STRING_VIEW_TOO_SMALL

---
 src/ViewTask.cpp   | 2 +-
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 10 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index cb10653c7..411b6191c 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -208,7 +208,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
   // Not enough for minimum.
   else if (overage < 0)
   {
-    context.error (format (STRING_VIEW_TOO_SMALL, sum_minimal + all_extra, _width));
+    context.error (format ("The report has a minimum width of {1} and does not fit in the available width of {2}.", sum_minimal + all_extra, _width));
     widths = minimal;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 420b349a4..c6bfd0241 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -713,7 +713,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Beende mit ungeschriebenen Änderungen auf {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}."
-
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 922b75c2f..3fefb8936 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -710,7 +710,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
-
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 322e83a81..4153e7fd8 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -713,7 +713,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Eliranta kun neskribitajn ŝanĝojn al {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}."
-
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index bc9778359..5eb27a57b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -726,7 +726,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Saliendo con cambios sin escribir a {1}"
 #define STRING_TDB2_UNWAIT           "Tarea no en espera '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}."
-
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 4948ff6c2..532031b46 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -715,7 +715,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
-
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 6a43be4b3..81385915c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -714,7 +714,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}."
-
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f742c351a..49a9639fc 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -715,7 +715,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "The report has a minimum width of {1} and does not fit in the available width of {2}."
-
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 2a8e3e894..2b1fe3249 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -715,7 +715,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Zamykanie z niezapisanymi zmianami w {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}."
-
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6668dc8e3..43aa6dada 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -715,7 +715,4 @@
 #define STRING_TDB2_DIRTY_EXIT       "Saindo com modificações por gravar de {1}"
 #define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
 
-// View
-#define STRING_VIEW_TOO_SMALL        "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}."
-
 #endif

From 2854aba5e3d7b03287cc0a55b4c01f5e0a128dac Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:18:29 -0500
Subject: [PATCH 597/879] l10n: Eliminated STRING_TDB2_*

---
 src/TDB2.cpp       | 40 ++++++++++++++++++++--------------------
 src/l10n/deu-DEU.h | 21 ---------------------
 src/l10n/eng-USA.h | 21 ---------------------
 src/l10n/epo-RUS.h | 21 ---------------------
 src/l10n/esp-ESP.h | 22 ----------------------
 src/l10n/fra-FRA.h | 21 ---------------------
 src/l10n/ita-ITA.h | 21 ---------------------
 src/l10n/jpn-JPN.h | 21 ---------------------
 src/l10n/pol-POL.h | 21 ---------------------
 src/l10n/por-PRT.h | 21 ---------------------
 10 files changed, 20 insertions(+), 210 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 3c5117ca4..e400216d5 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -36,13 +36,14 @@
 #include <Context.h>
 #include <Color.h>
 #include <Datetime.h>
-#include <i18n.h>
 #include <Table.h>
 #include <shared.h>
 #include <format.h>
 #include <main.h>
 #include <util.h>
 
+#define STRING_TDB2_REVERTED         "Modified task reverted."
+
 extern Context context;
 
 bool TDB2::debug_mode = false;
@@ -62,8 +63,7 @@ TF2::TF2 ()
 TF2::~TF2 ()
 {
   if (_dirty && TDB2::debug_mode)
-    std::cout << format (STRING_TDB2_DIRTY_EXIT, std::string (_file))
-              << '\n';
+    std::cout << format ("Exiting with unwritten changes to {1}\n", std::string (_file));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -369,7 +369,7 @@ void TF2::load_gc (Task& task)
       context.tdb2.pending._dirty = true;
 
       if (context.verbose ("unwait"))
-        context.footnote (format (STRING_TDB2_UNWAIT, task.get ("description")));
+        context.footnote (format ("Un-waiting task '{1}'", task.get ("description")));
     }
 
     context.tdb2.pending._tasks.push_back (task);
@@ -424,7 +424,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
 
   catch (const std::string& e)
   {
-    throw e + format (STRING_TDB2_PARSE_ERROR, _file._data, line_number);
+    throw e + format (" in {1} at line {2}", _file._data, line_number);
   }
 
   context.time_load_us += timer.total_us ();
@@ -640,7 +640,7 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
   // If the tasks are loaded, then verify that this uuid is not already in
   // the file.
   if (!verifyUniqueUUID (uuid))
-    throw format (STRING_TDB2_UUID_NOT_UNIQUE, uuid);
+    throw format ("Cannot add task because the uuid '{1}' is not unique.", uuid);
 
   // Only locally-added tasks trigger hooks.  This means that tasks introduced
   // via 'sync' do not trigger hooks.
@@ -804,7 +804,7 @@ void TDB2::revert ()
   // Display diff and confirm.
   show_diff (current, prior, when);
   if (! context.config.getBoolean ("confirmation") ||
-      confirm (STRING_TDB2_UNDO_CONFIRM))
+      confirm ("The undo command is not reversible.  Are you sure you want to revert to the previous state?"))
   {
     // There are six kinds of change possible.  Determine which one, and act
     // accordingly.
@@ -859,7 +859,7 @@ void TDB2::revert ()
     File::write (backlog._file._data, b);
   }
   else
-    std::cout << STRING_CMD_CONFIG_NO_CHANGE << '\n';
+    std::cout << "No changes made.\n";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -871,7 +871,7 @@ void TDB2::revert_undo (
   std::string& prior)
 {
   if (u.size () < 3)
-    throw std::string (STRING_TDB2_NO_UNDO);
+    throw std::string ("There are no recorded transactions to undo.");
 
   // pop last tx
   u.pop_back (); // separator.
@@ -898,7 +898,7 @@ void TDB2::revert_undo (
   if (uuidAtt != std::string::npos)
     uuid = current.substr (uuidAtt + 6, 36); // "uuid:"<uuid>" --> <uuid>
   else
-    throw std::string (STRING_TDB2_MISSING_UUID);
+    throw std::string ("Cannot locate UUID in task to undo.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -925,7 +925,7 @@ void TDB2::revert_pending (
       else
       {
         p.erase (task);
-        std::cout << STRING_TDB2_REMOVED << '\n';
+        std::cout << "Task removed.\n";
       }
 
       break;
@@ -976,7 +976,7 @@ void TDB2::revert_completed (
         context.debug ("TDB::revert_completed - task removed");
       }
 
-      std::cout << STRING_TDB2_UNDO_COMPLETE << '\n';
+      std::cout << "Undo complete.\n";
       break;
     }
   }
@@ -1019,7 +1019,7 @@ void TDB2::revert_backlog (
   }
 
   if (!found)
-    throw std::string (STRING_TDB2_UNDO_SYNCED);
+    throw std::string ("Cannot undo change because the task was already synced.  Modify the task instead.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1037,7 +1037,7 @@ void TDB2::show_diff (
   if (context.config.get ("undo.style") == "side")
   {
     std::cout << '\n'
-              << format (STRING_TDB2_LAST_MOD, lastChange.toString ())
+              << format ("The last modification was made {1}", lastChange.toString ())
               << '\n';
 
     // Attributes are all there is, so figure the different attribute names
@@ -1046,8 +1046,8 @@ void TDB2::show_diff (
     view.width (context.getWidth ());
     view.intraPadding (2);
     view.add ("");
-    view.add (STRING_TDB2_UNDO_PRIOR);
-    view.add (STRING_TDB2_UNDO_CURRENT);
+    view.add ("Prior Values");
+    view.add ("Current Values");
     setHeaderUnderline (view);
 
     Task after (current);
@@ -1145,12 +1145,12 @@ void TDB2::show_diff (
     view.add ("");
 
     int row = view.addRow ();
-    view.set (row, 0, STRING_TDB2_DIFF_PREV, color_red);
-    view.set (row, 1, STRING_TDB2_DIFF_PREV_DESC, color_red);
+    view.set (row, 0, "--- previous state", color_red);
+    view.set (row, 1, "Undo will restore this state", color_red);
 
     row = view.addRow ();
-    view.set (row, 0, STRING_TDB2_DIFF_CURR, color_green);  // Note trailing space.
-    view.set (row, 1, format (STRING_TDB2_DIFF_CURR_DESC,
+    view.set (row, 0, "+++ current state ", color_green);
+    view.set (row, 1, format ("Change made {1}",
                               lastChange.toString (context.config.get ("dateformat"))),
                       color_green);
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c6bfd0241..5d215c08f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -692,25 +692,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
 #define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " in {1} in Zeile {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Kann Aufgabe nicht hinzufügen, weil UUID '{1}' nicht eindeutig ist."
-#define STRING_TDB2_MISSING          "Fehlendes                     {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Keine rückgängig zu machenden Transaktionen."
-#define STRING_TDB2_LAST_MOD         "Die letzte Änderung wurde {1} durchgeführt"
-#define STRING_TDB2_UNDO_PRIOR       "Vorherige Werte"
-#define STRING_TDB2_UNDO_CURRENT     "Aktuelle Werte"
-#define STRING_TDB2_DIFF_PREV        "--- Vorheriger Zustand"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "undo wird folgenden Zustand wiederherstellen" //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ Aktueller Zustand "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Change made {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "Der undo-Befehl ist nicht rückgängig zu machen.  Wollen Sie wirklich zum vorherigen Zustand zurückkehren?"
-#define STRING_TDB2_MISSING_UUID     "Kann UUID der rückgängig zu machenden Aufgabe nicht finden."
-#define STRING_TDB2_REVERTED         "Veränderte Aufgabe wiederhergestellt."
-#define STRING_TDB2_REMOVED          "Aufgabe entfernt."
-#define STRING_TDB2_UNDO_COMPLETE    "Rückgängig machen abgeschlossen."
-#define STRING_TDB2_UNDO_SYNCED      "Kann Änderung nicht rückgängig machen, weil die Aufgabe bereits abgeglichen wurde.  Aufgabe stattdessen löschen."
-#define STRING_TDB2_DIRTY_EXIT       "Beende mit ungeschriebenen Änderungen auf {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3fefb8936..f98983fc5 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -689,25 +689,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " in {1} at line {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Cannot add task because the uuid '{1}' is not unique."
-#define STRING_TDB2_MISSING          "Missing                       {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "There are no recorded transactions to undo."
-#define STRING_TDB2_LAST_MOD         "The last modification was made {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Prior Values"
-#define STRING_TDB2_UNDO_CURRENT     "Current Values"
-#define STRING_TDB2_DIFF_PREV        "--- previous state"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Undo will restore this state"   //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ current state "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Change made {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "The undo command is not reversible.  Are you sure you want to revert to the previous state?"
-#define STRING_TDB2_MISSING_UUID     "Cannot locate UUID in task to undo."
-#define STRING_TDB2_REVERTED         "Modified task reverted."
-#define STRING_TDB2_REMOVED          "Task removed."
-#define STRING_TDB2_UNDO_COMPLETE    "Undo complete."
-#define STRING_TDB2_UNDO_SYNCED      "Cannot undo change because the task was already synced.  Modify the task instead."
-#define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4153e7fd8..c4442084a 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -692,25 +692,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " en {1} ĉe vico {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Ne povis krei la taskon ĉar UUID-identigilo '{}' ne estas unika."
-#define STRING_TDB2_MISSING          "Mankanta                      {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Ne estas nenia registrita ago por malfari."
-#define STRING_TDB2_LAST_MOD         "Laste modifis ĝin je {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Antaŭaj Valoroj"
-#define STRING_TDB2_UNDO_CURRENT     "Aktualaj Valoroj"
-#define STRING_TDB2_DIFF_PREV        "--- antaŭa stato "               // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Malfarado restaŭros tiun staton" //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ aktuala stato"               // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Ŝanĝis tion je {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "Komando 'undo' ne estas inversigebla.  Ĉu vi estas certa, ke vi volas reveni al la antaŭa stato?"
-#define STRING_TDB2_MISSING_UUID     "Ne povis loki UUID-identigilon en tasko, do ne povos malfari."
-#define STRING_TDB2_REVERTED         "Revenis taskon al la antaŭa stato."
-#define STRING_TDB2_REMOVED          "Elprenis taskon."
-#define STRING_TDB2_UNDO_COMPLETE    "Malfaris komplete."
-#define STRING_TDB2_UNDO_SYNCED      "Ne povos malfari ŝanĝon ĉar la tasko estis jam sinkronigita.  Modifu anstataŭe la taskon."
-#define STRING_TDB2_DIRTY_EXIT       "Eliranta kun neskribitajn ŝanĝojn al {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5eb27a57b..1406f0d31 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -704,26 +704,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
 #define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " en {1} en la línea {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "No se puede añadir la tarea porque el uuid '{1}' no es único."
-
-#define STRING_TDB2_MISSING          "Falta                         {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "No hay transacciones registradas para deshacer."
-#define STRING_TDB2_LAST_MOD         "La última modificación fue hecha {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Valores Previos"
-#define STRING_TDB2_UNDO_CURRENT     "Valores Actuales"
-#define STRING_TDB2_DIFF_PREV        "--- estado previo "             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Deshacer restaurará este estado"//   ||
-#define STRING_TDB2_DIFF_CURR        "+++ estado actual "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Cambio hecho {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "El comando undo es irreversible. ¿Está seguro de querer revertir al estado anterior?"
-#define STRING_TDB2_MISSING_UUID     "No se pudo localizar el UUID en la tarea a deshacer."
-#define STRING_TDB2_REVERTED         "Tarea modificada revertida."
-#define STRING_TDB2_REMOVED          "Tarea eliminada."
-#define STRING_TDB2_UNDO_COMPLETE    "Deshacer completado."
-#define STRING_TDB2_UNDO_SYNCED      "No se puede deshacer el cambio porque la tarea ya ha sido sincronizada. Como alternativa, modifique la tarea."
-#define STRING_TDB2_DIRTY_EXIT       "Saliendo con cambios sin escribir a {1}"
-#define STRING_TDB2_UNWAIT           "Tarea no en espera '{1}'"
-
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 532031b46..33d2522c7 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -694,25 +694,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " in {1} at line {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Cannot add task because the uuid '{1}' is not unique."
-#define STRING_TDB2_MISSING          "Missing                       {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Il n'y a aucune action enregistrée à défaire."
-#define STRING_TDB2_LAST_MOD         "The last modification was made {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Valeurs précédantes"
-#define STRING_TDB2_UNDO_CURRENT     "Valeurs actuelles"
-#define STRING_TDB2_DIFF_PREV        "--- previous state"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Undo will restore this state"   //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ current state "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Change made {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "The undo command is not reversible.  Are you sure you want to revert to the previous state?"
-#define STRING_TDB2_MISSING_UUID     "Cannot locate UUID in task to undo."
-#define STRING_TDB2_REVERTED         "Modified task reverted."
-#define STRING_TDB2_REMOVED          "Tâche retirée."
-#define STRING_TDB2_UNDO_COMPLETE    "Annulation terminée."
-#define STRING_TDB2_UNDO_SYNCED      "Impossible d'annuler les changements car la tâche a déjà été synchronysée. Modifiez plutôt la tâche."
-#define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 81385915c..60a5ff1c0 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -693,25 +693,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " in {1} alla linea {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Impossibile aggiungere il task in quanto l'uuid '{1}' non è unico."
-#define STRING_TDB2_MISSING          "Mancante                       {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Nessuna transazione memorizzata da ripristinare."
-#define STRING_TDB2_LAST_MOD         "L'ultima modifica è stat effettuata {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Valori precedenti"
-#define STRING_TDB2_UNDO_CURRENT     "Valori correnti"
-#define STRING_TDB2_DIFF_PREV        "--- stato precedente"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "L'undo ripristinerà questo stato"   //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ stato corrente "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Modifiche effettuate {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "Il comando undo non è reversibile. Sicuro di voler ripristinare lo stato precedente?"
-#define STRING_TDB2_MISSING_UUID     "Impossibile individuare l'UUID nel task da ripristinare."
-#define STRING_TDB2_REVERTED         "Modifiche al task ripristinate."
-#define STRING_TDB2_REMOVED          "Task rimosso."
-#define STRING_TDB2_UNDO_COMPLETE    "Undo completato."
-#define STRING_TDB2_UNDO_SYNCED      "Cannot undo change because the task was already synced.  Modify the task instead."
-#define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 49a9639fc..a209c0770 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -694,25 +694,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " in {1} at line {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Cannot add task because the uuid '{1}' is not unique."
-#define STRING_TDB2_MISSING          "Missing                       {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "There are no recorded transactions to undo."
-#define STRING_TDB2_LAST_MOD         "The last modification was made {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Prior Values"
-#define STRING_TDB2_UNDO_CURRENT     "Current Values"
-#define STRING_TDB2_DIFF_PREV        "--- previous state"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Undo will restore this state"   //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ current state "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Change made {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "The undo command is not reversible.  Are you sure you want to revert to the previous state?"
-#define STRING_TDB2_MISSING_UUID     "Cannot locate UUID in task to undo."
-#define STRING_TDB2_REVERTED         "Modified task reverted."
-#define STRING_TDB2_REMOVED          "Task removed."
-#define STRING_TDB2_UNDO_COMPLETE    "Undo complete."
-#define STRING_TDB2_UNDO_SYNCED      "Cannot undo change because the task was already synced.  Modify the task instead."
-#define STRING_TDB2_DIRTY_EXIT       "Exiting with unwritten changes to {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 2b1fe3249..87960a7df 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -694,25 +694,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
 #define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " w {1} w lini {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Nie można dodać zadania ponieważ uuid '{1}' nie jest unikalny."
-#define STRING_TDB2_MISSING          "Brakuje                       {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Nie ma żadnych zapisanych transakcji do cofnięcia."
-#define STRING_TDB2_LAST_MOD         "Ostatnia dokonana modyfikcaja {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Prior Wartości"
-#define STRING_TDB2_UNDO_CURRENT     "Aktualne Wartości"
-#define STRING_TDB2_DIFF_PREV        "--- poprzedni stan"             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Cofnij przywróci ten stan"      //   ||
-#define STRING_TDB2_DIFF_CURR        "+++ aktualny stan "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Zmiana w {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "Polecenie cofnij jest nieodwracalne.  Czy jesteś pewien że chcesz przywrócić poprzedni stan?"
-#define STRING_TDB2_MISSING_UUID     "Nie można zlokalizować UUID w zadaniu do cofnięcia."
-#define STRING_TDB2_REVERTED         "Zrewerotowano zmienione zadania."
-#define STRING_TDB2_REMOVED          "Zadanie usunięte."
-#define STRING_TDB2_UNDO_COMPLETE    "Operacja cofnięcia zakończona."
-#define STRING_TDB2_UNDO_SYNCED      "Nie można cofnąć zmian ponieważ zadanie zostało zsynchronizowane.  Zmodyfikuj zadanie."
-#define STRING_TDB2_DIRTY_EXIT       "Zamykanie z niezapisanymi zmianami w {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 43aa6dada..1a53acdae 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -694,25 +694,4 @@
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
 #define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
 
-// TDB2
-#define STRING_TDB2_PARSE_ERROR      " em {1} na linha {2}"
-#define STRING_TDB2_UUID_NOT_UNIQUE  "Não é possível adicionar a tarefa porque o 'uuid' '{1}' não é único."
-#define STRING_TDB2_MISSING          "Em falta                      {1}  \"{2}\""
-#define STRING_TDB2_NO_UNDO          "Não existem alterações que possam ser revertidas."
-#define STRING_TDB2_LAST_MOD         "A última modificação foi feita {1}"
-#define STRING_TDB2_UNDO_PRIOR       "Valores anteriores"
-#define STRING_TDB2_UNDO_CURRENT     "Valores atuais"
-#define STRING_TDB2_DIFF_PREV        "--- estado prévio "             // Same length
-#define STRING_TDB2_DIFF_PREV_DESC   "Reverter restaurará este estado"//   ||
-#define STRING_TDB2_DIFF_CURR        "+++ estado atual  "             // Same length
-#define STRING_TDB2_DIFF_CURR_DESC   "Alteração efetuada {1}"
-#define STRING_TDB2_UNDO_CONFIRM     "O comando 'undo' não é reversível. Tem a certeza que deseja reverter para o estado anterior?"
-#define STRING_TDB2_MISSING_UUID     "Não foi possível localizar o UUID na tarefa a reverter."
-#define STRING_TDB2_REVERTED         "Tarefa modificada revertida."
-#define STRING_TDB2_REMOVED          "Tarefa removida."
-#define STRING_TDB2_UNDO_COMPLETE    "Reversão concluída."
-#define STRING_TDB2_UNDO_SYNCED      "Não é possível reverter a alteração porque a tarefa já foi syncronizada. Em vez disso modifique a tarefa."
-#define STRING_TDB2_DIRTY_EXIT       "Saindo com modificações por gravar de {1}"
-#define STRING_TDB2_UNWAIT           "Un-waiting task '{1}'"
-
 #endif

From 8eec5c82c2c890c6c19005f2c7143acd40337da8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:21:34 -0500
Subject: [PATCH 598/879] l10n: Eliminated STRING_CMD_CONFIG_NO_CHANGE

---
 src/commands/CmdConfig.cpp | 2 +-
 src/l10n/deu-DEU.h         | 1 -
 src/l10n/eng-USA.h         | 1 -
 src/l10n/epo-RUS.h         | 1 -
 src/l10n/esp-ESP.h         | 1 -
 src/l10n/fra-FRA.h         | 1 -
 src/l10n/ita-ITA.h         | 1 -
 src/l10n/jpn-JPN.h         | 1 -
 src/l10n/pol-POL.h         | 1 -
 src/l10n/por-PRT.h         | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index dd913740e..eb1f7c461 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -220,7 +220,7 @@ int CmdConfig::execute (std::string& output)
             << '\n';
       }
       else
-        out << STRING_CMD_CONFIG_NO_CHANGE << '\n';
+        out << "No changes made.\n";
     }
     else
       throw std::string (STRING_CMD_CONFIG_NO_NAME);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 5d215c08f..c016b9449 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -443,7 +443,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Wirklich die Option '{1}' entfernen?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "Kein Eintrag '{1}' gefunden."
 #define STRING_CMD_CONFIG_FILE_MOD   "Konfigurationsdatei {1} verändert."
-#define STRING_CMD_CONFIG_NO_CHANGE  "Keine Änderungen durchgeführt."
 #define STRING_CMD_CONFIG_NO_NAME    "Geben Sie den Wert der zu ändernden Option an."
 #define STRING_CMD_HCONFIG_USAGE     "Zeigt alle unterstützten Konfigurations-Optionen zur AUtovervollständigung"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f98983fc5..3a482a4e1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -440,7 +440,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_CHANGE  "No changes made."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c4442084a..cb0a97145 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -443,7 +443,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
 #define STRING_CMD_CONFIG_FILE_MOD   "Agorda dosiero {1} modifita."
-#define STRING_CMD_CONFIG_NO_CHANGE  "Ne ŝanĝis nenion."
 #define STRING_CMD_CONFIG_NO_NAME    "Specifu la nomon de agordvariablo, kiun vi volas modifi."
 #define STRING_CMD_HCONFIG_USAGE     "Listigas çiun subtenatan agordan variablon, por motivo memkompletada"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1406f0d31..625a7d56c 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -455,7 +455,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "¿Está seguro de querer eliminar '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "No se encontró una entrada llamada '{1}'."
 #define STRING_CMD_CONFIG_FILE_MOD   "Archivo de configuración {1} modificado."
-#define STRING_CMD_CONFIG_NO_CHANGE  "No se hicieron cambios."
 #define STRING_CMD_CONFIG_NO_NAME    "Especifique el nombre de una variable de configuración a modificar."
 #define STRING_CMD_HCONFIG_USAGE     "Lista todas las variables de configuración soportadas, a fines de completado"
 #define STRING_CMD_CONTEXT_USAGE     "Establece y define contextos (filtros por defecto)"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 33d2522c7..dd7f8649b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -445,7 +445,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_CHANGE  "No changes made."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 60a5ff1c0..9aa07025f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -444,7 +444,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Sei sicuro di voler rimuovere '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "Nessuna voce '{1}' trovata."
 #define STRING_CMD_CONFIG_FILE_MOD   "File di configurazione {1} modificato."
-#define STRING_CMD_CONFIG_NO_CHANGE  "Nessuna modifica apportata."
 #define STRING_CMD_CONFIG_NO_NAME    "Specificare il nome di una variabile di configurazione da modificare."
 #define STRING_CMD_HCONFIG_USAGE     "Elenca le variabili di configurazione supportate, per autocompletamento"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a209c0770..1a323f52b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -445,7 +445,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_CHANGE  "No changes made."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 87960a7df..ed6c62880 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -445,7 +445,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Czy na pewno chcesz usunąć '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "Nie znaleziono wpisu '{1}'."
 #define STRING_CMD_CONFIG_FILE_MOD   "Plik konfiguracyjny {1} został zmodyfikowany."
-#define STRING_CMD_CONFIG_NO_CHANGE  "Brak zmian."
 #define STRING_CMD_CONFIG_NO_NAME    "Podaj nazwę zmiennej w konfiguracji do zmiany."
 #define STRING_CMD_HCONFIG_USAGE     "Wylistuj wszystkie zmienne konfiguracji."
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1a53acdae..31160ea4d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -445,7 +445,6 @@
 #define STRING_CMD_CONFIG_CONFIRM3   "Tem a certeza que pretende remover '{1}'?"
 #define STRING_CMD_CONFIG_NO_ENTRY   "Não encontrada a entrada '{1}' ."
 #define STRING_CMD_CONFIG_FILE_MOD   "Ficheiro de configuração {1} alterado."
-#define STRING_CMD_CONFIG_NO_CHANGE  "Nenhuma alteração efectuada."
 #define STRING_CMD_CONFIG_NO_NAME    "Especifique o nome da configuração a modificar."
 #define STRING_CMD_HCONFIG_USAGE     "Lista todas as configurações suportadas, para fins de terminação automática"
 #define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"

From 4763b1da6ec04e59d4374bb1106e5d4f178d2e04 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:36:00 -0500
Subject: [PATCH 599/879] l10n: Eliminated STRING_DATE_*DAY

---
 src/l10n/deu-DEU.h | 7 -------
 src/l10n/eng-USA.h | 7 -------
 src/l10n/epo-RUS.h | 7 -------
 src/l10n/esp-ESP.h | 7 -------
 src/l10n/fra-FRA.h | 7 -------
 src/l10n/ita-ITA.h | 7 -------
 src/l10n/jpn-JPN.h | 7 -------
 src/l10n/pol-POL.h | 7 -------
 src/l10n/por-PRT.h | 7 -------
 9 files changed, 63 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c016b9449..f04e50f6c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -520,13 +520,6 @@
 #define STRING_DATE_NOVEMBER         "November"
 #define STRING_DATE_DECEMBER         "Dezember"
 
-#define STRING_DATE_MONDAY           "Montag"
-#define STRING_DATE_TUESDAY          "Dienstag"
-#define STRING_DATE_WEDNESDAY        "Mittwoch"
-#define STRING_DATE_THURSDAY         "Donnerstag"
-#define STRING_DATE_FRIDAY           "Freitag"
-#define STRING_DATE_SATURDAY         "Samstag"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
 #define STRING_DEPEND_BLOCKING       "und blockiert:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3a482a4e1..fc8ebe272 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -517,13 +517,6 @@
 #define STRING_DATE_NOVEMBER         "november"
 #define STRING_DATE_DECEMBER         "december"
 
-#define STRING_DATE_MONDAY           "monday"
-#define STRING_DATE_TUESDAY          "tuesday"
-#define STRING_DATE_WEDNESDAY        "wednesday"
-#define STRING_DATE_THURSDAY         "thursday"
-#define STRING_DATE_FRIDAY           "friday"
-#define STRING_DATE_SATURDAY         "saturday"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index cb0a97145..563935a77 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -520,13 +520,6 @@
 #define STRING_DATE_NOVEMBER         "novembro"
 #define STRING_DATE_DECEMBER         "decembro"
 
-#define STRING_DATE_MONDAY           "lundo"
-#define STRING_DATE_TUESDAY          "mardo"
-#define STRING_DATE_WEDNESDAY        "merkredo"
-#define STRING_DATE_THURSDAY         "ĵaŭdo"
-#define STRING_DATE_FRIDAY           "vendredo"
-#define STRING_DATE_SATURDAY         "sabato"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
 #define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 625a7d56c..c9769c02b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -532,13 +532,6 @@
 #define STRING_DATE_NOVEMBER         "noviembre"
 #define STRING_DATE_DECEMBER         "diciembre"
 
-#define STRING_DATE_MONDAY           "lunes"
-#define STRING_DATE_TUESDAY          "martes"
-#define STRING_DATE_WEDNESDAY        "miércoles"
-#define STRING_DATE_THURSDAY         "jueves"
-#define STRING_DATE_FRIDAY           "viernes"
-#define STRING_DATE_SATURDAY         "sábado"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "y está bloqueando:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index dd7f8649b..59993c176 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -522,13 +522,6 @@
 #define STRING_DATE_NOVEMBER         "novembre"
 #define STRING_DATE_DECEMBER         "décembre"
 
-#define STRING_DATE_MONDAY           "lundi"
-#define STRING_DATE_TUESDAY          "mardi"
-#define STRING_DATE_WEDNESDAY        "mercredi"
-#define STRING_DATE_THURSDAY         "jeudi"
-#define STRING_DATE_FRIDAY           "vendredi"
-#define STRING_DATE_SATURDAY         "samedi"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
 #define STRING_DEPEND_BLOCKING       "et bloque :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 9aa07025f..5153eec21 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -521,13 +521,6 @@
 #define STRING_DATE_NOVEMBER         "novembre"
 #define STRING_DATE_DECEMBER         "decembre"
 
-#define STRING_DATE_MONDAY           "lunedì"
-#define STRING_DATE_TUESDAY          "martedì"
-#define STRING_DATE_WEDNESDAY        "mercoledì"
-#define STRING_DATE_THURSDAY         "giovedì"
-#define STRING_DATE_FRIDAY           "venerdì"
-#define STRING_DATE_SATURDAY         "sabato"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
 #define STRING_DEPEND_BLOCKING       "e sta bloccando:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 1a323f52b..908a1ae2a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -522,13 +522,6 @@
 #define STRING_DATE_NOVEMBER         "november"
 #define STRING_DATE_DECEMBER         "december"
 
-#define STRING_DATE_MONDAY           "monday"
-#define STRING_DATE_TUESDAY          "tuesday"
-#define STRING_DATE_WEDNESDAY        "wednesday"
-#define STRING_DATE_THURSDAY         "thursday"
-#define STRING_DATE_FRIDAY           "friday"
-#define STRING_DATE_SATURDAY         "saturday"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index ed6c62880..bcce82e66 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -522,13 +522,6 @@
 #define STRING_DATE_NOVEMBER         "listopad"
 #define STRING_DATE_DECEMBER         "grudzień"
 
-#define STRING_DATE_MONDAY           "poniedziałek"
-#define STRING_DATE_TUESDAY          "wtorek"
-#define STRING_DATE_WEDNESDAY        "środa"
-#define STRING_DATE_THURSDAY         "czwartek"
-#define STRING_DATE_FRIDAY           "piątek"
-#define STRING_DATE_SATURDAY         "sobota"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
 #define STRING_DEPEND_BLOCKING       "oraz blokuje:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 31160ea4d..1fd3f5e31 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -522,13 +522,6 @@
 #define STRING_DATE_NOVEMBER         "novembro"
 #define STRING_DATE_DECEMBER         "dezembro"
 
-#define STRING_DATE_MONDAY           "segunda-feira"
-#define STRING_DATE_TUESDAY          "terça-feira"
-#define STRING_DATE_WEDNESDAY        "quarta-feira"
-#define STRING_DATE_THURSDAY         "quinta-feira"
-#define STRING_DATE_FRIDAY           "sexta-feira"
-#define STRING_DATE_SATURDAY         "sábado"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "e está a bloquear:"

From d56487e5090c363bd848514a805a49ed23908e7f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:38:23 -0500
Subject: [PATCH 600/879] l10n: Eliminated STRING_DATE_<month>

---
 src/l10n/deu-DEU.h | 13 -------------
 src/l10n/eng-USA.h | 13 -------------
 src/l10n/epo-RUS.h | 13 -------------
 src/l10n/esp-ESP.h | 13 -------------
 src/l10n/fra-FRA.h | 13 -------------
 src/l10n/ita-ITA.h | 13 -------------
 src/l10n/jpn-JPN.h | 13 -------------
 src/l10n/pol-POL.h | 13 -------------
 src/l10n/por-PRT.h | 13 -------------
 9 files changed, 117 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index f04e50f6c..ebc156bd8 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -507,19 +507,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ist kein gültiges Datum im '{2}'-Format."
 #define STRING_DATE_BAD_WEEKSTART    "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
 
-#define STRING_DATE_JANUARY          "Januar"
-#define STRING_DATE_FEBRUARY         "Februar"
-#define STRING_DATE_MARCH            "März"
-#define STRING_DATE_APRIL            "April"
-#define STRING_DATE_MAY              "Mai"
-#define STRING_DATE_JUNE             "Juni"
-#define STRING_DATE_JULY             "Juli"
-#define STRING_DATE_AUGUST           "August"
-#define STRING_DATE_SEPTEMBER        "September"
-#define STRING_DATE_OCTOBER          "Oktober"
-#define STRING_DATE_NOVEMBER         "November"
-#define STRING_DATE_DECEMBER         "Dezember"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
 #define STRING_DEPEND_BLOCKING       "und blockiert:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index fc8ebe272..254dca341 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -504,19 +504,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
 
-#define STRING_DATE_JANUARY          "january"
-#define STRING_DATE_FEBRUARY         "february"
-#define STRING_DATE_MARCH            "march"
-#define STRING_DATE_APRIL            "april"
-#define STRING_DATE_MAY              "may"
-#define STRING_DATE_JUNE             "june"
-#define STRING_DATE_JULY             "july"
-#define STRING_DATE_AUGUST           "august"
-#define STRING_DATE_SEPTEMBER        "september"
-#define STRING_DATE_OCTOBER          "october"
-#define STRING_DATE_NOVEMBER         "november"
-#define STRING_DATE_DECEMBER         "december"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 563935a77..88b87ffd5 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -507,19 +507,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' ne estas valida dato laŭ stilo '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Argorda variablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
 
-#define STRING_DATE_JANUARY          "januaro"
-#define STRING_DATE_FEBRUARY         "febrero"
-#define STRING_DATE_MARCH            "marto"
-#define STRING_DATE_APRIL            "aprilo"
-#define STRING_DATE_MAY              "majo"
-#define STRING_DATE_JUNE             "junio"
-#define STRING_DATE_JULY             "julio"
-#define STRING_DATE_AUGUST           "aŭgusto"
-#define STRING_DATE_SEPTEMBER        "septembro"
-#define STRING_DATE_OCTOBER          "oktobro"
-#define STRING_DATE_NOVEMBER         "novembro"
-#define STRING_DATE_DECEMBER         "decembro"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
 #define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c9769c02b..7a3600970 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -519,19 +519,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' no es una fecha válida según el formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuración 'weekstart' solamente puede contener 'Sunday' (domingo) o 'Monday' (lunes)."
 
-#define STRING_DATE_JANUARY          "enero"
-#define STRING_DATE_FEBRUARY         "febrero"
-#define STRING_DATE_MARCH            "marzo"
-#define STRING_DATE_APRIL            "abril"
-#define STRING_DATE_MAY              "mayo"
-#define STRING_DATE_JUNE             "junio"
-#define STRING_DATE_JULY             "julio"
-#define STRING_DATE_AUGUST           "agosto"
-#define STRING_DATE_SEPTEMBER        "septiembre"
-#define STRING_DATE_OCTOBER          "octubre"
-#define STRING_DATE_NOVEMBER         "noviembre"
-#define STRING_DATE_DECEMBER         "diciembre"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "y está bloqueando:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 59993c176..ad0dd5bb8 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -509,19 +509,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' n'est pas une date au format '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuration 'weekstart' ne peut contenir que 'dimanche' ou 'lundi'."
 
-#define STRING_DATE_JANUARY          "janvier"
-#define STRING_DATE_FEBRUARY         "février"
-#define STRING_DATE_MARCH            "mars"
-#define STRING_DATE_APRIL            "avril"
-#define STRING_DATE_MAY              "mai"
-#define STRING_DATE_JUNE             "juin"
-#define STRING_DATE_JULY             "juillet"
-#define STRING_DATE_AUGUST           "août"
-#define STRING_DATE_SEPTEMBER        "septembre"
-#define STRING_DATE_OCTOBER          "octobre"
-#define STRING_DATE_NOVEMBER         "novembre"
-#define STRING_DATE_DECEMBER         "décembre"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
 #define STRING_DEPEND_BLOCKING       "et bloque :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5153eec21..0405642b6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -508,19 +508,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' non è una data valida nel formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variabile di configurazione 'weekstart' può solo contenere 'Domenica' o 'Lunedì'."
 
-#define STRING_DATE_JANUARY          "gennaio"
-#define STRING_DATE_FEBRUARY         "febbraio"
-#define STRING_DATE_MARCH            "marzo"
-#define STRING_DATE_APRIL            "aprile"
-#define STRING_DATE_MAY              "maggio"
-#define STRING_DATE_JUNE             "giugno"
-#define STRING_DATE_JULY             "luglio"
-#define STRING_DATE_AUGUST           "agosto"
-#define STRING_DATE_SEPTEMBER        "settembre"
-#define STRING_DATE_OCTOBER          "ottobre"
-#define STRING_DATE_NOVEMBER         "novembre"
-#define STRING_DATE_DECEMBER         "decembre"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
 #define STRING_DEPEND_BLOCKING       "e sta bloccando:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 908a1ae2a..7bbb91c52 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -509,19 +509,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
 
-#define STRING_DATE_JANUARY          "january"
-#define STRING_DATE_FEBRUARY         "february"
-#define STRING_DATE_MARCH            "march"
-#define STRING_DATE_APRIL            "april"
-#define STRING_DATE_MAY              "may"
-#define STRING_DATE_JUNE             "june"
-#define STRING_DATE_JULY             "july"
-#define STRING_DATE_AUGUST           "august"
-#define STRING_DATE_SEPTEMBER        "september"
-#define STRING_DATE_OCTOBER          "october"
-#define STRING_DATE_NOVEMBER         "november"
-#define STRING_DATE_DECEMBER         "december"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bcce82e66..d3e0fea81 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -509,19 +509,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' nie jest poprawną wartością daty w formacie '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Zmienna konfiguracji 'weekstart' może przyjmować tylko wartość 'Sunday' lub 'Monday'."
 
-#define STRING_DATE_JANUARY          "styczeń"
-#define STRING_DATE_FEBRUARY         "luty"
-#define STRING_DATE_MARCH            "marzec"
-#define STRING_DATE_APRIL            "kwiecień"
-#define STRING_DATE_MAY              "maj"
-#define STRING_DATE_JUNE             "czerwiec"
-#define STRING_DATE_JULY             "lipiec"
-#define STRING_DATE_AUGUST           "sierpień"
-#define STRING_DATE_SEPTEMBER        "wrzesień"
-#define STRING_DATE_OCTOBER          "październik"
-#define STRING_DATE_NOVEMBER         "listopad"
-#define STRING_DATE_DECEMBER         "grudzień"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
 #define STRING_DEPEND_BLOCKING       "oraz blokuje:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1fd3f5e31..1f0c31926 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -509,19 +509,6 @@
 #define STRING_DATE_INVALID_FORMAT   "'{1}' não é uma data válida no formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
 
-#define STRING_DATE_JANUARY          "janeiro"
-#define STRING_DATE_FEBRUARY         "fevereiro"
-#define STRING_DATE_MARCH            "março"
-#define STRING_DATE_APRIL            "abril"
-#define STRING_DATE_MAY              "maio"
-#define STRING_DATE_JUNE             "junho"
-#define STRING_DATE_JULY             "julho"
-#define STRING_DATE_AUGUST           "agosto"
-#define STRING_DATE_SEPTEMBER        "setembro"
-#define STRING_DATE_OCTOBER          "outubro"
-#define STRING_DATE_NOVEMBER         "novembro"
-#define STRING_DATE_DECEMBER         "dezembro"
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "e está a bloquear:"

From f6d2fe60936bbbbcc6870a444a70e9d24b309a31 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:41:05 -0500
Subject: [PATCH 601/879] l10n: Eliminated STRING_DATE_INVALID_FORMAT

---
 src/columns/ColTypeDate.cpp | 2 +-
 src/l10n/deu-DEU.h          | 1 -
 src/l10n/eng-USA.h          | 1 -
 src/l10n/epo-RUS.h          | 1 -
 src/l10n/esp-ESP.h          | 1 -
 src/l10n/fra-FRA.h          | 1 -
 src/l10n/ita-ITA.h          | 1 -
 src/l10n/jpn-JPN.h          | 1 -
 src/l10n/pol-POL.h          | 1 -
 src/l10n/por-PRT.h          | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 1da66eb51..afae46348 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -242,7 +242,7 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   // If a date doesn't parse (2/29/2014) then it evaluates to zero.
   if (value != "" &&
       evaluatedValue.get_date () == 0)
-    throw format (STRING_DATE_INVALID_FORMAT, value, Variant::dateFormat);
+    throw format ("'{1}' is not a valid date in the '{2}' format.", value, Variant::dateFormat);
 
   task.set (_name, evaluatedValue.get_date ());
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ebc156bd8..1a8fbc0c6 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -504,7 +504,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Ihre .taskrc-Datei enthält veraltete Optionen:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' ist kein gültiges Datum im '{2}'-Format."
 #define STRING_DATE_BAD_WEEKSTART    "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
 
 // dependency
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 254dca341..709154c8f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -501,7 +501,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
 
 // dependency
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 88b87ffd5..fe3d6c2ee 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -504,7 +504,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Via dosiero .taskrc enhavas arkaikajn variablojn:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' ne estas valida dato laŭ stilo '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Argorda variablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
 
 // dependency
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7a3600970..e07971bc8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -516,7 +516,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Su archivo .taskrc contiene variables que están en desuso:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' no es una fecha válida según el formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuración 'weekstart' solamente puede contener 'Sunday' (domingo) o 'Monday' (lunes)."
 
 // dependency
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index ad0dd5bb8..f0b099bed 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -506,7 +506,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' n'est pas une date au format '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variable de configuration 'weekstart' ne peut contenir que 'dimanche' ou 'lundi'."
 
 // dependency
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0405642b6..432a3ee2a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -505,7 +505,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Il file .taskrc contiene variabili deprecate:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' non è una data valida nel formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "La variabile di configurazione 'weekstart' può solo contenere 'Domenica' o 'Lunedì'."
 
 // dependency
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 7bbb91c52..f53007f2a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -506,7 +506,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' is not a valid date in the '{2}' format."
 #define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
 
 // dependency
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index d3e0fea81..51614951c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -506,7 +506,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "Twój plik .taskrc zawiera przestarzałe zmienne:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' nie jest poprawną wartością daty w formacie '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "Zmienna konfiguracji 'weekstart' może przyjmować tylko wartość 'Sunday' lub 'Monday'."
 
 // dependency
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1f0c31926..6df96ff6e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -506,7 +506,6 @@
 #define STRING_CONFIG_DEPRECATED_VAR "O seu ficheiro .taskrc contém variáveis obsoletas:"
 
 // Date
-#define STRING_DATE_INVALID_FORMAT   "'{1}' não é uma data válida no formato '{2}'."
 #define STRING_DATE_BAD_WEEKSTART    "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
 
 // dependency

From a43ec0189af4046965331dca9b539193dec930fa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:43:05 -0500
Subject: [PATCH 602/879] l10n: Eliminated STRING_DATE_BAD_WEEKSTART

---
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 9 files changed, 27 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1a8fbc0c6..f8e8f744a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -503,9 +503,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Ihre .taskrc-Datei enthält Repots mit veralteten Spalten.  Bitte entfernen Sie entry_time, start_time oder end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Ihre .taskrc-Datei enthält veraltete Optionen:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
 #define STRING_DEPEND_BLOCKING       "und blockiert:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 709154c8f..d51631a98 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -500,9 +500,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fe3d6c2ee..3a918d3c6 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -503,9 +503,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Via dosiero .taskrc enhavas raportojn kun arkaikaj kolumnoj.  Bonvolu serĉi entry_time, start_time, aŭ end_time ĉe:"
 #define STRING_CONFIG_DEPRECATED_VAR "Via dosiero .taskrc enhavas arkaikajn variablojn:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "Argorda variablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
 #define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e07971bc8..a44f2d0fd 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -515,9 +515,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Su archivo .taskrc contiene informes con columnas en desuso. Por favor, consulte entry_time, start_time o end_time en:"
 #define STRING_CONFIG_DEPRECATED_VAR "Su archivo .taskrc contiene variables que están en desuso:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "La variable de configuración 'weekstart' solamente puede contener 'Sunday' (domingo) o 'Monday' (lunes)."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "y está bloqueando:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f0b099bed..f45a4d1c9 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -505,9 +505,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "La variable de configuration 'weekstart' ne peut contenir que 'dimanche' ou 'lundi'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
 #define STRING_DEPEND_BLOCKING       "et bloque :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 432a3ee2a..977eea974 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -504,9 +504,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Il file .taskrc contiene report con nomi di colonna deprecati. Verificare entry_time, start_time o end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Il file .taskrc contiene variabili deprecate:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "La variabile di configurazione 'weekstart' può solo contenere 'Domenica' o 'Lunedì'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
 #define STRING_DEPEND_BLOCKING       "e sta bloccando:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f53007f2a..2ce0396b3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -505,9 +505,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 #define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 51614951c..610c1d2fa 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -505,9 +505,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "Twój plik .taskrc zawiera raport z przestarzałymi nazwami kolumn.  Sprawdź proszę entry_time, start_time lub end_time w:"
 #define STRING_CONFIG_DEPRECATED_VAR "Twój plik .taskrc zawiera przestarzałe zmienne:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "Zmienna konfiguracji 'weekstart' może przyjmować tylko wartość 'Sunday' lub 'Monday'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
 #define STRING_DEPEND_BLOCKING       "oraz blokuje:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6df96ff6e..c667f77d7 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -505,9 +505,6 @@
 #define STRING_CONFIG_DEPRECATED_COL "O seu ficheiro .taskrc contém relatórios com colunas obsoletas. Verifique entry_time, start_time e end_time em:"
 #define STRING_CONFIG_DEPRECATED_VAR "O seu ficheiro .taskrc contém variáveis obsoletas:"
 
-// Date
-#define STRING_DATE_BAD_WEEKSTART    "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "e está a bloquear:"

From c0281b21f0f2fc21370c42adeaf71f3bea6fab40 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:47:27 -0500
Subject: [PATCH 603/879] l10n: Eliminated STRING_CONFIG_DEPRECATED_VAR

---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/legacy.cpp     | 3 +--
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index f8e8f744a..6eaeb6509 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -501,7 +501,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Nur Dateien mit absolutem Pfad können eingebunden werden, nicht '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Fehlerhafter Eintrag '{1}' in Konfigurationsdatei."
 #define STRING_CONFIG_DEPRECATED_COL "Ihre .taskrc-Datei enthält Repots mit veralteten Spalten.  Bitte entfernen Sie entry_time, start_time oder end_time in:"
-#define STRING_CONFIG_DEPRECATED_VAR "Ihre .taskrc-Datei enthält veraltete Optionen:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d51631a98..ac1956d4f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -498,7 +498,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
-#define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 3a918d3c6..929048576 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -501,7 +501,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Oni sole povas enkluzivi dosierojn kun absoluta pado, ne '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malbone formita enskribo '{1}' en agorda dosiero."
 #define STRING_CONFIG_DEPRECATED_COL "Via dosiero .taskrc enhavas raportojn kun arkaikaj kolumnoj.  Bonvolu serĉi entry_time, start_time, aŭ end_time ĉe:"
-#define STRING_CONFIG_DEPRECATED_VAR "Via dosiero .taskrc enhavas arkaikajn variablojn:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a44f2d0fd..b75f79897 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -513,7 +513,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Sólo se pueden incluir archivos con paths absolutos, no '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Formato incorrecto en entrada '{1}' en archivo de configuración."
 #define STRING_CONFIG_DEPRECATED_COL "Su archivo .taskrc contiene informes con columnas en desuso. Por favor, consulte entry_time, start_time o end_time en:"
-#define STRING_CONFIG_DEPRECATED_VAR "Su archivo .taskrc contiene variables que están en desuso:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f45a4d1c9..6ddba34c6 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -503,7 +503,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
-#define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 977eea974..f72945979 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -502,7 +502,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "E` possibile includere solo file con percorso assoluto, non '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Voce malformata '{1}' nel file di configurazione."
 #define STRING_CONFIG_DEPRECATED_COL "Il file .taskrc contiene report con nomi di colonna deprecati. Verificare entry_time, start_time o end_time in:"
-#define STRING_CONFIG_DEPRECATED_VAR "Il file .taskrc contiene variabili deprecate:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 2ce0396b3..fcbf1ab59 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -503,7 +503,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
 #define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
-#define STRING_CONFIG_DEPRECATED_VAR "Your .taskrc file contains variables that are deprecated:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 610c1d2fa..e069fcbec 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -503,7 +503,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Scieżka dołączanych plików musi mieć postać adresu bezwzględnego, nie '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Uszkodzony wpis '{1}' w pliku konfiguracyjnym."
 #define STRING_CONFIG_DEPRECATED_COL "Twój plik .taskrc zawiera raport z przestarzałymi nazwami kolumn.  Sprawdź proszę entry_time, start_time lub end_time w:"
-#define STRING_CONFIG_DEPRECATED_VAR "Twój plik .taskrc zawiera przestarzałe zmienne:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c667f77d7..255febed7 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -503,7 +503,6 @@
 #define STRING_CONFIG_INCLUDE_PATH   "Apenas é permitido incluir ficheiros com caminhos absolutos, não '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Entrada anómala '{1}' no ficheiro de configuração."
 #define STRING_CONFIG_DEPRECATED_COL "O seu ficheiro .taskrc contém relatórios com colunas obsoletas. Verifique entry_time, start_time e end_time em:"
-#define STRING_CONFIG_DEPRECATED_VAR "O seu ficheiro .taskrc contém variáveis obsoletas:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 1a4b7a459..42333205e 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -121,8 +121,7 @@ std::string legacyCheckForDeprecatedVariables ()
   std::stringstream out;
   if (deprecated.size ())
   {
-    out << STRING_CONFIG_DEPRECATED_VAR
-        << "\n";
+    out << "Your .taskrc file contains variables that are deprecated:\n";
 
     for (const auto& dep : deprecated)
       out << "  " << dep << "\n";

From 58dce57b7e1f9aa0bc8d91fb0a8f3cf27b335ed5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:49:38 -0500
Subject: [PATCH 604/879] l10n: Eliminated STRING_CONFIG_DEPRECATED_COL

---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 src/legacy.cpp     | 4 +---
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6eaeb6509..e01a21b21 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -500,7 +500,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Konnte eingebundene Datei '{1}' nicht lesen."
 #define STRING_CONFIG_INCLUDE_PATH   "Nur Dateien mit absolutem Pfad können eingebunden werden, nicht '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Fehlerhafter Eintrag '{1}' in Konfigurationsdatei."
-#define STRING_CONFIG_DEPRECATED_COL "Ihre .taskrc-Datei enthält Repots mit veralteten Spalten.  Bitte entfernen Sie entry_time, start_time oder end_time in:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ac1956d4f..f91ddb767 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -497,7 +497,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 929048576..4a0d6ecc8 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -500,7 +500,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Ne povis legi enkluzivitan dosieron '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Oni sole povas enkluzivi dosierojn kun absoluta pado, ne '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malbone formita enskribo '{1}' en agorda dosiero."
-#define STRING_CONFIG_DEPRECATED_COL "Via dosiero .taskrc enhavas raportojn kun arkaikaj kolumnoj.  Bonvolu serĉi entry_time, start_time, aŭ end_time ĉe:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b75f79897..dbc7d3ed8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -512,7 +512,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "No se pudo leer el archivo include '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Sólo se pueden incluir archivos con paths absolutos, no '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Formato incorrecto en entrada '{1}' en archivo de configuración."
-#define STRING_CONFIG_DEPRECATED_COL "Su archivo .taskrc contiene informes con columnas en desuso. Por favor, consulte entry_time, start_time o end_time en:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 6ddba34c6..8438d0eff 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -502,7 +502,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f72945979..0ac54a34c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -501,7 +501,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Impossibile leggere il file di inclusione '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "E` possibile includere solo file con percorso assoluto, non '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Voce malformata '{1}' nel file di configurazione."
-#define STRING_CONFIG_DEPRECATED_COL "Il file .taskrc contiene report con nomi di colonna deprecati. Verificare entry_time, start_time o end_time in:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index fcbf1ab59..a3d2f3eeb 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -502,7 +502,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "インクルードファイル '{1}' が読み込めません。"
 #define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-#define STRING_CONFIG_DEPRECATED_COL "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e069fcbec..880bfb1b2 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -502,7 +502,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Nie można przeczytać dołączonego pliku '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Scieżka dołączanych plików musi mieć postać adresu bezwzględnego, nie '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Uszkodzony wpis '{1}' w pliku konfiguracyjnym."
-#define STRING_CONFIG_DEPRECATED_COL "Twój plik .taskrc zawiera raport z przestarzałymi nazwami kolumn.  Sprawdź proszę entry_time, start_time lub end_time w:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 255febed7..135e4eb83 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -502,7 +502,6 @@
 #define STRING_CONFIG_READ_INCLUDE   "Não foi possível ler o ficheiro incluído '{1}'."
 #define STRING_CONFIG_INCLUDE_PATH   "Apenas é permitido incluir ficheiros com caminhos absolutos, não '{1}'"
 #define STRING_CONFIG_BAD_ENTRY      "Entrada anómala '{1}' no ficheiro de configuração."
-#define STRING_CONFIG_DEPRECATED_COL "O seu ficheiro .taskrc contém relatórios com colunas obsoletas. Verifique entry_time, start_time e end_time em:"
 
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 42333205e..35ee0783a 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -29,7 +29,6 @@
 #include <sstream>
 #include <Context.h>
 #include <format.h>
-#include <i18n.h>
 
 #define STRING_LEGACY_PRIORITY "Legacy attribute found.  Please change '{1}' to '{2}'."
 
@@ -154,8 +153,7 @@ std::string legacyCheckForDeprecatedColumns ()
 
   if (deprecated.size ())
   {
-    out << STRING_CONFIG_DEPRECATED_COL
-        << "\n";
+    out << "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:\n";
 
     for (const auto& dep : deprecated)
       out << "  " << dep << "=" << context.config.get (dep) << "\n";

From 7b3d2e5cd6b7beea6a2c85e77bb809d91a414e08 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:51:40 -0500
Subject: [PATCH 605/879] l10n: Eliminated STRING_CONFIG_*

---
 src/l10n/deu-DEU.h | 6 ------
 src/l10n/eng-USA.h | 6 ------
 src/l10n/epo-RUS.h | 6 ------
 src/l10n/esp-ESP.h | 6 ------
 src/l10n/fra-FRA.h | 6 ------
 src/l10n/ita-ITA.h | 6 ------
 src/l10n/jpn-JPN.h | 6 ------
 src/l10n/pol-POL.h | 6 ------
 src/l10n/por-PRT.h | 6 ------
 9 files changed, 54 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e01a21b21..64d004b13 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -495,12 +495,6 @@
 #define STRING_CMD_EDIT_USAGE        "Startet einen Editor, um eine Aufgabe direkt zu bearbeiten"
 #define STRING_CMD_CALC_USAGE        "Rechner"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Konfigurationsdatei mehr als 10 Ebenen verschachtelt - das muss ein Fehler sein."
-#define STRING_CONFIG_READ_INCLUDE   "Konnte eingebundene Datei '{1}' nicht lesen."
-#define STRING_CONFIG_INCLUDE_PATH   "Nur Dateien mit absolutem Pfad können eingebunden werden, nicht '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Fehlerhafter Eintrag '{1}' in Konfigurationsdatei."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
 #define STRING_DEPEND_BLOCKING       "und blockiert:"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f91ddb767..460202f0b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -492,12 +492,6 @@
 #define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Configuration file nested to more than 10 levels deep - this has to be a mistake."
-#define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4a0d6ecc8..df818961b 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -495,12 +495,6 @@
 #define STRING_CMD_EDIT_USAGE        "Lanĉas redaktilo por rekte modifi taskon"
 #define STRING_CMD_CALC_USAGE        "Kalkulilo"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Agorda dosiero nestita ĝis plu de 10 niveloj de profundeco - certe eraro."
-#define STRING_CONFIG_READ_INCLUDE   "Ne povis legi enkluzivitan dosieron '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Oni sole povas enkluzivi dosierojn kun absoluta pado, ne '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Malbone formita enskribo '{1}' en agorda dosiero."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
 #define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index dbc7d3ed8..3d52292ff 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -507,12 +507,6 @@
 #define STRING_CMD_EDIT_USAGE        "Lanza un editor para modificar una tarea directamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Archivo de configuración anidado hasta más de 10 niveles de profundidad - esto tiene que ser un error."
-#define STRING_CONFIG_READ_INCLUDE   "No se pudo leer el archivo include '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Sólo se pueden incluir archivos con paths absolutos, no '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Formato incorrecto en entrada '{1}' en archivo de configuración."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "y está bloqueando:"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8438d0eff..3841cc221 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -497,12 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Configuration file nested to more than 10 levels deep - this has to be a mistake."
-#define STRING_CONFIG_READ_INCLUDE   "Could not read include file '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
 #define STRING_DEPEND_BLOCKING       "et bloque :"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0ac54a34c..42d27fd8d 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -496,12 +496,6 @@
 #define STRING_CMD_EDIT_USAGE        "Esegue un editor per la modifica diretta di un task"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "File di configurazione annidato più di 10 livelli - deve trattarsi di un errore."
-#define STRING_CONFIG_READ_INCLUDE   "Impossibile leggere il file di inclusione '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "E` possibile includere solo file con percorso assoluto, non '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Voce malformata '{1}' nel file di configurazione."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
 #define STRING_DEPEND_BLOCKING       "e sta bloccando:"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a3d2f3eeb..5f3b8fb90 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -497,12 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "task を直接変更するためにエディタを起動します"
 #define STRING_CMD_CALC_USAGE        "電卓"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "構成ファイルのネストが10以上になっています - これは間違いです。"
-#define STRING_CONFIG_READ_INCLUDE   "インクルードファイル '{1}' が読み込めません。"
-#define STRING_CONFIG_INCLUDE_PATH   "Can only include files with absolute paths, not '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Malformed entry '{1}' in config file."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 #define STRING_DEPEND_BLOCKING       "and is blocking:"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 880bfb1b2..92ebb9ef7 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -497,12 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Uruchamia edytor do zmiany zadania"
 #define STRING_CMD_CALC_USAGE        "Kalkulator"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Plik konfiguracji zagnieżdzony na więcej niż 10 poziomów - to musi być jakaś pomyłka."
-#define STRING_CONFIG_READ_INCLUDE   "Nie można przeczytać dołączonego pliku '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Scieżka dołączanych plików musi mieć postać adresu bezwzględnego, nie '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Uszkodzony wpis '{1}' w pliku konfiguracyjnym."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
 #define STRING_DEPEND_BLOCKING       "oraz blokuje:"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 135e4eb83..ee244bbec 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -497,12 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Inicia um editor externo para modificar a tarefa diretamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// Config
-#define STRING_CONFIG_OVERNEST       "Ficheiro de configuração com inclusões a mais de 10 níveis de profundidade - isto certamente é um erro."
-#define STRING_CONFIG_READ_INCLUDE   "Não foi possível ler o ficheiro incluído '{1}'."
-#define STRING_CONFIG_INCLUDE_PATH   "Apenas é permitido incluir ficheiros com caminhos absolutos, não '{1}'"
-#define STRING_CONFIG_BAD_ENTRY      "Entrada anómala '{1}' no ficheiro de configuração."
-
 // dependency
 #define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
 #define STRING_DEPEND_BLOCKING       "e está a bloquear:"

From d8bd32aee8461617102cb83526b52468cd8d0b4f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:55:10 -0500
Subject: [PATCH 606/879] l10n: Eliminated STRING_DEPEND_*

---
 src/dependency.cpp | 8 ++++----
 src/l10n/deu-DEU.h | 5 -----
 src/l10n/eng-USA.h | 5 -----
 src/l10n/epo-RUS.h | 5 -----
 src/l10n/esp-ESP.h | 5 -----
 src/l10n/fra-FRA.h | 5 -----
 src/l10n/ita-ITA.h | 5 -----
 src/l10n/jpn-JPN.h | 5 -----
 src/l10n/pol-POL.h | 5 -----
 src/l10n/por-PRT.h | 5 -----
 10 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/src/dependency.cpp b/src/dependency.cpp
index 2b2fa4794..55c972981 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -32,9 +32,10 @@
 #include <Context.h>
 #include <format.h>
 #include <shared.h>
-#include <i18n.h>
 #include <main.h>
 
+#define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -173,15 +174,14 @@ void dependencyChainOnComplete (Task& task)
     {
       if (context.config.getBoolean ("dependency.reminder"))
       {
-        std::cout << STRING_DEPEND_BLOCKING
-                  << '\n';
+        std::cout << "and is blocking:\n";
 
         for (const auto& b : blocked)
           std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
       }
 
       if (!context.config.getBoolean ("dependency.confirmation") ||
-          confirm (STRING_DEPEND_FIX_CHAIN))
+          confirm ("Would you like the dependency chain fixed?"))
       {
         // Repair the chain - everything in blocked should now depend on
         // everything in blocking, instead of task.id.
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 64d004b13..14a415689 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -495,11 +495,6 @@
 #define STRING_CMD_EDIT_USAGE        "Startet einen Editor, um eine Aufgabe direkt zu bearbeiten"
 #define STRING_CMD_CALC_USAGE        "Rechner"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Aufgabe {1} wird blockiert durch:"
-#define STRING_DEPEND_BLOCKING       "und blockiert:"
-#define STRING_DEPEND_FIX_CHAIN      "Möchten Sie, dass diese Abhängigkeitskette korrigiert wird?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Keine Änderungen entdeckt."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 460202f0b..2d4e3ecf8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -492,11 +492,6 @@
 #define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
-#define STRING_DEPEND_BLOCKING       "and is blocking:"
-#define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index df818961b..c8997dec5 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -495,11 +495,6 @@
 #define STRING_CMD_EDIT_USAGE        "Lanĉas redaktilo por rekte modifi taskon"
 #define STRING_CMD_CALC_USAGE        "Kalkulilo"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Tasko {1} estas blokata per:"
-#define STRING_DEPEND_BLOCKING       "kaj ĝi blokas:"
-#define STRING_DEPEND_FIX_CHAIN      "Ĉu vi volas, ke la dependeca ĉeno repariĝus?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Ne detektis nenian redakton."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 3d52292ff..a3c314469 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -507,11 +507,6 @@
 #define STRING_CMD_EDIT_USAGE        "Lanza un editor para modificar una tarea directamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "La tarea {1} está bloqueada por:"
-#define STRING_DEPEND_BLOCKING       "y está bloqueando:"
-#define STRING_DEPEND_FIX_CHAIN      "¿Desea que la cadena de dependencias sea arreglada?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No se detectaron modificaciones."
 #define STRING_EDIT_FAILED           "Edición fallida con código de salida {1}."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 3841cc221..2f2e93c88 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -497,11 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Tâche {1} est bloquée par :"
-#define STRING_DEPEND_BLOCKING       "et bloque :"
-#define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Aucunes modifications détectées."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 42d27fd8d..8ffdeb2c5 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -496,11 +496,6 @@
 #define STRING_CMD_EDIT_USAGE        "Esegue un editor per la modifica diretta di un task"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Il task {1} è bloccato da:"
-#define STRING_DEPEND_BLOCKING       "e sta bloccando:"
-#define STRING_DEPEND_FIX_CHAIN      "Si desidera riparare la catena delle dipendenze?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nessuna modifica riscontrata."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5f3b8fb90..1f802096d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -497,11 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "task を直接変更するためにエディタを起動します"
 #define STRING_CMD_CALC_USAGE        "電卓"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
-#define STRING_DEPEND_BLOCKING       "and is blocking:"
-#define STRING_DEPEND_FIX_CHAIN      "Would you like the dependency chain fixed?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "No edits were detected."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 92ebb9ef7..443c1befa 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -497,11 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Uruchamia edytor do zmiany zadania"
 #define STRING_CMD_CALC_USAGE        "Kalkulator"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Zadanie {1} jest blokowane przez:"
-#define STRING_DEPEND_BLOCKING       "oraz blokuje:"
-#define STRING_DEPEND_FIX_CHAIN      "Czy chcesz naprawić łańcuch zależności?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Nie znaleziono żadnych edycji."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ee244bbec..e581adb9d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -497,11 +497,6 @@
 #define STRING_CMD_EDIT_USAGE        "Inicia um editor externo para modificar a tarefa diretamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// dependency
-#define STRING_DEPEND_BLOCKED        "Tarefa {1} encontra-se bloqueada por:"
-#define STRING_DEPEND_BLOCKING       "e está a bloquear:"
-#define STRING_DEPEND_FIX_CHAIN      "Deseja que a cadeia de dependências seja corrigida?"
-
 // edit
 #define STRING_EDIT_NO_CHANGES       "Não foram detetadas alterações."
 #define STRING_EDIT_FAILED           "Editing failed with exit code {1}."

From cdb1326219c538df018648a9ed78f281cf1cc7a1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 12:59:45 -0500
Subject: [PATCH 607/879] l10n: Eliminated STRING_EDIT_TABLE_HEADER

---
 src/commands/CmdEdit.cpp | 4 ++--
 src/l10n/deu-DEU.h       | 4 ----
 src/l10n/eng-USA.h       | 4 ----
 src/l10n/epo-RUS.h       | 4 ----
 src/l10n/esp-ESP.h       | 4 ----
 src/l10n/fra-FRA.h       | 4 ----
 src/l10n/ita-ITA.h       | 4 ----
 src/l10n/jpn-JPN.h       | 4 ----
 src/l10n/pol-POL.h       | 4 ----
 src/l10n/por-PRT.h       | 4 ----
 10 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index eb9149bb3..7e1678d19 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -215,8 +215,8 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
            << "# " << STRING_EDIT_HEADER_12 << '\n'
            << "#\n";
 
-  before << "# " << STRING_EDIT_TABLE_HEADER_1 << '\n'
-         << "# " << STRING_EDIT_TABLE_HEADER_2 << '\n'
+  before << "# Name               Editable details\n"
+         << "# -----------------  ----------------------------------------------------\n"
          << "# ID:                " << task.id                                                 << '\n'
          << "# UUID:              " << task.get ("uuid")                                       << '\n'
          << "# Status:            " << Lexer::ucFirst (Task::statusToText (task.getStatus ())) << '\n'
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 14a415689..c76defe2d 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -559,10 +559,6 @@
 #define STRING_EDIT_HEADER_14        "Die ' -- '-Trennung zwischen Datum und Text darf nicht entfernt werden."
 #define STRING_EDIT_HEADER_15        "Zum einfachen hinzufügen neuer Kommentare folgt ein leeres Kommentarfeld."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Name               Bearbeitbare Details"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Fehler: "
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 2d4e3ecf8..08eea6768 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -556,10 +556,6 @@
 #define STRING_EDIT_HEADER_14        "The ' -- ' separator between the date and text field should not be removed."
 #define STRING_EDIT_HEADER_15        "A \"blank slot\" for adding an annotation follows for your convenience."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Name               Editable details"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c8997dec5..74482c363 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -559,10 +559,6 @@
 #define STRING_EDIT_HEADER_14        "nombro de komentojn.  Ne viŝus la apartigilon ' -- ' inter la dato kaj la"
 #define STRING_EDIT_HEADER_15        "teksto.  Malplena loko sekvas por simpligi la aldonon de komenton."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nomo               Redakteblaj detaloj"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Eraro: "
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a3c314469..36d8669b5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -571,10 +571,6 @@
 #define STRING_EDIT_HEADER_14        "El separador ' -- ' entre la fecha y el campo de texto no debe ser eliminado."
 #define STRING_EDIT_HEADER_15        "La última es una \"entrada en blanco\" para añadir una anotación, si le conviene:"
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nombre             Detalles modificables"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"  // |esp-ESP|==|eng-USA|
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2f2e93c88..fd6402a0c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -561,10 +561,6 @@
 #define STRING_EDIT_HEADER_14        "Le séparateur ' -- ' entre les champs de date et de texte ne devrai pas être supprimé."
 #define STRING_EDIT_HEADER_15        "Il y a un champs vide ci-dessous pour ajouter une annotation facilement."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nom                Détails éditables"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erreur : "
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8ffdeb2c5..70d6bd2f2 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -560,10 +560,6 @@
 #define STRING_EDIT_HEADER_14        "Il separatore ' -- ' tra la data e il campo di teso non dovrebbe essere rimosso."
 #define STRING_EDIT_HEADER_15        "Una linea preimpostata per aggiungere una annotazione è stata aggiunta per comodità."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nome               Dati modificabili"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Errore: "
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 1f802096d..0f89377a2 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -561,10 +561,6 @@
 #define STRING_EDIT_HEADER_14        "The ' -- ' separator between the date and text field should not be removed."
 #define STRING_EDIT_HEADER_15        "A \"blank slot\" for adding an annotation follows for your convenience."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Name               Editable details"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "エラー: "
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 443c1befa..3d7a1c413 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -561,10 +561,6 @@
 #define STRING_EDIT_HEADER_14        "Separator ' -- ' pomiędzy datą a tekstem nie powinien być pominięty."
 #define STRING_EDIT_HEADER_15        "Pusty slot poniżej został dodany dla Twojej wygody."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nazwa              Edytowalne wartości"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Błąd: "
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e581adb9d..86a792e13 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -561,10 +561,6 @@
 #define STRING_EDIT_HEADER_14        "O separador ' -- ' entre os campos data e texto deverá ser mantido."
 #define STRING_EDIT_HEADER_15        "Segue-se uma \"linha em branco\" onde adicionar anotações para sua conveniência."
 
-// Maintain the same spacing.
-#define STRING_EDIT_TABLE_HEADER_1   "Nome               Detalhes editáveis"
-#define STRING_EDIT_TABLE_HEADER_2   "-----------------  ----------------------------------------------------"  // |por-PRT|==|eng-USA|
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erro: "

From 9925b4e3a983a57a3b4d8348f0685244e155e770 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:10:19 -0500
Subject: [PATCH 608/879] l10n: Eliminated STRING_COLOR_UNRECOGNIZED

---
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 9 files changed, 27 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c76defe2d..cbe81ba6b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Verwende alternative data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "Farbe '{1}' nicht erkannt."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Spaltenname '{1}' nicht erkannt."
 #define STRING_COLUMN_BAD_FORMAT     "Spaltenformat '{1}.{2}' nicht erkannt"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 08eea6768..c6d82bd4b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Using alternate data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Unrecognized column name '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Unrecognized column format '{1}.{2}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 74482c363..a1b88aebc 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Uzanta alterna data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "Koloro '{1}' ne rekonata."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nekonata kolumna nomo '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nekonata kolumna formiĝo '{1}.{2}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 36d8669b5..fed887035 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "El comando '{1}' no permite '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "El color '{1}' no se reconoce."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nombre de columna no reconocido '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de columna no reconocido '{1}.{2}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index fd6402a0c..7242a700a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Utilise une data.location alternative : {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "La couleur '{1}' n'est pas reconnue."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nom de colonne non reconnu '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Format de colonne non reconnu '{1}.{2}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 70d6bd2f2..8268d6c58 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Uso di data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "Il colore '{1}' non è riconosciuto."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome di colonna '{1}' non riconosciuto."
 #define STRING_COLUMN_BAD_FORMAT     "Formato di colonna '{1}.{2}' non riconosciuto"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0f89377a2..877d351a1 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "代替の data.location {1} を使用"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "The color '{1}' is not recognized."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "認識できないカラム名 '{1}'。"
 #define STRING_COLUMN_BAD_FORMAT     "認識出来ないカラム形式 '{1}.{2}'"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 3d7a1c413..358d778e7 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Alternatywne data.location {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "Kolor '{1}' nie został rozpoznany."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nierozpoznano nazwy kolumny '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nierozpoznano formatu kolumny '{1}.{2}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 86a792e13..f5eb2c4b2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -44,9 +44,6 @@
 #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
 #define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
 
-// Color
-#define STRING_COLOR_UNRECOGNIZED    "A cor '{1}' não é reconhecida."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome de coluna '{1}' não reconhecido."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de coluna '{1}.{2}' não reconhecido"

From 51241c5a953116932060363f7f55f591d573e378 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:15:45 -0500
Subject: [PATCH 609/879] l10n: Eliminated STRING_RECORD_*

---
 src/Task.cpp       | 6 +++---
 src/l10n/deu-DEU.h | 5 -----
 src/l10n/eng-USA.h | 5 -----
 src/l10n/epo-RUS.h | 5 -----
 src/l10n/esp-ESP.h | 5 -----
 src/l10n/fra-FRA.h | 5 -----
 src/l10n/ita-ITA.h | 5 -----
 src/l10n/jpn-JPN.h | 5 -----
 src/l10n/pol-POL.h | 5 -----
 src/l10n/por-PRT.h | 5 -----
 10 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 3f0f81dec..dedda1ce1 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -589,7 +589,7 @@ void Task::parse (const std::string& input)
           (pig.skip ('\n') || pig.eos ()))
       {
         if (line.length () == 0)
-          throw std::string (STRING_RECORD_EMPTY);
+          throw std::string ("Empty record in input.");
 
         Pig attLine (line);
         std::string name;
@@ -616,13 +616,13 @@ void Task::parse (const std::string& input)
         std::string remainder;
         attLine.getRemainder (remainder);
         if (remainder.length ())
-          throw std::string (STRING_RECORD_JUNK_AT_EOL);
+          throw std::string ("Unrecognized characters at end of line.");
       }
     }
     else if (input[0] == '{')
       parseJSON (input);
     else
-      throw std::string (STRING_RECORD_NOT_FF4);
+      throw std::string ("Record not recognized as format 4.");
   }
 
   catch (const std::string&)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index cbe81ba6b..97d31e603 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -607,11 +607,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Leerer Datensatz in der Eingabe."
-#define STRING_RECORD_JUNK_AT_EOL    "Unerkannte Zeichen am Ende der Eingabe."
-#define STRING_RECORD_NOT_FF4        "Datensatz nicht als Format 4 erkannt."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Zeigt alle Konfigurations-Optionen oder eine Teilmenge davon"
 #define STRING_CMD_SHOW_ARGS         "Sie müssen 'all' oder ein Suchwort angeben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index c6d82bd4b..c8de7c653 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -604,11 +604,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Empty record in input."
-#define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
-#define STRING_RECORD_NOT_FF4        "Record not recognized as format 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a1b88aebc..0f0ef19cc 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -607,11 +607,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Malplena rikordo en la inigo."
-#define STRING_RECORD_JUNK_AT_EOL    "Nekonataj signoj ĉe vicfino."
-#define STRING_RECORD_NOT_FF4        "Rikordo ne rekonata kiel aranĝo 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Montras ĉian agordan variablon, aŭ subaron"
 #define STRING_CMD_SHOW_ARGS         "Oni sole povas specifi 'all' aŭ serĉĉenon."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index fed887035..0fa7d47b2 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -619,11 +619,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} de {2} tareas restantes)."
 #define STRING_HELPER_PROJECT_REM1   "({1} tarea restante)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Registro vacío en la entrada."
-#define STRING_RECORD_JUNK_AT_EOL    "Caracteres no reconocidos al final de línea."
-#define STRING_RECORD_NOT_FF4        "Registro no reconocido como formato 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Muestra todas las variables de configuración o un subconjunto"
 #define STRING_CMD_SHOW_ARGS         "Solo puede especificar 'all' o un término de búsqueda."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7242a700a..2e052e49a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -609,11 +609,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Empty record in input."
-#define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
-#define STRING_RECORD_NOT_FF4        "Record not recognized as format 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8268d6c58..8d2aad3c6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -608,11 +608,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} di {2} task rimanenti)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Voce vuota in ingresso."
-#define STRING_RECORD_JUNK_AT_EOL    "Carattere non riconosciuto a fine riga."
-#define STRING_RECORD_NOT_FF4        "Voce non riconosciuta come formato 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra i sottoinsiemi di variabili di configurazione"
 #define STRING_CMD_SHOW_ARGS         "Solo 'all' può essere specificata come stringa di ricerca."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 877d351a1..d228610c5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -609,11 +609,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Empty record in input."
-#define STRING_RECORD_JUNK_AT_EOL    "Unrecognized characters at end of line."
-#define STRING_RECORD_NOT_FF4        "Record not recognized as format 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 358d778e7..0522bd22f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -609,11 +609,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Pusty wpis na wejściu."
-#define STRING_RECORD_JUNK_AT_EOL    "Nierozpoznawalny znak na koncu lini."
-#define STRING_RECORD_NOT_FF4        "Wpis nie rozpoznany jako wersja 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Pokazuje wszystkie zmienne konfiguracji lub ich podzbiór"
 #define STRING_CMD_SHOW_ARGS         "Możesz jedynie wybrać wszystkie lub wyszukać na podstawie ciągu."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f5eb2c4b2..f82fc3d9f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -609,11 +609,6 @@
 #define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
 #define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
 
-// Record
-#define STRING_RECORD_EMPTY          "Registo vazio na entrada fornecida."
-#define STRING_RECORD_JUNK_AT_EOL    "Caracteres desconhecidos no fim da linha."
-#define STRING_RECORD_NOT_FF4        "Registo não reconhecido como formato 4."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra todas ou um subconjunto das variáveis de configuração"
 #define STRING_CMD_SHOW_ARGS         "Apenas pode específicar 'all' ou uma expressão a procurar."

From e65f1ecffea84f3d42e53f38d4df0d94f44b04d1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:42:04 -0500
Subject: [PATCH 610/879] l10n: Eliminated STRING_EDIT_*

---
 src/commands/CmdEdit.cpp | 122 ++++++++++++++++++++-------------------
 src/l10n/deu-DEU.h       |  65 ---------------------
 src/l10n/eng-USA.h       |  65 ---------------------
 src/l10n/epo-RUS.h       |  65 ---------------------
 src/l10n/esp-ESP.h       |  65 ---------------------
 src/l10n/fra-FRA.h       |  45 ---------------
 src/l10n/ita-ITA.h       |  65 ---------------------
 src/l10n/jpn-JPN.h       |  65 ---------------------
 src/l10n/pol-POL.h       |  65 ---------------------
 src/l10n/por-PRT.h       |  65 ---------------------
 10 files changed, 63 insertions(+), 624 deletions(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 7e1678d19..69bf3034d 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -39,14 +39,18 @@
 #include <Lexer.h>
 #include <Filter.h>
 #include <Pig.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 #include <JSON.h>
 
+#define STRING_EDIT_START_MOD        "Start date modified."
+#define STRING_EDIT_SCHED_MOD        "Scheduled date modified."
+#define STRING_EDIT_DUE_MOD          "Due date modified."
+#define STRING_EDIT_UNTIL_MOD        "Until date modified."
+#define STRING_EDIT_WAIT_MOD         "Wait date modified."
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +58,7 @@ CmdEdit::CmdEdit ()
 {
   _keyword               = "edit";
   _usage                 = "task <filter> edit";
-  _description           = STRING_CMD_EDIT_USAGE;
+  _description           = "Launches an editor to modify a task directly";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -79,7 +83,7 @@ int CmdEdit::execute (std::string&)
 
   if (! filtered.size ())
   {
-    context.footnote (STRING_FEEDBACK_NO_MATCH);
+    context.footnote ("No matches.");
     return 1;
   }
 
@@ -199,21 +203,21 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   auto verbose = context.verbose ("edit");
 
   if (verbose)
-    before << "# " << STRING_EDIT_HEADER_1 << '\n'
-           << "# " << STRING_EDIT_HEADER_2 << '\n'
-           << "# " << STRING_EDIT_HEADER_3 << '\n'
-           << "# " << STRING_EDIT_HEADER_4 << '\n'
-           << "# " << STRING_EDIT_HEADER_5 << '\n'
-           << "# " << STRING_EDIT_HEADER_6 << '\n'
-           << "#\n"
-           << "# " << STRING_EDIT_HEADER_7 << '\n'
-           << "# " << STRING_EDIT_HEADER_8 << '\n'
-           << "# " << STRING_EDIT_HEADER_9 << '\n'
-           << "#\n"
-           << "# " << STRING_EDIT_HEADER_10 << '\n'
-           << "# " << STRING_EDIT_HEADER_11 << '\n'
-           << "# " << STRING_EDIT_HEADER_12 << '\n'
-           << "#\n";
+    before << "# The 'task <id> edit' command allows you to modify all aspects of a task\n"
+              "# using a text editor.  Below is a representation of all the task details.\n"
+              "# Modify what you wish, and when you save and quit your editor,\n"
+              "# Taskwarrior will read this file, determine what changed, and apply\n"
+              "# those changes.  If you exit your editor without saving or making\n"
+              "# modifications, Taskwarrior will do nothing.\n"
+              "#\n"
+              "# Lines that begin with # represent data you cannot change, like ID.\n"
+              "# If you get too creative with your editing, Taskwarrior will send you\n"
+              "# back to the editor to try again.\n"
+              "#\n"
+              "# Should you find yourself in an endless loop, re-editing the same file,\n"
+              "# just quit the editor without making any changes.  Taskwarrior will\n"
+              "# notice this and stop the editing.\n"
+              "#\n";
 
   before << "# Name               Editable details\n"
          << "# -----------------  ----------------------------------------------------\n"
@@ -225,7 +229,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
          << "  Project:           " << task.get ("project")                                    << '\n';
 
   if (verbose)
-    before << "# " << STRING_EDIT_TAG_SEP << '\n';
+    before << "# Separate the tags with spaces, like this: tag1 tag2\n";
 
   before << "  Tags:              " << join (" ", task.getTags ())                      << '\n'
          << "  Description:       " << task.get ("description")                         << '\n'
@@ -241,9 +245,9 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
          << "  Parent:            " << task.get ("parent")                              << '\n';
 
   if (verbose)
-    before << "# " << STRING_EDIT_HEADER_13 << '\n'
-           << "# " << STRING_EDIT_HEADER_14 << '\n'
-           << "# " << STRING_EDIT_HEADER_15 << '\n';
+    before << "# Annotations look like this: <date> -- <text> and there can be any number of them.\n"
+              "# The ' -- ' separator between the date and text field should not be removed.\n"
+              "# A \"blank slot\" for adding an annotation follows for your convenience.\n";
 
   for (auto& anno : task.getAnnotations ())
   {
@@ -273,7 +277,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   }
 
   if (verbose)
-    before << "# " << STRING_EDIT_DEP_SEP << '\n';
+    before << "# Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces.\n";
 
   before << "  Dependencies:      " << allDeps.str () << '\n';
 
@@ -285,7 +289,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   if (udas.size ())
   {
-    before << "# " << STRING_EDIT_UDA_SEP << '\n';
+    before << "# User Defined Attributes\n";
     std::sort (udas.begin (), udas.end ());
     for (auto& uda : udas)
     {
@@ -308,7 +312,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
   auto orphans = task.getUDAOrphanUUIDs ();
   if (orphans.size ())
   {
-    before << "# " << STRING_EDIT_UDA_ORPHAN_SEP << '\n';
+    before << "# User Defined Attribute Orphans\n";
     std::sort (orphans.begin (), orphans.end ());
     for (auto& orphan : orphans)
     {
@@ -321,7 +325,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
     }
   }
 
-  before << "# " << STRING_EDIT_END << '\n';
+  before << "# End\n";
   return before.str ();
 }
 
@@ -334,12 +338,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote (STRING_EDIT_PROJECT_MOD);
+      context.footnote ("Project modified.");
       task.set ("project", value);
     }
     else
     {
-      context.footnote (STRING_EDIT_PROJECT_DEL);
+      context.footnote ("Project deleted.");
       task.remove ("project");
     }
   }
@@ -355,11 +359,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote (STRING_EDIT_DESC_MOD);
+      context.footnote ("Description modified.");
       task.set ("description", value);
     }
     else
-      throw std::string (STRING_EDIT_DESC_REMOVE_ERR);
+      throw std::string ("Cannot remove description.");
   }
 
   // entry
@@ -368,12 +372,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != formatDate (task, "entry", dateformat))
     {
-      context.footnote (STRING_EDIT_ENTRY_MOD);
+      context.footnote ("Creation date modified.");
       task.set ("entry", Datetime (value, dateformat).toEpochString ());
     }
   }
   else
-    throw std::string (STRING_EDIT_ENTRY_REMOVE_ERR);
+    throw std::string ("Cannot remove creation date.");
 
   // start
   value = findValue (after, "\n  Started:");
@@ -397,7 +401,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("start") != "")
     {
-      context.footnote (STRING_EDIT_START_DEL);
+      context.footnote ("Start date removed.");
       task.remove ("start");
     }
   }
@@ -410,18 +414,18 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "end", dateformat))
       {
-        context.footnote (STRING_EDIT_END_MOD);
+        context.footnote ("End date modified.");
         task.set ("end", Datetime (value, dateformat).toEpochString ());
       }
     }
     else if (task.getStatus () != Task::deleted)
-      throw std::string (STRING_EDIT_END_SET_ERR);
+      throw std::string ("Cannot set a done date on a pending task.");
   }
   else
   {
     if (task.get ("end") != "")
     {
-      context.footnote (STRING_EDIT_END_DEL);
+      context.footnote ("End date removed.");
       task.setStatus (Task::pending);
       task.remove ("end");
     }
@@ -449,7 +453,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("scheduled") != "")
     {
-      context.footnote (STRING_EDIT_SCHED_DEL);
+      context.footnote ("Scheduled date removed.");
       task.remove ("scheduled");
     }
   }
@@ -479,11 +483,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (task.getStatus () == Task::recurring ||
           task.get ("parent") != "")
       {
-        context.footnote (STRING_EDIT_DUE_DEL_ERR);
+        context.footnote ("Cannot remove a due date from a recurring task.");
       }
       else
       {
-        context.footnote (STRING_EDIT_DUE_DEL);
+        context.footnote ("Due date removed.");
         task.remove ("due");
       }
     }
@@ -511,7 +515,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("until") != "")
     {
-      context.footnote (STRING_EDIT_UNTIL_DEL);
+      context.footnote ("Until date removed.");
       task.remove ("until");
     }
   }
@@ -526,21 +530,21 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       std::string::size_type idx = 0;
       if (p.parse (value, idx))
       {
-        context.footnote (STRING_EDIT_RECUR_MOD);
+        context.footnote ("Recurrence modified.");
         if (task.get ("due") != "")
         {
           task.set ("recur", value);
           task.setStatus (Task::recurring);
         }
         else
-          throw std::string (STRING_EDIT_RECUR_DUE_ERR);
+          throw std::string ("A recurring task must have a due date.");
       }
       else
-        throw std::string (STRING_EDIT_RECUR_ERR);
+        throw std::string ("Not a valid recurrence duration.");
     }
     else
     {
-      context.footnote (STRING_EDIT_RECUR_DEL);
+      context.footnote ("Recurrence removed.");
       task.setStatus (Task::pending);
       task.remove ("recur");
       task.remove ("until");
@@ -573,7 +577,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("wait") != "")
     {
-      context.footnote (STRING_EDIT_WAIT_DEL);
+      context.footnote ("Wait date removed.");
       task.remove ("wait");
       task.setStatus (Task::pending);
     }
@@ -585,12 +589,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote (STRING_EDIT_PARENT_MOD);
+      context.footnote ("Parent UUID modified.");
       task.set ("parent", value);
     }
     else
     {
-      context.footnote (STRING_EDIT_PARENT_DEL);
+      context.footnote ("Parent UUID removed.");
       task.remove ("parent");
     }
   }
@@ -667,7 +671,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       {
         if (value != "")
         {
-          context.footnote (format (STRING_EDIT_UDA_MOD, col.first));
+          context.footnote (format ("UDA {1} modified.", col.first));
 
           if (type == "string")
           {
@@ -694,7 +698,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
         }
         else
         {
-          context.footnote (format (STRING_EDIT_UDA_DEL, col.first));
+          context.footnote (format ("UDA {1} deleted.", col.first));
           task.remove (col.first);
         }
       }
@@ -724,7 +728,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   // Check for file permissions.
   Directory location (context.config.get ("data.location"));
   if (! location.writable ())
-    throw std::string (STRING_EDIT_UNWRITABLE);
+    throw std::string ("Your data.location directory is not writable.");
 
   // Create a temp file name in data.location.
   std::stringstream file;
@@ -745,7 +749,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   // Check if the file already exists, if so, bail out
   Path filepath = Path (file.str ());
   if (filepath.exists ())
-    throw std::string (STRING_EDIT_IN_PROGRESS);
+    throw std::string ("Task is already being edited.");
 
   // Format the contents, T -> text, write to a file.
   auto before = formatTask (task, dateformat);
@@ -768,14 +772,14 @@ ARE_THESE_REALLY_HARMFUL:
   bool changes = false; // No changes made.
 
   // Launch the editor.
-  std::cout << format (STRING_EDIT_LAUNCHING, editor) << '\n';
+  std::cout << format ("Launching '{1}' now...\n", editor);
   int exitcode = system (editor.c_str ());
   auto captured_errno = errno;
   if (0 == exitcode)
-    std::cout << STRING_EDIT_COMPLETE << '\n';
+    std::cout << "Editing complete.\n";
   else
   {
-    std::cout << format (STRING_EDIT_FAILED, exitcode) << '\n';
+    std::cout << format ("Editing failed with exit code {1}.\n", exitcode);
     if (-1 == exitcode)
       std::cout << std::strerror (captured_errno) << '\n';
     return CmdEdit::editResult::error;
@@ -789,7 +793,7 @@ ARE_THESE_REALLY_HARMFUL:
   // if changes were made.
   if (before_orig != after)
   {
-    std::cout << STRING_EDIT_CHANGES << '\n';
+    std::cout << "Edits were detected.\n";
     std::string problem = "";
     auto oops = false;
 
@@ -806,13 +810,13 @@ ARE_THESE_REALLY_HARMFUL:
 
     if (oops)
     {
-      std::cerr << STRING_ERROR_PREFIX << problem << '\n';
+      std::cerr << "Error: " << problem << '\n';
 
       // Preserve the edits.
       before = after;
       File::write (file.str (), before);
 
-      if (confirm (STRING_EDIT_UNPARSEABLE))
+      if (confirm ("Taskwarrior couldn't handle your edits.  Would you like to try again?"))
         goto ARE_THESE_REALLY_HARMFUL;
     }
     else
@@ -820,7 +824,7 @@ ARE_THESE_REALLY_HARMFUL:
   }
   else
   {
-    std::cout << STRING_EDIT_NO_CHANGES << '\n';
+    std::cout << "No edits were detected.\n";
     changes = false;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 97d31e603..d299c0ed7 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -489,73 +489,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Datum"
 #define STRING_CMD_CAL_LABEL_HOL     "Feiertag"
 #define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
-#define STRING_CMD_EDIT_USAGE        "Startet einen Editor, um eine Aufgabe direkt zu bearbeiten"
 #define STRING_CMD_CALC_USAGE        "Rechner"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Keine Änderungen entdeckt."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Bearbeitung abgeschlossen."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Starte jetzt '{1}'..."
-#define STRING_EDIT_CHANGES          "Änderungen entdeckt."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior konnte Ihre Änderungen nicht verarbeiten.  Möchten Sie es erneut probieren?"
-#define STRING_EDIT_UNWRITABLE       "Ihr data.location-Order ist nicht beschreibbar."
-#define STRING_EDIT_TAG_SEP          "Trennen Sie die Schlagworte mit Leerzeichen, zum Beispiel: tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Abhängigkeiten sollten eine Komma-getrennte Liste von Aufgaben-IDs/UUIDs oder ID-Intervallen ohne Leerzeichen sein."
-#define STRING_EDIT_UDA_SEP          "Benutzerdefinierte Eigenschaften"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Verwaiste Benutzerdefinierte Eigenschaften"
-#define STRING_EDIT_END              "Ende"
-
-#define STRING_EDIT_PROJECT_MOD      "Projekt geändert."
-#define STRING_EDIT_PROJECT_DEL      "Projekt gelöscht."
-#define STRING_EDIT_DESC_MOD         "Beschreibung geändert."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Beschreibung kann nicht entfernt werden."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Erstelldatum kann nicht entfernt werden."
-#define STRING_EDIT_ENTRY_MOD        "Erstelldatum geändert."
-#define STRING_EDIT_START_MOD        "Start-Datum geändert."
-#define STRING_EDIT_START_DEL        "Start-Datum gelöscht."
-#define STRING_EDIT_END_MOD          "End-Datum geändert."
-#define STRING_EDIT_END_DEL          "End-Datum gelöscht."
-#define STRING_EDIT_END_SET_ERR      "Kann kein Ende-Datum für eine offene Aufgabe setzen."
-#define STRING_EDIT_SCHED_MOD        "Geplantes Datum geändert."
-#define STRING_EDIT_SCHED_DEL        "Geplantes Datum gelöscht."
-#define STRING_EDIT_DUE_MOD          "Fälligkeit geändert."
-#define STRING_EDIT_DUE_DEL          "Fälligkeit gelöscht."
-#define STRING_EDIT_DUE_DEL_ERR      "Fälligkeit einer wiederholenden Aufgabe kann nicht gelöscht werden."
-#define STRING_EDIT_UNTIL_MOD        "Ende-Datum geändert."
-#define STRING_EDIT_UNTIL_DEL        "Ende-Datum gelöscht."
-#define STRING_EDIT_RECUR_MOD        "Wiederholungsperiode geändert."
-#define STRING_EDIT_RECUR_DEL        "Wiederholungsperiode gelöscht."
-#define STRING_EDIT_RECUR_DUE_ERR    "Wiederholende Aufgaben benötigen eine Fälligkeit."
-#define STRING_EDIT_RECUR_ERR        "Keine gültige Wiederholungsperiode."
-#define STRING_EDIT_WAIT_MOD         "Aufschiebe-Datum geändert."
-#define STRING_EDIT_WAIT_DEL         "Aufschiebe-Datum gelöscht."
-#define STRING_EDIT_PARENT_MOD       "Vorgänger-UUID geändert."
-#define STRING_EDIT_PARENT_DEL       "Vorgänger-UUID gelöscht."
-#define STRING_EDIT_UDA_MOD          "UDA {1} geändert."
-#define STRING_EDIT_UDA_DEL          "UDA {1} gelöscht."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "Der Befehl 'task <id> edit' ermöglicht es, alle Eigenschaften einer Aufgabe"
-#define STRING_EDIT_HEADER_2         "mit einem Text-Editor zu bearbeiten. Bearbeiten Sie nach Ihren Wünschen."
-#define STRING_EDIT_HEADER_3         "Nachdem Sie gespeichert und den Text Editor beendet haben, wird taskwarrior"
-#define STRING_EDIT_HEADER_4         "die Datei einlesen und durchgeführte Änderungen anwenden.  Wenn Sie den"
-#define STRING_EDIT_HEADER_5         "Text-Editor beenden, ohne zu speichern oder Änderungen durchzuführen, wird"
-#define STRING_EDIT_HEADER_6         "taskwarrior nichts tun."
-
-#define STRING_EDIT_HEADER_7         "Zeilen, welche mit # beginnen, beinhalten nicht änderbare Eigenschaften"
-#define STRING_EDIT_HEADER_8         "(z.B. die ID).  Sollte taskwarrior Ihre Änderungen nicht verstehen, wird er"
-#define STRING_EDIT_HEADER_9         "den Editor erneut öffnen, sodass Sie es erneut versuchen können."
-
-#define STRING_EDIT_HEADER_10        "Sollten Sie sich in einer Endlosschleife befinden und immer die selbe Datei"
-#define STRING_EDIT_HEADER_11        "bearbeiten, schließen Sie den Text-Editor ohne Änderungen vorzunehmen."
-#define STRING_EDIT_HEADER_12        "Taskwarrior wird dies feststellen und die Bearbeitung beenden."
-
-#define STRING_EDIT_HEADER_13        "Kommentare haben das Format '<date> -- <text>', es darf beliebig viele geben."
-#define STRING_EDIT_HEADER_14        "Die ' -- '-Trennung zwischen Datum und Text darf nicht entfernt werden."
-#define STRING_EDIT_HEADER_15        "Zum einfachen hinzufügen neuer Kommentare folgt ein leeres Kommentarfeld."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Fehler: "
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index c8de7c653..ee9016593 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -486,73 +486,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "No edits were detected."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Editing complete."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Launching '{1}' now..."
-#define STRING_EDIT_CHANGES          "Edits were detected."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior couldn't handle your edits.  Would you like to try again?"
-#define STRING_EDIT_UNWRITABLE       "Your data.location directory is not writable."
-#define STRING_EDIT_TAG_SEP          "Separate the tags with spaces, like this: tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces."
-#define STRING_EDIT_UDA_SEP          "User Defined Attributes"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "User Defined Attribute Orphans"
-#define STRING_EDIT_END              "End"
-
-#define STRING_EDIT_PROJECT_MOD      "Project modified."
-#define STRING_EDIT_PROJECT_DEL      "Project deleted."
-#define STRING_EDIT_DESC_MOD         "Description modified."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Cannot remove description."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Cannot remove creation date."
-#define STRING_EDIT_ENTRY_MOD        "Creation date modified."
-#define STRING_EDIT_START_MOD        "Start date modified."
-#define STRING_EDIT_START_DEL        "Start date removed."
-#define STRING_EDIT_END_MOD          "End date modified."
-#define STRING_EDIT_END_DEL          "End date removed."
-#define STRING_EDIT_END_SET_ERR      "Cannot set a done date on a pending task."
-#define STRING_EDIT_SCHED_MOD        "Scheduled date modified."
-#define STRING_EDIT_SCHED_DEL        "Scheduled date removed."
-#define STRING_EDIT_DUE_MOD          "Due date modified."
-#define STRING_EDIT_DUE_DEL          "Due date removed."
-#define STRING_EDIT_DUE_DEL_ERR      "Cannot remove a due date from a recurring task."
-#define STRING_EDIT_UNTIL_MOD        "Until date modified."
-#define STRING_EDIT_UNTIL_DEL        "Until date removed."
-#define STRING_EDIT_RECUR_MOD        "Recurrence modified."
-#define STRING_EDIT_RECUR_DEL        "Recurrence removed."
-#define STRING_EDIT_RECUR_DUE_ERR    "A recurring task must have a due date."
-#define STRING_EDIT_RECUR_ERR        "Not a valid recurrence duration."
-#define STRING_EDIT_WAIT_MOD         "Wait date modified."
-#define STRING_EDIT_WAIT_DEL         "Wait date removed."
-#define STRING_EDIT_PARENT_MOD       "Parent UUID modified."
-#define STRING_EDIT_PARENT_DEL       "Parent UUID removed."
-#define STRING_EDIT_UDA_MOD          "UDA {1} modified."
-#define STRING_EDIT_UDA_DEL          "UDA {1} deleted."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "The 'task <id> edit' command allows you to modify all aspects of a task"
-#define STRING_EDIT_HEADER_2         "using a text editor.  Below is a representation of all the task details."
-#define STRING_EDIT_HEADER_3         "Modify what you wish, and when you save and quit your editor,"
-#define STRING_EDIT_HEADER_4         "Taskwarrior will read this file, determine what changed, and apply"
-#define STRING_EDIT_HEADER_5         "those changes.  If you exit your editor without saving or making"
-#define STRING_EDIT_HEADER_6         "modifications, Taskwarrior will do nothing."
-
-#define STRING_EDIT_HEADER_7         "Lines that begin with # represent data you cannot change, like ID."
-#define STRING_EDIT_HEADER_8         "If you get too creative with your editing, Taskwarrior will send you"
-#define STRING_EDIT_HEADER_9         "back to the editor to try again."
-
-#define STRING_EDIT_HEADER_10        "Should you find yourself in an endless loop, re-editing the same file,"
-#define STRING_EDIT_HEADER_11        "just quit the editor without making any changes.  Taskwarrior will"
-#define STRING_EDIT_HEADER_12        "notice this and stop the editing."
-
-#define STRING_EDIT_HEADER_13        "Annotations look like this: <date> -- <text> and there can be any number of them."
-#define STRING_EDIT_HEADER_14        "The ' -- ' separator between the date and text field should not be removed."
-#define STRING_EDIT_HEADER_15        "A \"blank slot\" for adding an annotation follows for your convenience."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0f0ef19cc..e672af313 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -489,73 +489,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Dato"
 #define STRING_CMD_CAL_LABEL_HOL     "Ferio"
 #define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
-#define STRING_CMD_EDIT_USAGE        "Lanĉas redaktilo por rekte modifi taskon"
 #define STRING_CMD_CALC_USAGE        "Kalkulilo"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Ne detektis nenian redakton."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Redaktis komplete."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Lanĉanta nun '{1}'..."
-#define STRING_EDIT_CHANGES          "Detektis redaktojn."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior ne povis trakti viaj redaktojn. Ĉu vi volas ripovi?"
-#define STRING_EDIT_UNWRITABLE       "Via dosierumo data.location ne estas skribebla."
-#define STRING_EDIT_TAG_SEP          "Apartigi la etikedojn kun spaceto, kiel: etiked1 etiked2"
-#define STRING_EDIT_DEP_SEP          "Dependoj devas esti listo komdividata de task-identigilojn (ID aŭ UUID) aŭ ID-atingopovoj, sen spacetoj."
-#define STRING_EDIT_UDA_SEP          "Uzanto-Definitaj Atributoj"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Uzanto-Definitaj Atributoj kiu estas Orfoj"
-#define STRING_EDIT_END              "Fino"
-
-#define STRING_EDIT_PROJECT_MOD      "Modifis la projekton."
-#define STRING_EDIT_PROJECT_DEL      "Viŝis la projekton."
-#define STRING_EDIT_DESC_MOD         "Modifis la priskribon."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Ne povis viŝi la priskribon."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Ne povis viŝi la krean daton."
-#define STRING_EDIT_ENTRY_MOD        "Modifis la krean daton."
-#define STRING_EDIT_START_MOD        "Modifis la ekan daton."
-#define STRING_EDIT_START_DEL        "Viŝis la ekan daton."
-#define STRING_EDIT_END_MOD          "Modifis la finan daton."
-#define STRING_EDIT_END_DEL          "Viŝis la finan daton."
-#define STRING_EDIT_END_SET_ERR      "Ne povas doni fin-dato al pendanta tasko."
-#define STRING_EDIT_SCHED_MOD        "Modifis la fiksan daton."
-#define STRING_EDIT_SCHED_DEL        "Viŝis la fiksan daton."
-#define STRING_EDIT_DUE_MOD          "Modifis la datlimon."
-#define STRING_EDIT_DUE_DEL          "Viŝis la datlimon."
-#define STRING_EDIT_DUE_DEL_ERR      "Ne povas viŝi datlimon de reokazanta tasko."
-#define STRING_EDIT_UNTIL_MOD        "Modifis la ĝisan daton."
-#define STRING_EDIT_UNTIL_DEL        "Viŝis la ĝisan daton."
-#define STRING_EDIT_RECUR_MOD        "Modifis la reokazon."
-#define STRING_EDIT_RECUR_DEL        "Viŝis la reokazon."
-#define STRING_EDIT_RECUR_DUE_ERR    "Reokazanta tasko devas havi datlimon."
-#define STRING_EDIT_RECUR_ERR        "Nevalida reokaza daŭro."
-#define STRING_EDIT_WAIT_MOD         "Modifis la atend-daton."
-#define STRING_EDIT_WAIT_DEL         "Viŝis la atend-daton."
-#define STRING_EDIT_PARENT_MOD       "Modifis la patran UUID-identigilon."
-#define STRING_EDIT_PARENT_DEL       "Viŝis la patran UUID-identigilon."
-#define STRING_EDIT_UDA_MOD          "Modifis la UDA {1}."
-#define STRING_EDIT_UDA_DEL          "Viŝis la UDA {1}."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "Komando 'task <id> edit' vi permesas modifi ĉian aspekton de tasko kun"
-#define STRING_EDIT_HEADER_2         "tekst-redaktilo.  Jen sube reprezento de ĉia taska detalo.  Modifu kion vi"
-#define STRING_EDIT_HEADER_3         "volas.  Kiam vi konservos ĉi tiun dosieron kaj iros el la redaktilo,"
-#define STRING_EDIT_HEADER_4         "taskwarrior legos la dosieron, trovos la ŝanĝojn, kaj apliki ĝin.  Se vi"
-#define STRING_EDIT_HEADER_5         "iras el redaktilo sen konservi aŭ sen modifi, taskwarrior ne faros"
-#define STRING_EDIT_HEADER_6         "nenion."
-
-#define STRING_EDIT_HEADER_7         "Vicoj ke ekas kun # reprezentas datumojn neŝanĝeblajn, ekzemple ID."
-#define STRING_EDIT_HEADER_8         "Se vi redaktis tro kreeme, taskwarrior risendos vin al redaktilo por"
-#define STRING_EDIT_HEADER_9         "ripovi."
-
-#define STRING_EDIT_HEADER_10        "Se vi trovas en senfina ripeto, riredaktanta la meman dosieron, simple"
-#define STRING_EDIT_HEADER_11        "iru el redaktilo sen ŝanĝi nenion.  Taskwarrior notos ĝin kaj haltos la"
-#define STRING_EDIT_HEADER_12        "redaktciklon."
-
-#define STRING_EDIT_HEADER_13        "Komentoj devas aspekti kiel: <dato> -- <teksto>; povas ekzisti ajna"
-#define STRING_EDIT_HEADER_14        "nombro de komentojn.  Ne viŝus la apartigilon ' -- ' inter la dato kaj la"
-#define STRING_EDIT_HEADER_15        "teksto.  Malplena loko sekvas por simpligi la aldonon de komenton."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Eraro: "
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0fa7d47b2..bfb8502a5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -501,73 +501,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Fecha"
 #define STRING_CMD_CAL_LABEL_HOL     "Festivo"
 #define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
-#define STRING_CMD_EDIT_USAGE        "Lanza un editor para modificar una tarea directamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "No se detectaron modificaciones."
-#define STRING_EDIT_FAILED           "Edición fallida con código de salida {1}."
-#define STRING_EDIT_COMPLETE         "Edición completada."
-#define STRING_EDIT_IN_PROGRESS      "La tarea ya está siendo editada."
-#define STRING_EDIT_LAUNCHING        "Lanzando '{1}' ahora..."
-#define STRING_EDIT_CHANGES          "Se detectaron modificaciones."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior no pudo manejar sus modificaciones. ¿Quiere intentarlo de nuevo?"
-#define STRING_EDIT_UNWRITABLE       "No tiene permiso de escritura en su directorio data.location ."
-#define STRING_EDIT_TAG_SEP          "Separe las marcas mediante espacios, así: marca1 marca2"
-#define STRING_EDIT_DEP_SEP          "Las dependencias deben ser una lista separada por comas de IDs/UUIDs de tareas o intervalos de ID, sin espacios."
-#define STRING_EDIT_UDA_SEP          "Atributos Definidos por el Usuario"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Huérfanos de Atributo Definido por el Usuario"
-#define STRING_EDIT_END              "Fin"
-
-#define STRING_EDIT_PROJECT_MOD      "Proyecto modificado."
-#define STRING_EDIT_PROJECT_DEL      "Proyecto eliminado."
-#define STRING_EDIT_DESC_MOD         "Descripción modificada."
-#define STRING_EDIT_DESC_REMOVE_ERR  "No se puede eliminar la descripción."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "No se puede eliminar la fecha de creación."
-#define STRING_EDIT_ENTRY_MOD        "Fecha de creación modificada."
-#define STRING_EDIT_START_MOD        "Fecha de comienzo modificada."
-#define STRING_EDIT_START_DEL        "Fecha de comienzo eliminada."
-#define STRING_EDIT_END_MOD          "Fecha de terminación modificada."
-#define STRING_EDIT_END_DEL          "Fecha de terminación eliminada."
-#define STRING_EDIT_END_SET_ERR      "No se puede establecer una fecha de completado en una tarea pendiente."
-#define STRING_EDIT_SCHED_MOD        "Fecha programada modificada."
-#define STRING_EDIT_SCHED_DEL        "Fecha programada eliminada."
-#define STRING_EDIT_DUE_MOD          "Fecha de vencimiento modificada."
-#define STRING_EDIT_DUE_DEL          "Fecha de vencimiento eliminada."
-#define STRING_EDIT_DUE_DEL_ERR      "No se puede eliminar una fecha de vencimiento de una tarea recurrente."
-#define STRING_EDIT_UNTIL_MOD        "Fecha 'hasta' modificada."
-#define STRING_EDIT_UNTIL_DEL        "Fecha 'hasta' eliminada."
-#define STRING_EDIT_RECUR_MOD        "Recurrencia modificada."
-#define STRING_EDIT_RECUR_DEL        "Recurrencia eliminada."
-#define STRING_EDIT_RECUR_DUE_ERR    "Una tarea recurrente debe tener una fecha de vencimiento."
-#define STRING_EDIT_RECUR_ERR        "No es una duración de recurrencia válida."
-#define STRING_EDIT_WAIT_MOD         "Fecha de espera modificada."
-#define STRING_EDIT_WAIT_DEL         "Fecha de espera eliminada."
-#define STRING_EDIT_PARENT_MOD       "UUID primario modificado."
-#define STRING_EDIT_PARENT_DEL       "UUID primario eliminado."
-#define STRING_EDIT_UDA_MOD          "UDA {1} modificado."
-#define STRING_EDIT_UDA_DEL          "UDA {1} eliminado."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "El comando 'task <id> edit' le permite modificar todos los detalles de"
-#define STRING_EDIT_HEADER_2         "una tarea usando un editor de textos. Más abajo hay una representación"
-#define STRING_EDIT_HEADER_3         "de todos los detalles de la tarea. Modifique lo que desee y, cuando grabe"
-#define STRING_EDIT_HEADER_4         "y salga del editor, taskwarrior leerá este archivo, determinará qué ha"
-#define STRING_EDIT_HEADER_5         "cambiado, y aplicará esos cambios. Si sale del editor sin grabar o sin"
-#define STRING_EDIT_HEADER_6         "hacer modificaciones, taskwarrior no hará nada."
-
-#define STRING_EDIT_HEADER_7         "Las líneas que comienzan con # representan datos que no puede cambiar, como ID."
-#define STRING_EDIT_HEADER_8         "Si es demasiado creativo con sus modificaciones, taskwarrior le enviará de vuelta"
-#define STRING_EDIT_HEADER_9         "al editor para que lo intente de nuevo."
-
-#define STRING_EDIT_HEADER_10        "Si queda atrapado en un ciclo sin fin, volviendo a editar el mismo archivo"
-#define STRING_EDIT_HEADER_11        "una y otra vez, simplemente abandone el editor sin hacer ningún cambio."
-#define STRING_EDIT_HEADER_12        "Taskwarrior lo advertirá y detendrá el proceso."
-
-#define STRING_EDIT_HEADER_13        "Las anotaciones aparecen así: <date> -- <text> y puede haber cualquier número de ellas."
-#define STRING_EDIT_HEADER_14        "El separador ' -- ' entre la fecha y el campo de texto no debe ser eliminado."
-#define STRING_EDIT_HEADER_15        "La última es una \"entrada en blanco\" para añadir una anotación, si le conviene:"
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Error: "  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2e052e49a..ec44d4b97 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -491,53 +491,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_EDIT_USAGE        "Launches an editor to modify a task directly"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Aucunes modifications détectées."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Édition terminée."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Lancement de '{1}' maintenant..."
-#define STRING_EDIT_CHANGES          "Des modifications ont été détectées."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior n'a pas pu appliquer vos modifications.  Désirez-vous essayer à nouveau ?"
-#define STRING_EDIT_UNWRITABLE       "Votre dossier data.location n'est pas inscriptible."
-#define STRING_EDIT_TAG_SEP          "Séparez les étiquettes (tag) ainsi : tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Les dépendances devraient être une liste d'ID/UUID de tâches ou un interval d'ID, séparés par des virgules, sans espaces."
-#define STRING_EDIT_UDA_SEP          "Attributs définis par l'utilisateur"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Attributs orphelins définis par l'utilisateur"
-#define STRING_EDIT_END              "Fin"
-
-#define STRING_EDIT_PROJECT_MOD      "Projet modifié."
-#define STRING_EDIT_PROJECT_DEL      "Projet supprimé."
-#define STRING_EDIT_DESC_MOD         "Description modifiée."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Impossible de supprimer la description."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Impossible de supprimer la date de création."
-#define STRING_EDIT_ENTRY_MOD        "Date de création modifiée."
-#define STRING_EDIT_START_MOD        "Date de départ modifiée."
-#define STRING_EDIT_START_DEL        "Date de départ supprimée."
-#define STRING_EDIT_END_MOD          "Date de fin modifiée."
-#define STRING_EDIT_END_DEL          "Date de fin supprimée."
-#define STRING_EDIT_END_SET_ERR      "Impossible de régler une date de fin sur une tâche en cours."
-#define STRING_EDIT_SCHED_MOD        "Date prévue modifiée."
-#define STRING_EDIT_SCHED_DEL        "Date prévue supprimée."
-#define STRING_EDIT_DUE_MOD          "Échéance modifiée."
-#define STRING_EDIT_DUE_DEL          "Échéance supprimée."
-#define STRING_EDIT_DUE_DEL_ERR      "Impossible de retirer une échéance d'une tâche récurrente."
-#define STRING_EDIT_UNTIL_MOD        "Date jusqu'à modifiée."
-#define STRING_EDIT_UNTIL_DEL        "Date jusqu'à supprimée."
-#define STRING_EDIT_RECUR_MOD        "Récurrence modifiée."
-#define STRING_EDIT_RECUR_DEL        "Récurrence supprimée."
-#define STRING_EDIT_RECUR_DUE_ERR    "Une tâche récurrente doit avoir une date planifiée."
-#define STRING_EDIT_RECUR_ERR        "Durée de récurrence invalide."
-#define STRING_EDIT_WAIT_MOD         "Retardement modifié."
-#define STRING_EDIT_WAIT_DEL         "Retardement supprimé."
-#define STRING_EDIT_PARENT_MOD       "UUID parent modifié."
-#define STRING_EDIT_PARENT_DEL       "UUID parent supprimé."
-#define STRING_EDIT_UDA_MOD          "ADU {1} modifié."
-#define STRING_EDIT_UDA_DEL          "ADU {1} supprimé."
-
 // These four blocks can be replaced, but the number of lines must not change.
 #define STRING_EDIT_HEADER_1         "La commande 'task <id> edit' vous permet de modifier tous les aspects d'une tâche"
 #define STRING_EDIT_HEADER_2         "en utilisant un éditeur de texte. Ci-dessous sont listés toutes les caractéristiques de la tâche."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8d2aad3c6..389512f17 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -490,73 +490,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Festività"
 #define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
-#define STRING_CMD_EDIT_USAGE        "Esegue un editor per la modifica diretta di un task"
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Nessuna modifica riscontrata."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Modifica completa."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Esecuzione di  '{1}' ora..."
-#define STRING_EDIT_CHANGES          "Modifiche rilevate."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior non può gestire le modifiche. Provare di nuovo?"
-#define STRING_EDIT_UNWRITABLE       "La directory data.location non è scrivibile."
-#define STRING_EDIT_TAG_SEP          "Separare i tag con spazi; es.: tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Le dipendenze dovrebbero consistere in una lista separata da virgole di ID/UUID o intervalli di ID, senza spazi."
-#define STRING_EDIT_UDA_SEP          "User Defined Attribute"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "User Defined Attribute orfani"
-#define STRING_EDIT_END              "Fine"
-
-#define STRING_EDIT_PROJECT_MOD      "Progetto modificato."
-#define STRING_EDIT_PROJECT_DEL      "Progetto cancellato."
-#define STRING_EDIT_DESC_MOD         "Descrizione modificata."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Impossibile rimuovere la descrizione."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Impossibile rimuovere la data di creazione."
-#define STRING_EDIT_ENTRY_MOD        "Data di creazione modificata."
-#define STRING_EDIT_START_MOD        "Data di inizio modificata."
-#define STRING_EDIT_START_DEL        "Data di inizio rimossa."
-#define STRING_EDIT_END_MOD          "Data di fine modificata."
-#define STRING_EDIT_END_DEL          "Data di fine rimossa."
-#define STRING_EDIT_END_SET_ERR      "Impossibile impostare la data di chiusura del task pendente."
-#define STRING_EDIT_SCHED_MOD        "Data di schedulazione modificata."
-#define STRING_EDIT_SCHED_DEL        "Data di schedulazione rimossa."
-#define STRING_EDIT_DUE_MOD          "Scadenza modificata."
-#define STRING_EDIT_DUE_DEL          "Scadenza rimossa."
-#define STRING_EDIT_DUE_DEL_ERR      "Impossibile rimuovere la data di scadenza di un task periodico."
-#define STRING_EDIT_UNTIL_MOD        "Data 'Fino a' modificata."
-#define STRING_EDIT_UNTIL_DEL        "Data 'Fino a' rimossa."
-#define STRING_EDIT_RECUR_MOD        "Ricorrenza periodica modificata."
-#define STRING_EDIT_RECUR_DEL        "Ricorrenza periodica rimossa."
-#define STRING_EDIT_RECUR_DUE_ERR    "Un task periodico deve avere una data di scadenza."
-#define STRING_EDIT_RECUR_ERR        "Durata del task periodico non valida."
-#define STRING_EDIT_WAIT_MOD         "Data di attesa modificata."
-#define STRING_EDIT_WAIT_DEL         "Data di attesa rimossa."
-#define STRING_EDIT_PARENT_MOD       "UUID genitore modificato."
-#define STRING_EDIT_PARENT_DEL       "UUID genitore rimosso."
-#define STRING_EDIT_UDA_MOD          "UDA {1} modificato."
-#define STRING_EDIT_UDA_DEL          "UDA {1} cancellato."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "Il comando 'task <id> edit' permette di modificare ogni aspetto di un task"
-#define STRING_EDIT_HEADER_2         "utilizzando un editor di testo. Segue la rappresentazione dei dettagli di un task."
-#define STRING_EDIT_HEADER_3         "Modificare quanto desiderato, e quando si salva e si esce dall'editor,"
-#define STRING_EDIT_HEADER_4         "taskwarrior leggerà il file, determinando ciò che è cambiato, e applicherà"
-#define STRING_EDIT_HEADER_5         "le modifiche. Se si esce dall'editor senza salvare o effettuare"
-#define STRING_EDIT_HEADER_6         "modifiche, taskwarrior non farà alcunché."
-
-#define STRING_EDIT_HEADER_7         "Le linee che iniziano con # rappresentano dati che non possono essere modificati, come l'ID."
-#define STRING_EDIT_HEADER_8         "Se si è troppo creativi con le modifiche, taskwarrior aprirà"
-#define STRING_EDIT_HEADER_9         "nuovamente l'editor per un secondo tentativo."
-
-#define STRING_EDIT_HEADER_10        "Se ci si trova in un ciclo senza fine, continuando a editare lo stesso file,"
-#define STRING_EDIT_HEADER_11        "si chiuda semplicemente l'editor senza effettuare modifiche. Taskwarrior"
-#define STRING_EDIT_HEADER_12        "se ne accorgerà e terminerà l'editing."
-
-#define STRING_EDIT_HEADER_13        "Le annotazioni sono del tipo: <date> -- <text> e possono essere in numero arbitrario."
-#define STRING_EDIT_HEADER_14        "Il separatore ' -- ' tra la data e il campo di teso non dovrebbe essere rimosso."
-#define STRING_EDIT_HEADER_15        "Una linea preimpostata per aggiungere una annotazione è stata aggiunta per comodità."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Errore: "
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index d228610c5..2d61c82b0 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -491,73 +491,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
-#define STRING_CMD_EDIT_USAGE        "task を直接変更するためにエディタを起動します"
 #define STRING_CMD_CALC_USAGE        "電卓"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "No edits were detected."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Editing complete."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Launching '{1}' now..."
-#define STRING_EDIT_CHANGES          "Edits were detected."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior couldn't handle your edits.  Would you like to try again?"
-#define STRING_EDIT_UNWRITABLE       "Your data.location directory is not writable."
-#define STRING_EDIT_TAG_SEP          "Separate the tags with spaces, like this: tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Dependencies should be a comma-separated list of task IDs/UUIDs or ID ranges, with no spaces."
-#define STRING_EDIT_UDA_SEP          "User Defined Attributes"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "User Defined Attribute Orphans"
-#define STRING_EDIT_END              "End"
-
-#define STRING_EDIT_PROJECT_MOD      "Project modified."
-#define STRING_EDIT_PROJECT_DEL      "Project deleted."
-#define STRING_EDIT_DESC_MOD         "Description modified."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Cannot remove description."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Cannot remove creation date."
-#define STRING_EDIT_ENTRY_MOD        "Creation date modified."
-#define STRING_EDIT_START_MOD        "Start date modified."
-#define STRING_EDIT_START_DEL        "Start date removed."
-#define STRING_EDIT_END_MOD          "End date modified."
-#define STRING_EDIT_END_DEL          "End date removed."
-#define STRING_EDIT_END_SET_ERR      "Cannot set a done date on a pending task."
-#define STRING_EDIT_SCHED_MOD        "Scheduled date modified."
-#define STRING_EDIT_SCHED_DEL        "Scheduled date removed."
-#define STRING_EDIT_DUE_MOD          "Due date modified."
-#define STRING_EDIT_DUE_DEL          "Due date removed."
-#define STRING_EDIT_DUE_DEL_ERR      "Cannot remove a due date from a recurring task."
-#define STRING_EDIT_UNTIL_MOD        "Until date modified."
-#define STRING_EDIT_UNTIL_DEL        "Until date removed."
-#define STRING_EDIT_RECUR_MOD        "Recurrence modified."
-#define STRING_EDIT_RECUR_DEL        "Recurrence removed."
-#define STRING_EDIT_RECUR_DUE_ERR    "A recurring task must have a due date."
-#define STRING_EDIT_RECUR_ERR        "Not a valid recurrence duration."
-#define STRING_EDIT_WAIT_MOD         "Wait date modified."
-#define STRING_EDIT_WAIT_DEL         "Wait date removed."
-#define STRING_EDIT_PARENT_MOD       "Parent UUID modified."
-#define STRING_EDIT_PARENT_DEL       "Parent UUID removed."
-#define STRING_EDIT_UDA_MOD          "UDA {1} modified."
-#define STRING_EDIT_UDA_DEL          "UDA {1} deleted."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "The 'task <id> edit' command allows you to modify all aspects of a task"
-#define STRING_EDIT_HEADER_2         "using a text editor.  Below is a representation of all the task details."
-#define STRING_EDIT_HEADER_3         "Modify what you wish, and when you save and quit your editor,"
-#define STRING_EDIT_HEADER_4         "taskwarrior will read this file, determine what changed, and apply"
-#define STRING_EDIT_HEADER_5         "those changes.  If you exit your editor without saving or making"
-#define STRING_EDIT_HEADER_6         "modifications, taskwarrior will do nothing."
-
-#define STRING_EDIT_HEADER_7         "Lines that begin with # represent data you cannot change, like ID."
-#define STRING_EDIT_HEADER_8         "If you get too creative with your editing, taskwarrior will send you"
-#define STRING_EDIT_HEADER_9         "back to the editor to try again."
-
-#define STRING_EDIT_HEADER_10        "Should you find yourself in an endless loop, re-editing the same file,"
-#define STRING_EDIT_HEADER_11        "just quit the editor without making any changes.  Taskwarrior will"
-#define STRING_EDIT_HEADER_12        "notice this and stop the editing."
-
-#define STRING_EDIT_HEADER_13        "Annotations look like this: <date> -- <text> and there can be any number of them."
-#define STRING_EDIT_HEADER_14        "The ' -- ' separator between the date and text field should not be removed."
-#define STRING_EDIT_HEADER_15        "A \"blank slot\" for adding an annotation follows for your convenience."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "エラー: "
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0522bd22f..82dbe89c5 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -491,73 +491,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Wakacje"
 #define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
-#define STRING_CMD_EDIT_USAGE        "Uruchamia edytor do zmiany zadania"
 #define STRING_CMD_CALC_USAGE        "Kalkulator"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Nie znaleziono żadnych edycji."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Edycja zakończona."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "Uruchamianie '{1}'..."
-#define STRING_EDIT_CHANGES          "Zmiany wykryte."
-#define STRING_EDIT_UNPARSEABLE      "Taskwarrior nie może wprowadzić twoich zmian. Czy chcesz spróbować jeszcze raz?"
-#define STRING_EDIT_UNWRITABLE       "Brak możliwości zapisu do katalogu data.location"
-#define STRING_EDIT_TAG_SEP          "Rozdziel tagi białymi znakami, na przykład: tag1 tag2"
-#define STRING_EDIT_DEP_SEP          "Zależności powinny być elementami listy, rozdzielonymi przecinkami. Na listę składają się ID/UUID lub zakresy ID, bez spacji."
-#define STRING_EDIT_UDA_SEP          "Atrybuty definiowane przez użytkownika"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Atrybuty Orphan definiowane przez użytkownika"
-#define STRING_EDIT_END              "Koniec"
-
-#define STRING_EDIT_PROJECT_MOD      "Projekt zmieniony."
-#define STRING_EDIT_PROJECT_DEL      "Projekt usunięty."
-#define STRING_EDIT_DESC_MOD         "Opis zmieniony."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Nie można usunąć opisu."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Nie można usunąć daty utworzenia."
-#define STRING_EDIT_ENTRY_MOD        "Data utworzenia zmieniona."
-#define STRING_EDIT_START_MOD        "Data startu zmieniona."
-#define STRING_EDIT_START_DEL        "Data startu usunięta."
-#define STRING_EDIT_END_MOD          "Data zakończenia zmieniona."
-#define STRING_EDIT_END_DEL          "Data zakończenia usunięta."
-#define STRING_EDIT_END_SET_ERR      "Nie można ustawić daty ukończenia na zadaniu oczekującym."
-#define STRING_EDIT_SCHED_MOD        "Harmonogram zmieniony."
-#define STRING_EDIT_SCHED_DEL        "Harmonogram usunięty."
-#define STRING_EDIT_DUE_MOD          "Termin zmieniony."
-#define STRING_EDIT_DUE_DEL          "Termin usunięty."
-#define STRING_EDIT_DUE_DEL_ERR      "Nie można usunąć terminu z zadanie rekurencyjnego."
-#define STRING_EDIT_UNTIL_MOD        "Data końcowa zmieniona."
-#define STRING_EDIT_UNTIL_DEL        "Data końcowa usunięta."
-#define STRING_EDIT_RECUR_MOD        "Rekurencja zmieniona."
-#define STRING_EDIT_RECUR_DEL        "Rekurencja usunięta."
-#define STRING_EDIT_RECUR_DUE_ERR    "Zadanie rekurencyjne musi posiadać termin."
-#define STRING_EDIT_RECUR_ERR        "Nie poprawny termin zadania rekurencyjnego."
-#define STRING_EDIT_WAIT_MOD         "Data oczekiwania zmieniona."
-#define STRING_EDIT_WAIT_DEL         "Data oczekiwania usunięta."
-#define STRING_EDIT_PARENT_MOD       "UUID rodzica zmieniony."
-#define STRING_EDIT_PARENT_DEL       "UUID rodzica usunięty."
-#define STRING_EDIT_UDA_MOD          "UDA {1} zmieniony."
-#define STRING_EDIT_UDA_DEL          "UDA {1} usunięty."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "Polecenie 'task <id> edit' pozwala Ci na modyfikację wszystkich aspektów zadania"
-#define STRING_EDIT_HEADER_2         "za pomocą edytora.  Poniżej przedstawiono reprezentację właściwości zadania."
-#define STRING_EDIT_HEADER_3         "Zmodyfikuj co tylko chcesz a następnie zapisz i zamknij edytor,"
-#define STRING_EDIT_HEADER_4         "taskwarrior odczyta plik, odnajdzie modyfikacje, a następnie zastosuje"
-#define STRING_EDIT_HEADER_5         "te zmiany.  Jeśli zamkniesz edytor bez zapisywania zmian lub ich nie zrobisz,"
-#define STRING_EDIT_HEADER_6         "taskwarrior nie podejmie żadych działań."
-
-#define STRING_EDIT_HEADER_7         "Linie zaczynające się od # oznaczają dane których nie możesz zmieniać, np. ID"
-#define STRING_EDIT_HEADER_8         "Jeśli będziesz zbyt kreatywny przy edycji, taskwarrior odeśle Cię"
-#define STRING_EDIT_HEADER_9         "zpowrotem do edytora abyś spróbował jeszcze raz."
-
-#define STRING_EDIT_HEADER_10        "Jeśli zapętlisz się przy edycji tego samego pliku, poprostu zamknij"
-#define STRING_EDIT_HEADER_11        "edytor bez dokonywania zmian.  Taskwarrior rozpozna to i przerwie"
-#define STRING_EDIT_HEADER_12        "edycję."
-
-#define STRING_EDIT_HEADER_13        "Notatki wyglądają tak: <data> -- <tekst> i może ich być dowolna ilość."
-#define STRING_EDIT_HEADER_14        "Separator ' -- ' pomiędzy datą a tekstem nie powinien być pominięty."
-#define STRING_EDIT_HEADER_15        "Pusty slot poniżej został dodany dla Twojej wygody."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Błąd: "
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f82fc3d9f..84db97afe 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -491,73 +491,8 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Feriado"
 #define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
-#define STRING_CMD_EDIT_USAGE        "Inicia um editor externo para modificar a tarefa diretamente"
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// edit
-#define STRING_EDIT_NO_CHANGES       "Não foram detetadas alterações."
-#define STRING_EDIT_FAILED           "Editing failed with exit code {1}."
-#define STRING_EDIT_COMPLETE         "Edição concluída."
-#define STRING_EDIT_IN_PROGRESS      "Task is already being edited."
-#define STRING_EDIT_LAUNCHING        "A iniciar '{1}' ..."
-#define STRING_EDIT_CHANGES          "Alterações detetadas."
-#define STRING_EDIT_UNPARSEABLE      "O taskwarrior não conseguiu processar as suas alterações. Deseja tentar novamente?"
-#define STRING_EDIT_UNWRITABLE       "Não é possível escrever no diretório indicado por data.location."
-#define STRING_EDIT_TAG_SEP          "Separe as marcas com espaços, por exemplo: marca1 marca2"
-#define STRING_EDIT_DEP_SEP          "As dependências deverão ser uma lista de IDs/UUIDs ou intervalos de IDs, sem espaços e separados por vírgulas."
-#define STRING_EDIT_UDA_SEP          "Atributos Definidos pelo Utilizador (UDAs)"
-#define STRING_EDIT_UDA_ORPHAN_SEP   "Atributos Orfãos Definidos pelo Utilizador"
-#define STRING_EDIT_END              "Fim"
-
-#define STRING_EDIT_PROJECT_MOD      "Projeto modificado."
-#define STRING_EDIT_PROJECT_DEL      "Projeto removido."
-#define STRING_EDIT_DESC_MOD         "Descrição modificada."
-#define STRING_EDIT_DESC_REMOVE_ERR  "Não é possível remover a descrição."
-#define STRING_EDIT_ENTRY_REMOVE_ERR "Não é possível remover a data de criação."
-#define STRING_EDIT_ENTRY_MOD        "Data de criação modificada."
-#define STRING_EDIT_START_MOD        "Data de início modificada."
-#define STRING_EDIT_START_DEL        "Data de início removida."
-#define STRING_EDIT_END_MOD          "Data de conclusão modificada."
-#define STRING_EDIT_END_DEL          "Data de conclusão removida."
-#define STRING_EDIT_END_SET_ERR      "Não é possível adicionar uma data de conclusão a uma tarefa pendente."
-#define STRING_EDIT_SCHED_MOD        "Data de agendamento modificada."
-#define STRING_EDIT_SCHED_DEL        "Data de agendamento removida."
-#define STRING_EDIT_DUE_MOD          "Data de vencimento modificada."
-#define STRING_EDIT_DUE_DEL          "Data de vencimento removida."
-#define STRING_EDIT_DUE_DEL_ERR      "Não é possível remover a data de vencimento de uma tarefa recorrente."
-#define STRING_EDIT_UNTIL_MOD        "Data 'até' modificada."
-#define STRING_EDIT_UNTIL_DEL        "Data 'até' removida."
-#define STRING_EDIT_RECUR_MOD        "Recorrência modificada."
-#define STRING_EDIT_RECUR_DEL        "Recorrência removida."
-#define STRING_EDIT_RECUR_DUE_ERR    "É obrigatório que tarefas recorrentes tenham uma data de vencimento."
-#define STRING_EDIT_RECUR_ERR        "Duração de recorrência inválida."
-#define STRING_EDIT_WAIT_MOD         "Data de espera modificada."
-#define STRING_EDIT_WAIT_DEL         "Data de espera removida."
-#define STRING_EDIT_PARENT_MOD       "UUID mãe modificado."
-#define STRING_EDIT_PARENT_DEL       "UUID mãe removido."
-#define STRING_EDIT_UDA_MOD          "UDA {1} modificado."
-#define STRING_EDIT_UDA_DEL          "UDA {1} eliminado."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "O comando 'task <id> edit' permite modificar todos os aspetos de uma tarefa"
-#define STRING_EDIT_HEADER_2         "usando um editor de texto. Por baixo segue uma representação de todos os"
-#define STRING_EDIT_HEADER_3         "detalhes da tarefa. Modifique o que deseja, e quando guardar e sair do seu"
-#define STRING_EDIT_HEADER_4         "editor, o taskwarrior irá ler este ficheiro, identificar as alterações e"
-#define STRING_EDIT_HEADER_5         "aplicá-las. Se sair do editor sem guardar ou fazer alterações, o taskwarrior"
-#define STRING_EDIT_HEADER_6         "não irá fazer nada."
-
-#define STRING_EDIT_HEADER_7         "Linhas começadas por # representam dados que não podem ser alterados, como ID."
-#define STRING_EDIT_HEADER_8         "Se for demasiado criativo com a edição, o taskwarrior enviá-lo-à de volta"
-#define STRING_EDIT_HEADER_9         "para o editor para corrigir eventuais erros."
-
-#define STRING_EDIT_HEADER_10        "Caso este comportamento o atire para um ciclo infinito de re-edição do mesmo"
-#define STRING_EDIT_HEADER_11        "ficheiro, apenas saia do editor sem fazer quaisquer alterações. O taskwarrior"
-#define STRING_EDIT_HEADER_12        "irá ter isso em conta e interrompe a edição."
-
-#define STRING_EDIT_HEADER_13        "As anotações são: <data> -- <texto> e pode haver um número variável das mesmas."
-#define STRING_EDIT_HEADER_14        "O separador ' -- ' entre os campos data e texto deverá ser mantido."
-#define STRING_EDIT_HEADER_15        "Segue-se uma \"linha em branco\" onde adicionar anotações para sua conveniência."
-
 // Errors
 // TODO Move each of these to appropriate section.
 #define STRING_ERROR_PREFIX          "Erro: "

From e2ffcbd3d6cffa3a685edec9ed0f3980bfe5c050 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:46:39 -0500
Subject: [PATCH 611/879] l10n: Eliminated STRING_PARSER_*

---
 src/CLI2.cpp       | 12 ++++++------
 src/l10n/deu-DEU.h |  8 --------
 src/l10n/eng-USA.h |  8 --------
 src/l10n/epo-RUS.h |  8 --------
 src/l10n/esp-ESP.h |  8 --------
 src/l10n/fra-FRA.h |  8 --------
 src/l10n/ita-ITA.h |  8 --------
 src/l10n/jpn-JPN.h |  8 --------
 src/l10n/pol-POL.h |  8 --------
 src/l10n/por-PRT.h |  8 --------
 10 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index ff7e5bca8..7a59f8154 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -236,7 +236,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc
       if (last_slash != std::string::npos)
         home = rc.parent ();
 
-      context.header (format (STRING_PARSER_ALTERNATE_RC, rc._data));
+      context.header (format ("Using alternate .taskrc file {1}", rc._data));
 
       // Keep looping, because if there are multiple rc:file arguments, the last
       // one should dominate.
@@ -263,7 +263,7 @@ void CLI2::getDataLocation (int argc, const char** argv, Path& data)
         raw.substr (0, 16) == "rc.data.location")
     {
       data = Directory (raw.substr (17));
-      context.header (format (STRING_PARSER_ALTERNATE_DATA, (std::string) data));
+      context.header (format ("Using alternate data.location {1}", (std::string) data));
 
       // Keep looping, because if there are multiple rc:file arguments, the last
       // one should dominate.
@@ -301,7 +301,7 @@ void CLI2::applyOverrides (int argc, const char** argv)
         context.config.set (name, value);
 
         if (context.verbose("override"))
-          context.footnote (format (STRING_PARSER_OVERRIDE_RC, name, value));
+          context.footnote (format ("Configuration override rc.{1}:{2}", name, value));
       }
     }
   }
@@ -855,7 +855,7 @@ void CLI2::aliasExpansion ()
   while (action && counter++ < safetyValveDefault);
 
   if (counter >= safetyValveDefault)
-    context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault));
+    context.debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
 
   if (changes &&
       context.config.getInteger ("debug.parser") >= 2)
@@ -945,7 +945,7 @@ void CLI2::categorizeArgs ()
              ! cmd->accepts_miscellaneous ())
     {
       // No commands were expected --> error.
-      throw format (STRING_PARSER_UNEXPECTED_ARG, command, a.attribute ("raw"));
+      throw format ("The '{1}' command does not allow '{2}'.", command, a.attribute ("raw"));
     }
     else if (cmd                             &&
              ! cmd->accepts_filter ()        &&
@@ -1367,7 +1367,7 @@ void CLI2::desugarFilterAttributes ()
 #endif
         }
         else
-          throw format (STRING_PARSER_UNKNOWN_ATTMOD, mod);
+          throw format ("Error: unrecognized attribute modifier '{1}'.", mod);
 
         reconstructed.push_back (lhs);
         reconstructed.push_back (op);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d299c0ed7..4bc8f4a0b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Deutsche Übersetzung"
 #define STRING_LOCALIZATION_AUTHOR   "Ins Deutsche übersetzt von Jens Erat."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Maximale Alias-Schachteltiefe von {1} erreicht."
-#define STRING_PARSER_OVERRIDE_RC    "Konfigurations außer Kraft gesetzt durch: rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Fehler: Nicht erkannter Attribut-Operator '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Verwende alternative .taskrc-Datei {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Verwende alternative data.location {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Spaltenname '{1}' nicht erkannt."
 #define STRING_COLUMN_BAD_FORMAT     "Spaltenformat '{1}.{2}' nicht erkannt"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ee9016593..1642aaecb 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "English localization"
 #define STRING_LOCALIZATION_AUTHOR   "Translated into English by A. Person."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Nested alias limit of {1} reached."
-#define STRING_PARSER_OVERRIDE_RC    "Configuration override rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Error: unrecognized attribute modifier '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Using alternate .taskrc file {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Using alternate data.location {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Unrecognized column name '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Unrecognized column format '{1}.{2}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e672af313..4dab698e6 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "— Esperanta lokalaĵo"
 #define STRING_LOCALIZATION_AUTHOR   "Tradukita al la Internacia Lingvo per Jeremy John Reeder"
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Atingis la limon de {1} nest-niveloj de alinomoj."
-#define STRING_PARSER_OVERRIDE_RC    "Agorda superrego rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Eraro: nekonata atributa modifanto '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Uzanta alterna .taskrc-dosiero {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Uzanta alterna data.location {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nekonata kolumna nomo '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nekonata kolumna formiĝo '{1}.{2}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index bfb8502a5..dd6231b8f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "- localización española"
 #define STRING_LOCALIZATION_AUTHOR   "Traducido al español por Fidel Mato y Jeremy John Reeder."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Límite de alias anidados ({1}) alcanzado."
-#define STRING_PARSER_OVERRIDE_RC    "Sobrescritura de configuración rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Error: modificador de atributo no reconocido '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Usando el archivo .taskrc alternativo {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "El comando '{1}' no permite '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nombre de columna no reconocido '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de columna no reconocido '{1}.{2}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index ec44d4b97..28cc7f928 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Traduction française"
 #define STRING_LOCALIZATION_AUTHOR   "Traduit en français par Leowzukw et Jeremy John Reeder."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Atteignit la limite d'amboîtage des pseudonymes, {1}."
-#define STRING_PARSER_OVERRIDE_RC    "Configuration écrasée : rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Erreur : attribut de modification non reconnu '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Utilise un fichier .taskrc alternatif : {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Utilise une data.location alternative : {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nom de colonne non reconnu '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Format de colonne non reconnu '{1}.{2}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 389512f17..9aa7f0b3f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Traduzione in Italiano"
 #define STRING_LOCALIZATION_AUTHOR   "Tradotto in Italiano da Tullio Facchinetti."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Nested alias limit of {1} reached."
-#define STRING_PARSER_OVERRIDE_RC    "Modifica configurazione rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Errore: modificatore di attributo non riconosciuto '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Uso del file .taskrc alternativo {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Uso di data.location alternativa {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome di colonna '{1}' non riconosciuto."
 #define STRING_COLUMN_BAD_FORMAT     "Formato di colonna '{1}.{2}' non riconosciuto"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 2d61c82b0..ad854db02 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Japanese localization"
 #define STRING_LOCALIZATION_AUTHOR   "Translated into Japanese by Oota Toshiya."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "ネストされたエイリアスの制限 {1} に到達した。"
-#define STRING_PARSER_OVERRIDE_RC    "設定は上書きされた rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "エラー: 不明な属性変更子 '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "代替の .taskrc ファイル {1} を使用"
-#define STRING_PARSER_ALTERNATE_DATA "代替の data.location {1} を使用"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "認識できないカラム名 '{1}'。"
 #define STRING_COLUMN_BAD_FORMAT     "認識出来ないカラム形式 '{1}.{2}'"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 82dbe89c5..8b04e8ab2 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Tłumaczenie polskie"
 #define STRING_LOCALIZATION_AUTHOR   "Przetłumaczył na język polski Ł. Panek."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Limit {1} zagnieżdżonych aliasów osiągnięty"
-#define STRING_PARSER_OVERRIDE_RC    "Nadpisanie konfiguracji rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Błąd: nierozpoznany atrybut '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Wczytanie alternatywnego pliku .taskrc {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Alternatywne data.location {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nierozpoznano nazwy kolumny '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nierozpoznano formatu kolumny '{1}.{2}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 84db97afe..c6b5fce80 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -36,14 +36,6 @@
 #define STRING_LOCALIZATION_DESC     "Tradução em Português"
 #define STRING_LOCALIZATION_AUTHOR   "Traduzido para Português por Renato Alves."
 
-// Parser
-#define STRING_PARSER_ALIAS_NEST     "Limite de 'alias' em cascata atingido: {1}"
-#define STRING_PARSER_OVERRIDE_RC    "Alteração de configuração rc.{1}:{2}"
-#define STRING_PARSER_UNKNOWN_ATTMOD "Erro: modificador de atributo não reconhecido '{1}'."
-#define STRING_PARSER_ALTERNATE_RC   "Usando o ficheiro .taskrc alternativo {1}"
-#define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"
-#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome de coluna '{1}' não reconhecido."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de coluna '{1}.{2}' não reconhecido"

From f27ddea0138fb9fc73eb73ca5356ac1f28216878 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:50:10 -0500
Subject: [PATCH 612/879] l10n: Eliminated STRING_ERROR_PREFIX

---
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 9 files changed, 9 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4bc8f4a0b..57d8c9e80 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Fehler: "
 #define STRING_TRIVIAL_INPUT         "Sie müssen einen Befehl oder eine Aufgabe zum ändern angeben."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1642aaecb..699afe5b7 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Error: "
 #define STRING_TRIVIAL_INPUT         "You must specify a command or a task to modify."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4dab698e6..8a15fb7a0 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Eraro: "
 #define STRING_TRIVIAL_INPUT         "Oni devas specifi komandon, aŭ taskon ke vi volas modifi."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index dd6231b8f..f23bb8f60 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -497,7 +497,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Error: "  // |esp-ESP|==|eng-USA|
 #define STRING_TRIVIAL_INPUT         "Debe especificar un comando o una tarea a modificar."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 28cc7f928..f05a03d16 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -507,7 +507,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Erreur : "
 #define STRING_TRIVIAL_INPUT         "Il vous faut spécifier une commande ou une tâche à modifier."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 9aa7f0b3f..e5da2ce67 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -486,7 +486,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Errore: "
 #define STRING_TRIVIAL_INPUT         "Specificare un comando o un task da modificare"
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ad854db02..ba529a239 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "エラー: "
 #define STRING_TRIVIAL_INPUT         "変更したいコマンドまたはタスクを指定しなければなりません。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 8b04e8ab2..f2feef34b 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Błąd: "
 #define STRING_TRIVIAL_INPUT         "Musisz podać polecenie lub zadanie do zmiany."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c6b5fce80..a041c937d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_PREFIX          "Erro: "
 #define STRING_TRIVIAL_INPUT         "Deve específicar um comando ou a tarefa a modificar."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."

From a432cec4682a996d9553782527b92ce6b549573a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:52:41 -0500
Subject: [PATCH 613/879] l10n: Eliminated STRING_TRIVIAL_INPUT

---
 src/CLI2.cpp       | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 7a59f8154..d8f383e0d 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -534,7 +534,7 @@ void CLI2::analyze ()
   {
     defaultCommand ();
     if (! findCommand ())
-      throw std::string (STRING_TRIVIAL_INPUT);
+      throw std::string ("You must specify a command or a task to modify.");
   }
 
   demotion ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 57d8c9e80..cf5ba4f9d 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Sie müssen einen Befehl oder eine Aufgabe zum ändern angeben."
 #define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 699afe5b7..f4dc76361 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "You must specify a command or a task to modify."
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 8a15fb7a0..b72d573ed 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Oni devas specifi komandon, aŭ taskon ke vi volas modifi."
 #define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index f23bb8f60..e5b969621 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -497,7 +497,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Debe especificar un comando o una tarea a modificar."
 #define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f05a03d16..878549618 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -507,7 +507,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Il vous faut spécifier une commande ou une tâche à modifier."
 #define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index e5da2ce67..242032669 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -486,7 +486,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Specificare un comando o un task da modificare"
 #define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ba529a239..d89abce94 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "変更したいコマンドまたはタスクを指定しなければなりません。"
 #define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f2feef34b..01255dc5d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Musisz podać polecenie lub zadanie do zmiany."
 #define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a041c937d..af981a658 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_TRIVIAL_INPUT         "Deve específicar um comando ou a tarefa a modificar."
 #define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."

From 92ecc4d7fdb068bde07aeb8f9a9db868685d6ad8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:55:34 -0500
Subject: [PATCH 614/879] l10n: Eliminated STRING_INFINITE_LOOP

---
 src/Task.cpp       | 2 ++
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index dedda1ce1..774d2bbf8 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -58,6 +58,8 @@
 #include <Variant.h>
 #include <Filter.h>
 
+#define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
+
 #define APPROACHING_INFINITY 1000   // Close enough.  This isn't rocket surgery.
 
 extern Context context;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index cf5ba4f9d..5ff674be3 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen."
 #define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f4dc76361..573c6f8ef 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index b72d573ed..5e69bf147 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -485,7 +485,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton."
 #define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e5b969621..53f0d54a1 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -497,7 +497,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno."
 #define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 878549618..b8d1e231c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -507,7 +507,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 242032669..0b046657d 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -486,7 +486,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito"
 #define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index d89abce94..c559c8a2d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 #define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 01255dc5d..33a5aef43 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem."
 #define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index af981a658..486612a89 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -487,7 +487,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INFINITE_LOOP         "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos."
 #define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."

From 977e2a3c35bbfd5eedec31f37b8caff1f265fd64 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 13:57:44 -0500
Subject: [PATCH 615/879] l10n: Eliminated STRING_ERROR_BAD_STATUS

---
 src/Task.cpp       | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 774d2bbf8..8981bb6c7 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -152,7 +152,7 @@ Task::status Task::textToStatus (const std::string& input)
   else if (input[0] == 'r') return Task::recurring;
   else if (input[0] == 'w') return Task::waiting;
 
-  throw format (STRING_ERROR_BAD_STATUS, input);
+  throw format ("The status '{1}' is not valid.", input);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 5ff674be3..f1a4fd0ea 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -490,7 +490,6 @@
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 573c6f8ef..f0d5a81f0 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -487,7 +487,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 5e69bf147..7db745731 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -490,7 +490,6 @@
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 53f0d54a1..ff639b8e2 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -502,7 +502,6 @@
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
-#define STRING_ERROR_BAD_STATUS      "El estatus '{1}' no es válido."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b8d1e231c..54e1613ee 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -512,7 +512,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0b046657d..97f2d9fac 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -491,7 +491,6 @@
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index c559c8a2d..178ff9fa0 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -492,7 +492,6 @@
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 33a5aef43..68ab10a08 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -492,7 +492,6 @@
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 486612a89..4906f6f60 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -492,7 +492,6 @@
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-#define STRING_ERROR_BAD_STATUS      "The status '{1}' is not valid."
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."

From e1fda181641217e3a188d88f9faef22345886dd9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:07:07 -0500
Subject: [PATCH 616/879] l10n: Eliminated STRING_HELPER_PROJECT_*

---
 src/feedback.cpp   | 8 ++++----
 src/l10n/deu-DEU.h | 6 ------
 src/l10n/eng-USA.h | 6 ------
 src/l10n/epo-RUS.h | 6 ------
 src/l10n/esp-ESP.h | 6 ------
 src/l10n/fra-FRA.h | 6 ------
 src/l10n/ita-ITA.h | 6 ------
 src/l10n/jpn-JPN.h | 6 ------
 src/l10n/pol-POL.h | 6 ------
 src/l10n/por-PRT.h | 6 ------
 10 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/src/feedback.cpp b/src/feedback.cpp
index b1ce7f688..24469a220 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -434,7 +434,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
   if (project != "")
   {
     if (scope)
-      msg << format (STRING_HELPER_PROJECT_CHANGE, project)
+      msg << format ("The project '{1}' has changed.", project)
           << "  ";
 
     // Count pending and done tasks, for this project.
@@ -457,13 +457,13 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
     else
       percentage = (count_done * 100 / (count_done + count_pending));
 
-    msg << format (STRING_HELPER_PROJECT_COMPL, project, percentage)
+    msg << format ("Project '{1}' is {2}% complete", project, percentage)
         << ' ';
 
     if (count_pending == 1 && count_done == 0)
-      msg << format (STRING_HELPER_PROJECT_REM1, count_pending);
+      msg << format ("({1} task remaining).", count_pending);
     else
-      msg << format (STRING_HELPER_PROJECT_REM, count_pending, count_pending + count_done);
+      msg << format ("({1} of {2} tasks remaining).", count_pending, count_pending + count_done);
   }
 
   return msg.str ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index f1a4fd0ea..01e56c88c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -524,12 +524,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 #define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Zeigt alle Konfigurations-Optionen oder eine Teilmenge davon"
 #define STRING_CMD_SHOW_ARGS         "Sie müssen 'all' oder ein Suchwort angeben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f0d5a81f0..1beed718f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -521,12 +521,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7db745731..7e1b5970c 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -524,12 +524,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 #define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Montras ĉian agordan variablon, aŭ subaron"
 #define STRING_CMD_SHOW_ARGS         "Oni sole povas specifi 'all' aŭ serĉĉenon."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ff639b8e2..3527f9e4e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -536,12 +536,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
 #define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."
-#define STRING_HELPER_PROJECT_COMPL  "El proyecto '{1}' está completado en un {2}%"
-#define STRING_HELPER_PROJECT_REM    "({1} de {2} tareas restantes)."
-#define STRING_HELPER_PROJECT_REM1   "({1} tarea restante)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Muestra todas las variables de configuración o un subconjunto"
 #define STRING_CMD_SHOW_ARGS         "Solo puede especificar 'all' o un término de búsqueda."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 54e1613ee..0f28e603a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -546,12 +546,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
 #define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 97f2d9fac..c1a0c9d0a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -525,12 +525,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
-#define STRING_HELPER_PROJECT_COMPL  "Il progetto '{1}' è {2}% completo"
-#define STRING_HELPER_PROJECT_REM    "({1} di {2} task rimanenti)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra i sottoinsiemi di variabili di configurazione"
 #define STRING_CMD_SHOW_ARGS         "Solo 'all' può essere specificata come stringa di ricerca."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 178ff9fa0..944ddcde0 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -526,12 +526,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 68ab10a08..7a3ce6bf2 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -526,12 +526,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 #define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Pokazuje wszystkie zmienne konfiguracji lub ich podzbiór"
 #define STRING_CMD_SHOW_ARGS         "Możesz jedynie wybrać wszystkie lub wyszukać na podstawie ciągu."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 4906f6f60..c006acad0 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -526,12 +526,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
 #define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra todas ou um subconjunto das variáveis de configuração"
 #define STRING_CMD_SHOW_ARGS         "Apenas pode específicar 'all' ou uma expressão a procurar."

From 1857882d9ea531aafa22ebb376f3174d79914d68 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:10:45 -0500
Subject: [PATCH 617/879] l10n: Eliminated STRING_CMD_COLUMNS_*

---
 src/commands/CmdColumns.cpp | 9 +++++----
 src/l10n/deu-DEU.h          | 5 -----
 src/l10n/eng-USA.h          | 5 -----
 src/l10n/epo-RUS.h          | 5 -----
 src/l10n/esp-ESP.h          | 5 -----
 src/l10n/fra-FRA.h          | 5 -----
 src/l10n/ita-ITA.h          | 5 -----
 src/l10n/jpn-JPN.h          | 5 -----
 src/l10n/pol-POL.h          | 5 -----
 src/l10n/por-PRT.h          | 5 -----
 10 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index ef923f96e..6cbf4935b 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -35,6 +35,8 @@
 #include <i18n.h>
 #include <main.h>
 
+#define STRING_CMD_COLUMNS_USAGE     "All supported columns and formatting styles"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -60,7 +62,7 @@ int CmdColumns::execute (std::string& output)
   // have already been handled.
   auto words = context.cli2.getWords ();
   if (words.size () > 1)
-    throw std::string (STRING_CMD_COLUMNS_ARGS);
+    throw std::string ("You can only specify one search string.");
 
   // Include all columns in the table.
   std::vector <std::string> names;
@@ -112,8 +114,7 @@ int CmdColumns::execute (std::string& output)
   output = optionalBlankLine ()
          + formats.render ()
          + '\n'
-         + STRING_CMD_COLUMNS_NOTE
-         + '\n';
+         + "* Means default format, and therefore optional.  For example, 'due' and 'due.formatted' are equivalent.\n";
 
   return 0;
 }
@@ -123,7 +124,7 @@ CmdCompletionColumns::CmdCompletionColumns ()
 {
   _keyword               = "_columns";
   _usage                 = "task          _columns";
-  _description           = STRING_CMD_COLUMNS_USAGE2;
+  _description           = "Displays only a list of supported columns";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 01e56c88c..477f97f9d 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -313,11 +313,6 @@
 #define STRING_CMD_ANNO_1            "{1} Aufgabe kommentiert."
 #define STRING_CMD_ANNO_N            "{1} Aufgaben kommentiert."
 
-#define STRING_CMD_COLUMNS_USAGE     "Alle unterstützten Spalten und Darstellungsoptionen"
-#define STRING_CMD_COLUMNS_NOTE      "* kennzeichnet das Standardformat, und ist daher optional.  Zum Beispiel sind 'due' und 'due.formatted' gleichwertig."
-#define STRING_CMD_COLUMNS_USAGE2    "Zeigt ausschließlich eine Liste der unterstützten Spalten"
-#define STRING_CMD_COLUMNS_ARGS      "Es darf nur ein Suchwort angegeben werden."
-
 #define STRING_CMD_DENO_USAGE        "Löscht einen Kommentar"
 #define STRING_CMD_DENO_NONE         "Die gewählte Aufgabe hat keine Kommentare, welche gelöscht werden können."
 #define STRING_CMD_DENO_CONFIRM      "Kommentar in Aufgabe {1} '{2}' löschen?"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1beed718f..8475dcb8a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -310,11 +310,6 @@
 #define STRING_CMD_ANNO_1            "Annotated {1} task."
 #define STRING_CMD_ANNO_N            "Annotated {1} tasks."
 
-#define STRING_CMD_COLUMNS_USAGE     "All supported columns and formatting styles"
-#define STRING_CMD_COLUMNS_NOTE      "* Means default format, and therefore optional.  For example, 'due' and 'due.formatted' are equivalent."
-#define STRING_CMD_COLUMNS_USAGE2    "Displays only a list of supported columns"
-#define STRING_CMD_COLUMNS_ARGS      "You can only specify one search string."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
 #define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7e1b5970c..40aa1dc2c 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -313,11 +313,6 @@
 #define STRING_CMD_ANNO_1            "Komentis {1} taskon."
 #define STRING_CMD_ANNO_N            "Komentis {1} taskojn."
 
-#define STRING_CMD_COLUMNS_USAGE     "Ĉia kolumno kaj stilo subtenata"
-#define STRING_CMD_COLUMNS_NOTE      "* Signifas defaŭltan stilon, do ne estas deviga.  Ekzemple, 'due' estas identa kun 'due.formatted'."
-#define STRING_CMD_COLUMNS_USAGE2    "Montras liston sole de subtenataj kolumnoj"
-#define STRING_CMD_COLUMNS_ARGS      "Oni ne povas specifi plu de unu serĉĉenon."
-
 #define STRING_CMD_DENO_USAGE        "Viŝas komenton"
 #define STRING_CMD_DENO_NONE         "La specifita tasko ne havas nenian viŝeblan komenton."
 #define STRING_CMD_DENO_CONFIRM      "Malkomenti taskon {1} '{2}'?"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 3527f9e4e..9b3c753d6 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -322,11 +322,6 @@
 #define STRING_CMD_ANNO_1            "Anotada {1} tarea."
 #define STRING_CMD_ANNO_N            "Anotadas {1} tareas."
 
-#define STRING_CMD_COLUMNS_USAGE     "Todas las columnas y estilos de formato soportados"
-#define STRING_CMD_COLUMNS_NOTE      "* Significa formato por defecto, y por lo tanto opcional. Por ejemplo 'due' y 'due.formatted' son equivalentes."
-#define STRING_CMD_COLUMNS_USAGE2    "Muestra una lista de columnas (solo nombres) soportadas"
-#define STRING_CMD_COLUMNS_ARGS      "Solo puede especificar un término de búsqueda."
-
 #define STRING_CMD_DENO_USAGE        "Elimina una anotación"
 #define STRING_CMD_DENO_NONE         "La tarea especificada no tiene anotaciones que puedan ser eliminadas."
 #define STRING_CMD_DENO_CONFIRM      "¿Desanotar la tarea {1} '{2}'?"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 0f28e603a..63e77b398 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -315,11 +315,6 @@
 #define STRING_CMD_ANNO_1            "Annotated {1} task."
 #define STRING_CMD_ANNO_N            "Annotated {1} tasks."
 
-#define STRING_CMD_COLUMNS_USAGE     "All supported columns and formatting styles"
-#define STRING_CMD_COLUMNS_NOTE      "* Means default format, and therefore optional.  For example, 'due' and 'due.formatted' are equivalent."
-#define STRING_CMD_COLUMNS_USAGE2    "Displays only a list of supported columns"
-#define STRING_CMD_COLUMNS_ARGS      "You can only specify one search string."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
 #define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index c1a0c9d0a..a7195368a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -314,11 +314,6 @@
 #define STRING_CMD_ANNO_1            "Aggiunta al task {1}."
 #define STRING_CMD_ANNO_N            "Aggiunte ai task {1}."
 
-#define STRING_CMD_COLUMNS_USAGE     "Tutte le colonne e gli stili di formattazione"
-#define STRING_CMD_COLUMNS_NOTE      "* significa formato di default, quindi opzionale. Per esempio, 'due' e 'due.formatted' sono equivalenti."
-#define STRING_CMD_COLUMNS_USAGE2    "Mostra solo una lista delle colonne supportate"
-#define STRING_CMD_COLUMNS_ARGS      "Può essere specificata solo una stringa di ricerca."
-
 #define STRING_CMD_DENO_USAGE        "Cancella una annotazione"
 #define STRING_CMD_DENO_NONE         "Il task specificato non ha annotazioni che possano essere cancellate."
 #define STRING_CMD_DENO_CONFIRM      "Denotare il task {1} '{2}'?"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 944ddcde0..ead6f5e44 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -315,11 +315,6 @@
 #define STRING_CMD_ANNO_1            "{1} task に注釈付加."
 #define STRING_CMD_ANNO_N            "{1} task に注釈付加."
 
-#define STRING_CMD_COLUMNS_USAGE     "All supported columns and formatting styles"
-#define STRING_CMD_COLUMNS_NOTE      "* Means default format, and therefore optional.  For example, 'due' and 'due.formatted' are equivalent."
-#define STRING_CMD_COLUMNS_USAGE2    "Displays only a list of supported columns"
-#define STRING_CMD_COLUMNS_ARGS      "You can only specify one search string."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "指定されたtaskには注釈がないので削除できません。"
 #define STRING_CMD_DENO_CONFIRM      "タスク {1} から注釈 '{2}' を削除しますか?"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 7a3ce6bf2..6e733c183 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -315,11 +315,6 @@
 #define STRING_CMD_ANNO_1            "Skomentowano {1} zadanie."
 #define STRING_CMD_ANNO_N            "Skomentowano {1} zadań."
 
-#define STRING_CMD_COLUMNS_USAGE     "Wszystkie kolumny i wspierane style formatowania"
-#define STRING_CMD_COLUMNS_NOTE      "* Oznacza domyślne formatowanie, w konsekwencji niewymagane explicite. Na przykład: 'due' i 'due.formatted' są równoznaczne."
-#define STRING_CMD_COLUMNS_USAGE2    "Wyświetla tylko listę wspieranych kolumn"
-#define STRING_CMD_COLUMNS_ARGS      "Możesz podać tylko jeden szukany ciąg znaków."
-
 #define STRING_CMD_DENO_USAGE        "Usuwa komentarz"
 #define STRING_CMD_DENO_NONE         "Wybrane zadanie nie posiada komentarza do usunięcia."
 #define STRING_CMD_DENO_CONFIRM      "Usunąć komentarz zadania {1} '{2}'?"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c006acad0..023bdf30e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -315,11 +315,6 @@
 #define STRING_CMD_ANNO_1            "Anotada {1} tarefa."
 #define STRING_CMD_ANNO_N            "Anotadas {1} tarefas."
 
-#define STRING_CMD_COLUMNS_USAGE     "Todas as colunas suportadas e os estilos de formatação"
-#define STRING_CMD_COLUMNS_NOTE      "* Significa formato por defeito, e por consequência opcional. Por exemplo 'due' e 'due.formatted' são equivalentes."
-#define STRING_CMD_COLUMNS_USAGE2    "Exibe apenas a lista de colunas suportadas"
-#define STRING_CMD_COLUMNS_ARGS      "Pode apenas especificar uma frase para procura."
-
 #define STRING_CMD_DENO_USAGE        "Elimina uma anotação"
 #define STRING_CMD_DENO_NONE         "A tarefa especificada não tem anotações que possam ser eliminadas."
 #define STRING_CMD_DENO_CONFIRM      "Remover anotação da tarefa {1} '{2}'?"

From cece9201bbc9a37626c4af811286c543d92e6f38 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:15:34 -0500
Subject: [PATCH 618/879] l10n: Eliminated STRING_UDA_TYPE

---
 src/columns/Column.cpp | 2 +-
 src/l10n/deu-DEU.h     | 1 -
 src/l10n/eng-USA.h     | 1 -
 src/l10n/epo-RUS.h     | 1 -
 src/l10n/esp-ESP.h     | 1 -
 src/l10n/fra-FRA.h     | 1 -
 src/l10n/ita-ITA.h     | 1 -
 src/l10n/jpn-JPN.h     | 1 -
 src/l10n/pol-POL.h     | 1 -
 src/l10n/por-PRT.h     | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 6e1280328..c91b25d84 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -214,7 +214,7 @@ Column* Column::uda (const std::string& name)
     return c;
   }
   else if (type != "")
-    throw std::string (STRING_UDA_TYPE);
+    throw std::string ("User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'.");
 
   return NULL;
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 477f97f9d..01a48eb7b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -480,7 +480,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein."
 #define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 8475dcb8a..1bbc29e08 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -477,7 +477,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 40aa1dc2c..1c39ea104 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -480,7 +480,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'."
 #define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 9b3c753d6..2d4a4f08b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -492,7 +492,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 63e77b398..3e9f238e0 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -502,7 +502,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index a7195368a..e8bc96662 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -481,7 +481,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'."
 #define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ead6f5e44..d6454a2c4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'."
 #define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 6e733c183..1ac413710 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'."
 #define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 023bdf30e..c83638ed2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -482,7 +482,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_TYPE              "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'."
 #define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."

From 5301e989422c00bc7e3cf3679b9781553ff44a90 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:19:24 -0500
Subject: [PATCH 619/879] l10n: Eliminated STRING_LOCALIZATION_*

---
 src/commands/CmdVersion.cpp | 12 ------------
 src/l10n/deu-DEU.h          |  9 ---------
 src/l10n/eng-USA.h          |  9 ---------
 src/l10n/epo-RUS.h          |  9 ---------
 src/l10n/esp-ESP.h          |  9 ---------
 src/l10n/fra-FRA.h          |  9 ---------
 src/l10n/ita-ITA.h          |  9 ---------
 src/l10n/jpn-JPN.h          |  9 ---------
 src/l10n/pol-POL.h          |  9 ---------
 src/l10n/por-PRT.h          |  9 ---------
 10 files changed, 93 deletions(-)

diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index d40647afc..0bc7bd6e1 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -102,12 +102,6 @@ int CmdVersion::execute (std::string& output)
 #else
       << STRING_CMD_VERSION_UNKNOWN
 #endif
-
-#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA
-      << ' '
-      << STRING_LOCALIZATION_DESC
-#endif
-
       << '\n'
       << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
       << '\n'
@@ -117,12 +111,6 @@ int CmdVersion::execute (std::string& output)
       << link.render ()
       << '\n';
 
-#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA
-  out << STRING_LOCALIZATION_AUTHOR
-      << '\n'
-      << '\n';
-#endif
-
   output = out.str ();
   return 0;
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 01a48eb7b..201e06623 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Deutsche Übersetzung"
-#define STRING_LOCALIZATION_AUTHOR   "Ins Deutsche übersetzt von Jens Erat."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Spaltenname '{1}' nicht erkannt."
 #define STRING_COLUMN_BAD_FORMAT     "Spaltenformat '{1}.{2}' nicht erkannt"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1bbc29e08..2d4e2a746 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "English localization"
-#define STRING_LOCALIZATION_AUTHOR   "Translated into English by A. Person."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Unrecognized column name '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Unrecognized column format '{1}.{2}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1c39ea104..0e4ddd42d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "— Esperanta lokalaĵo"
-#define STRING_LOCALIZATION_AUTHOR   "Tradukita al la Internacia Lingvo per Jeremy John Reeder"
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nekonata kolumna nomo '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nekonata kolumna formiĝo '{1}.{2}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 2d4a4f08b..70d942fb4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "- localización española"
-#define STRING_LOCALIZATION_AUTHOR   "Traducido al español por Fidel Mato y Jeremy John Reeder."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nombre de columna no reconocido '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de columna no reconocido '{1}.{2}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 3e9f238e0..483acfdc5 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Traduction française"
-#define STRING_LOCALIZATION_AUTHOR   "Traduit en français par Leowzukw et Jeremy John Reeder."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nom de colonne non reconnu '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Format de colonne non reconnu '{1}.{2}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index e8bc96662..7134a3ce2 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Traduzione in Italiano"
-#define STRING_LOCALIZATION_AUTHOR   "Tradotto in Italiano da Tullio Facchinetti."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome di colonna '{1}' non riconosciuto."
 #define STRING_COLUMN_BAD_FORMAT     "Formato di colonna '{1}.{2}' non riconosciuto"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index d6454a2c4..9b00079c3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Japanese localization"
-#define STRING_LOCALIZATION_AUTHOR   "Translated into Japanese by Oota Toshiya."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "認識できないカラム名 '{1}'。"
 #define STRING_COLUMN_BAD_FORMAT     "認識出来ないカラム形式 '{1}.{2}'"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 1ac413710..0a51c00b9 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Tłumaczenie polskie"
-#define STRING_LOCALIZATION_AUTHOR   "Przetłumaczył na język polski Ł. Panek."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nierozpoznano nazwy kolumny '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nierozpoznano formatu kolumny '{1}.{2}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c83638ed2..ce74d21e0 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,15 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// Note that for English, the following two lines are not displayed.  For all
-// other localizations, these lines will appear in the output of the 'version'
-// and 'diagnostics' commands.
-//
-// DO NOT include a copyright in the translation.
-//
-#define STRING_LOCALIZATION_DESC     "Tradução em Português"
-#define STRING_LOCALIZATION_AUTHOR   "Traduzido para Português por Renato Alves."
-
 // columns/Col*
 #define STRING_COLUMN_BAD_NAME       "Nome de coluna '{1}' não reconhecido."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de coluna '{1}.{2}' não reconhecido"

From 67c5bc97cec729c46716432f1bea8cbeb5a50992 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:21:43 -0500
Subject: [PATCH 620/879] l10n: Eliminated STRING_UDA_COLLISION

---
 src/columns/Column.cpp | 2 +-
 src/l10n/deu-DEU.h     | 1 -
 src/l10n/eng-USA.h     | 1 -
 src/l10n/epo-RUS.h     | 1 -
 src/l10n/esp-ESP.h     | 1 -
 src/l10n/fra-FRA.h     | 1 -
 src/l10n/ita-ITA.h     | 1 -
 src/l10n/jpn-JPN.h     | 1 -
 src/l10n/pol-POL.h     | 1 -
 src/l10n/por-PRT.h     | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index c91b25d84..35cf0172c 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -162,7 +162,7 @@ void Column::uda (std::map <std::string, Column*>& all)
   for (const auto& uda : udas)
   {
     if (all.find (uda) != all.end ())
-      throw format (STRING_UDA_COLLISION, uda);
+      throw format ("The UDA named '{1}' is the same as a core attribute, and is not permitted.", uda);
 
     Column* c = Column::uda (uda);
     if (c)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 201e06623..4bd2f36e6 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt."
 #define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 2d4e2a746..eae416122 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -468,7 +468,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0e4ddd42d..6059aba87 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "UDA '{1}' kaj enkonstruita atributo havas la saman nomon.  Tio estas malpermesita."
 #define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 70d942fb4..6d15d8683 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -483,7 +483,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido."
 #define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 483acfdc5..841be01a1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -493,7 +493,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7134a3ce2..97dae78a3 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -472,7 +472,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso."
 #define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 9b00079c3..36864266d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "The UDA named '{1}' is the same as a core attribute, and is not permitted."
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0a51c00b9..d990c58af 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona."
 #define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ce74d21e0..f946dfcea 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_UDA_COLLISION         "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido."
 #define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."

From ead5322340dedc1c418bd627077b1c25f341790d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:30:03 -0500
Subject: [PATCH 621/879] l10n: Eliminated STRING_INVALID_MOD

---
 src/Task.cpp                  | 2 +-
 src/columns/ColTypeString.cpp | 3 ++-
 src/l10n/deu-DEU.h            | 1 -
 src/l10n/eng-USA.h            | 1 -
 src/l10n/epo-RUS.h            | 1 -
 src/l10n/esp-ESP.h            | 1 -
 src/l10n/fra-FRA.h            | 1 -
 src/l10n/ita-ITA.h            | 1 -
 src/l10n/jpn-JPN.h            | 1 -
 src/l10n/pol-POL.h            | 1 -
 src/l10n/por-PRT.h            | 1 -
 11 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 8981bb6c7..361d14bfa 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -2083,7 +2083,7 @@ void Task::modify (modType type, bool text_required /* = false */)
           Column* column = context.columns[name];
           if (! column ||
               ! column->modifiable ())
-            throw format (STRING_INVALID_MOD, name, value);
+            throw format ("The '{1}' attribute does not allow a value of '{2}'.", name, value);
 
           // Delegate modification to the column object or their base classes.
           if (name == "depends"             ||
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 4725b89d1..0b1a79771 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -31,7 +31,8 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <format.h>
-#include <i18n.h>
+
+#define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 
 extern Context context;
 extern Task& contextTask;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4bd2f36e6..2723042ca 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'."
 #define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index eae416122..44d08ae02 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -468,7 +468,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 6059aba87..bccec8723 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "Atributo '{1}' ne permesas valoron '{2}'."
 #define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 6d15d8683..2a8904eee 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -483,7 +483,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "El atributo '{1}' no admite un valor '{2}'."
 #define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
 
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 841be01a1..4f7c03352 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -493,7 +493,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 97dae78a3..1186b9b78 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -472,7 +472,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "L'attributo '{1}' non ammette un valore pari a '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 36864266d..c37ee2f96 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 #define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index d990c58af..f2d40d091 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "Atrybut '{1}' nie zezwala na wartość '{2}'."
 #define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f946dfcea..5f301ab4c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_INVALID_MOD           "O atributo '{1}' não permite o valor '{2}'."
 #define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 

From 47ef45ee38e909746823d42381aea5784e870262 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:32:00 -0500
Subject: [PATCH 622/879] l10n: Eliminated STRING_ERROR_DETAILS

---
 src/commands/CmdCalendar.cpp | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 1 -
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 6ddfd3c64..4de4c6655 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -335,7 +335,7 @@ int CmdCalendar::execute (std::string& output)
       // Assert that 'report' is a valid report.
       auto report = context.config.get ("calendar.details.report");
       if (context.commands.find (report) == context.commands.end ())
-        throw std::string (STRING_ERROR_DETAILS);
+        throw std::string ("The setting 'calendar.details.report' must contain a single report name.");
 
       // TODO Fix this:  cal      --> task
       //                 calendar --> taskendar
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 2723042ca..3b1a12001 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 44d08ae02..5d350d6d8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -468,7 +468,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index bccec8723..67ab2aecb 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -471,7 +471,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 2a8904eee..0b0c38cab 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -483,7 +483,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "El ajuste 'calendar.details.report' debe contener un único nombre de informe."
 #define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
 
 // Feedback
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 4f7c03352..bab471693 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -493,7 +493,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 1186b9b78..5ab4cbb5a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -472,7 +472,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index c37ee2f96..3668bace4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "The setting 'calendar.details.report' must contain a single report name."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f2d40d091..59699e99b 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "Zmienna 'calendar.details.report' musi zawierać nazwę raportu."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5f301ab4c..f9c4a3eb3 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -473,7 +473,6 @@
 
 // Errors
 // TODO Move each of these to appropriate section.
-#define STRING_ERROR_DETAILS         "A definição 'calendar.details.report' pode apenas indicar um nome de relatório."
 #define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
 
 // Feedback

From 7123784734fae9000dacaa3c576cbff3e07fa23d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:34:26 -0500
Subject: [PATCH 623/879] l10n: Eliminated STRING_ERROR_NO_FILTER

---
 src/commands/CmdSync.cpp | 2 +-
 src/l10n/deu-DEU.h       | 4 ----
 src/l10n/eng-USA.h       | 4 ----
 src/l10n/epo-RUS.h       | 4 ----
 src/l10n/esp-ESP.h       | 4 ----
 src/l10n/fra-FRA.h       | 4 ----
 src/l10n/ita-ITA.h       | 4 ----
 src/l10n/jpn-JPN.h       | 4 ----
 src/l10n/pol-POL.h       | 4 ----
 src/l10n/por-PRT.h       | 4 ----
 10 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 670aecc53..dea0e120c 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -64,7 +64,7 @@ int CmdSync::execute (std::string& output)
 
   Filter filter;
   if (filter.hasFilter ())
-    throw std::string (STRING_ERROR_NO_FILTER);
+    throw std::string ("Command line filters are not supported by this command.");
 
   // Loog for the 'init' keyword to indicate one-time pending.data upload.
   bool first_time_init = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 3b1a12001..6e3e34ef9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -469,10 +469,6 @@
 #define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
 #define STRING_CMD_CALC_USAGE        "Rechner"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
 #define STRING_FEEDBACK_NO_TASKS_SP  "Keine Aufgaben angegeben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 5d350d6d8..11c1748d3 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -466,10 +466,6 @@
 #define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_NO_TASKS_SP  "No tasks specified."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 67ab2aecb..8dd9fb65f 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -469,10 +469,6 @@
 #define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
 #define STRING_CMD_CALC_USAGE        "Kalkulilo"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
 #define STRING_FEEDBACK_NO_TASKS_SP  "Nenia tasko specifata."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0b0c38cab..7cfeaf7b9 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -481,10 +481,6 @@
 #define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Los filtros de línea de comando no están soportados por este comando."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
 #define STRING_FEEDBACK_NO_TASKS_SP  "No se especificaron tareas."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index bab471693..381143781 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -491,10 +491,6 @@
 #define STRING_EDIT_HEADER_14        "Le séparateur ' -- ' entre les champs de date et de texte ne devrai pas être supprimé."
 #define STRING_EDIT_HEADER_15        "Il y a un champs vide ci-dessous pour ajouter une annotation facilement."
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_NO_TASKS_SP  "No tasks specified."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5ab4cbb5a..730e10766 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -470,10 +470,6 @@
 #define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
 #define STRING_CMD_CALC_USAGE        "Calculator"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
 #define STRING_FEEDBACK_NO_TASKS_SP  "Nessun task specificat."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 3668bace4..05384554f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -471,10 +471,6 @@
 #define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
 #define STRING_CMD_CALC_USAGE        "電卓"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
 #define STRING_FEEDBACK_NO_TASKS_SP  "タスクが1つも指定されていません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 59699e99b..73d043fd5 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -471,10 +471,6 @@
 #define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
 #define STRING_CMD_CALC_USAGE        "Kalkulator"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
 #define STRING_FEEDBACK_NO_TASKS_SP  "Nie określono zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f9c4a3eb3..fcb00a4a1 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -471,10 +471,6 @@
 #define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
 #define STRING_CMD_CALC_USAGE        "Calculadora"
 
-// Errors
-// TODO Move each of these to appropriate section.
-#define STRING_ERROR_NO_FILTER       "Command line filters are not supported by this command."
-
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
 #define STRING_FEEDBACK_NO_TASKS_SP  "Nenhuma tarefa especificada."

From 78c2c1c2da857bac7e3ed53b5cdf8c332b0fe432 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:36:37 -0500
Subject: [PATCH 624/879] l10n: Eliminated STRING_COLUMN_BAD_NAME

---
 src/columns/Column.cpp | 2 +-
 src/l10n/deu-DEU.h     | 1 -
 src/l10n/eng-USA.h     | 1 -
 src/l10n/epo-RUS.h     | 1 -
 src/l10n/esp-ESP.h     | 1 -
 src/l10n/fra-FRA.h     | 1 -
 src/l10n/ita-ITA.h     | 1 -
 src/l10n/jpn-JPN.h     | 1 -
 src/l10n/pol-POL.h     | 1 -
 src/l10n/por-PRT.h     | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 35cf0172c..7ceec07b0 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -105,7 +105,7 @@ Column* Column::factory (const std::string& name, const std::string& report)
     c = Column::uda (column_name);
 
   else
-    throw format (STRING_COLUMN_BAD_NAME, column_name);
+    throw format ("Unrecognized column name '{1}'.", column_name);
 
   c->setReport (report);
   c->setStyle (column_style);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6e3e34ef9..3c07d5c2a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Spaltenname '{1}' nicht erkannt."
 #define STRING_COLUMN_BAD_FORMAT     "Spaltenformat '{1}.{2}' nicht erkannt"
 #define STRING_COLUMN_LABEL_TASKS    "Aufgaben"
 #define STRING_COLUMN_LABEL_DEP      "Abhängig von"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 11c1748d3..d86cb347b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Unrecognized column name '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Unrecognized column format '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 8dd9fb65f..1a53f5695 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nekonata kolumna nomo '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nekonata kolumna formiĝo '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasko"
 #define STRING_COLUMN_LABEL_DEP      "Dependoj"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7cfeaf7b9..25f2be8e1 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nombre de columna no reconocido '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de columna no reconocido '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tareas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 381143781..06a249d95 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nom de colonne non reconnu '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Format de colonne non reconnu '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tâches"
 #define STRING_COLUMN_LABEL_DEP      "Dépends de"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 730e10766..544bf6670 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nome di colonna '{1}' non riconosciuto."
 #define STRING_COLUMN_BAD_FORMAT     "Formato di colonna '{1}.{2}' non riconosciuto"
 #define STRING_COLUMN_LABEL_TASKS    "Task"
 #define STRING_COLUMN_LABEL_DEP      "Dipendenze"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 05384554f..88090b8a7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "認識できないカラム名 '{1}'。"
 #define STRING_COLUMN_BAD_FORMAT     "認識出来ないカラム形式 '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 73d043fd5..be73c9012 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nierozpoznano nazwy kolumny '{1}'."
 #define STRING_COLUMN_BAD_FORMAT     "Nierozpoznano formatu kolumny '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Zadania"
 #define STRING_COLUMN_LABEL_DEP      "Związane"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index fcb00a4a1..9cfbe318b 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_NAME       "Nome de coluna '{1}' não reconhecido."
 #define STRING_COLUMN_BAD_FORMAT     "Formato de coluna '{1}.{2}' não reconhecido"
 #define STRING_COLUMN_LABEL_TASKS    "Tarefas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"

From bbb00ac7ef11b6929df404ececc6af0852535a94 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:39:41 -0500
Subject: [PATCH 625/879] l10n: Eliminated STRING_COLUMN_BAD_FORMAT

---
 src/columns/Column.cpp | 3 +--
 src/l10n/deu-DEU.h     | 1 -
 src/l10n/eng-USA.h     | 1 -
 src/l10n/epo-RUS.h     | 1 -
 src/l10n/esp-ESP.h     | 1 -
 src/l10n/fra-FRA.h     | 1 -
 src/l10n/ita-ITA.h     | 1 -
 src/l10n/jpn-JPN.h     | 1 -
 src/l10n/pol-POL.h     | 1 -
 src/l10n/por-PRT.h     | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 7ceec07b0..04f0e7f94 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -52,7 +52,6 @@
 #include <ColWait.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -274,7 +273,7 @@ void Column::setStyle (const std::string& style)
 {
   if (style != "default" &&
       std::find (_styles.begin (), _styles.end (), style) == _styles.end ())
-    throw format (STRING_COLUMN_BAD_FORMAT, _name, style);
+    throw format ("Unrecognized column format '{1}.{2}'", _name, style);
 
   _style = style;
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 3c07d5c2a..ea3aed49b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Spaltenformat '{1}.{2}' nicht erkannt"
 #define STRING_COLUMN_LABEL_TASKS    "Aufgaben"
 #define STRING_COLUMN_LABEL_DEP      "Abhängig von"
 #define STRING_COLUMN_LABEL_DEP_S    "Abh."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d86cb347b..3af51f596 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Unrecognized column format '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1a53f5695..a035f2a54 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Nekonata kolumna formiĝo '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasko"
 #define STRING_COLUMN_LABEL_DEP      "Dependoj"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 25f2be8e1..d9762b73e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Formato de columna no reconocido '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tareas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 06a249d95..fe429c53c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Format de colonne non reconnu '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tâches"
 #define STRING_COLUMN_LABEL_DEP      "Dépends de"
 #define STRING_COLUMN_LABEL_DEP_S    "Dép"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 544bf6670..b7abdf4f1 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Formato di colonna '{1}.{2}' non riconosciuto"
 #define STRING_COLUMN_LABEL_TASKS    "Task"
 #define STRING_COLUMN_LABEL_DEP      "Dipendenze"
 #define STRING_COLUMN_LABEL_DEP_S    "Dip"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 88090b8a7..03ac75b20 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "認識出来ないカラム形式 '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index be73c9012..9f79adada 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Nierozpoznano formatu kolumny '{1}.{2}'"
 #define STRING_COLUMN_LABEL_TASKS    "Zadania"
 #define STRING_COLUMN_LABEL_DEP      "Związane"
 #define STRING_COLUMN_LABEL_DEP_S    "Zwi"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9cfbe318b..5c64ba20e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_BAD_FORMAT     "Formato de coluna '{1}.{2}' não reconhecido"
 #define STRING_COLUMN_LABEL_TASKS    "Tarefas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |por-PRT|==|eng-USA|

From 083efc265b6940f1eb5f6bf07d539fee48572d87 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:41:34 -0500
Subject: [PATCH 626/879] l10n: Eliminated STRING_COLUMN_LABEL_TASKS

---
 src/commands/CmdProjects.cpp | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 1 -
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index c9d07fcb5..e116dd482 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -108,7 +108,7 @@ int CmdProjects::execute (std::string& output)
     Table view;
     view.width (context.getWidth ());
     view.add (STRING_COLUMN_LABEL_PROJECT);
-    view.add (STRING_COLUMN_LABEL_TASKS, false);
+    view.add ("Tasks", false);
     setHeaderUnderline (view);
 
     std::vector <std::string> processed;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ea3aed49b..b75f29eae 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Aufgaben"
 #define STRING_COLUMN_LABEL_DEP      "Abhängig von"
 #define STRING_COLUMN_LABEL_DEP_S    "Abh."
 #define STRING_COLUMN_LABEL_DESC     "Beschreibung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3af51f596..a95266c11 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Description"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a035f2a54..cae71fcd2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tasko"
 #define STRING_COLUMN_LABEL_DEP      "Dependoj"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Priskribo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index d9762b73e..9ad3da9e7 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tareas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_DESC     "Descripción"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index fe429c53c..7edb5beee 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tâches"
 #define STRING_COLUMN_LABEL_DEP      "Dépends de"
 #define STRING_COLUMN_LABEL_DEP_S    "Dép"
 #define STRING_COLUMN_LABEL_DESC     "Description"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b7abdf4f1..4ec5ec499 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Task"
 #define STRING_COLUMN_LABEL_DEP      "Dipendenze"
 #define STRING_COLUMN_LABEL_DEP_S    "Dip"
 #define STRING_COLUMN_LABEL_DESC     "Descrizione"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 03ac75b20..0366f9595 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tasks"
 #define STRING_COLUMN_LABEL_DEP      "Depends"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Description"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 9f79adada..b305ad09b 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Zadania"
 #define STRING_COLUMN_LABEL_DEP      "Związane"
 #define STRING_COLUMN_LABEL_DEP_S    "Zwi"
 #define STRING_COLUMN_LABEL_DESC     "Opis"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5c64ba20e..ff25959e0 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,7 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_TASKS    "Tarefas"
 #define STRING_COLUMN_LABEL_DEP      "Depende"
 #define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_DESC     "Descrição"

From a3bf98deff0e6a7d9cb3e05421610cfc9a3067d9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:44:01 -0500
Subject: [PATCH 627/879] l10n: Eliminated STRING_COLUMN_LABEL_ID

---
 src/columns/ColID.cpp    | 3 +--
 src/commands/CmdInfo.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index ba96bbe86..76a22c7b6 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -28,14 +28,13 @@
 #include <ColID.h>
 #include <math.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnID::ColumnID ()
 {
   _name       = "id";
   _style      = "number";
-  _label      = STRING_COLUMN_LABEL_ID;
+  _label      = "ID";
   _modifiable = false;
   _styles     = {"number"};
   _examples   = {"123"};
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 318c8379a..1afc68177 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -113,7 +113,7 @@ int CmdInfo::execute (std::string& output)
 
     // id
     auto row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_ID);
+    view.set (row, 0, "ID");
     view.set (row, 1, (task.id ? format (task.id) : "-"));
 
     std::string status = Lexer::ucFirst (Task::statusToText (task.getStatus ()));
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b75f29eae..0f6a60def 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
 #define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
 #define STRING_COLUMN_LABEL_AGE      "Alter"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define STRING_COLUMN_LABEL_WAIT     "Aufgeschoben"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a95266c11..6b67580aa 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_WAIT     "Wait"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index cae71fcd2..77b0c7ec5 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modifo"
 #define STRING_COLUMN_LABEL_ADDED    "Kreita"
 #define STRING_COLUMN_LABEL_AGE      "Aĝo"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekto"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_WAIT     "Atendu"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 9ad3da9e7..978715491 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_ADDED    "Añadida"
 #define STRING_COLUMN_LABEL_AGE      "Edad"
-#define STRING_COLUMN_LABEL_ID       "ID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_PROJECT  "Proyecto"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_WAIT     "Espera"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7edb5beee..b0c5f1332 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
 #define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
 #define STRING_COLUMN_LABEL_AGE      "Age"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Projet"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_WAIT     "Attente"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 4ec5ec499..d8b71a172 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
 #define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
 #define STRING_COLUMN_LABEL_AGE      "Età"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Progetto"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_WAIT     "Attesa"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0366f9595..e6e27ab3e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_WAIT     "Wait"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b305ad09b..5ad24223f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
 #define STRING_COLUMN_LABEL_ADDED    "Dodane"
 #define STRING_COLUMN_LABEL_AGE      "Wiek"
-#define STRING_COLUMN_LABEL_ID       "ID"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_WAIT     "Czeka"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ff25959e0..1692d31c4 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -39,7 +39,6 @@
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_ADDED    "Adicionada"
 #define STRING_COLUMN_LABEL_AGE      "Idade"
-#define STRING_COLUMN_LABEL_ID       "ID"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_PROJECT  "Projeto"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_WAIT     "Adiada"

From 61a377cc2992590ff725940a69e5988a24dd9d80 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:45:38 -0500
Subject: [PATCH 628/879] l10n: Eliminated STRING_TASK_VALID_DESC

---
 src/Task.cpp       | 2 +-
 src/l10n/deu-DEU.h | 1 -
 src/l10n/eng-USA.h | 1 -
 src/l10n/epo-RUS.h | 1 -
 src/l10n/esp-ESP.h | 1 -
 src/l10n/fra-FRA.h | 1 -
 src/l10n/ita-ITA.h | 1 -
 src/l10n/jpn-JPN.h | 1 -
 src/l10n/pol-POL.h | 1 -
 src/l10n/por-PRT.h | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 361d14bfa..c415f2476 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1631,7 +1631,7 @@ void Task::validate (bool applyDefault /* = true */)
 
   // There is no fixing a missing description.
   if (! has ("description"))
-    throw std::string (STRING_TASK_VALID_DESC);
+    throw std::string ("A task must have a description.");
   else if (get ("description") == "")
     throw std::string (STRING_TASK_VALID_BLANK);
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 0f6a60def..ef73ed3bb 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -524,7 +524,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Konnte keine Abhängigkeit zu Aufgabe {1} löschen - nicht gefunden."
 #define STRING_TASK_DEPEND_DUP       "Aufgabe {1} hängt bereits von Aufgabe {2} ab."
 #define STRING_TASK_DEPEND_CIRCULAR  "Verbotene zyklische Abhängigkeit erkannt."
-#define STRING_TASK_VALID_DESC       "Aufgaben müssen eine Beschreibung haben."
 #define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
 #define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
 #define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6b67580aa..2967dd227 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -521,7 +521,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
 #define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_DESC       "A task must have a description."
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 77b0c7ec5..f43072a09 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -524,7 +524,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Ne povis viŝi dependecon de tasko {1} - netrovita."
 #define STRING_TASK_DEPEND_DUP       "Tasko {1} jam dependas de tasko {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Detektis kaj malpermesis ciklan dependecon."
-#define STRING_TASK_VALID_DESC       "Tasko devas havi priskribon."
 #define STRING_TASK_VALID_BLANK      "Ne povas krei blankan taskon."
 #define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 978715491..06c3a7980 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -536,7 +536,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "No se pudo eliminar una dependencia de la tarea {1} - no encontrada."
 #define STRING_TASK_DEPEND_DUP       "La tarea {1} ya depende de la tarea {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dependencia circular detectada y anulada."
-#define STRING_TASK_VALID_DESC       "Una tarea debe tener descripción."
 #define STRING_TASK_VALID_BLANK      "No se puede añadir una tarea que está en blanco."
 #define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b0c5f1332..150dda2fe 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -546,7 +546,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
 #define STRING_TASK_DEPEND_DUP       "La tâche {1} dépend déjà de la tâche {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_DESC       "A task must have a description."
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d8b71a172..48e7f0fab 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -525,7 +525,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Impossibile cancellare la dipendenza dal task {1} - non trovato."
 #define STRING_TASK_DEPEND_DUP       "Task {1} già dipende da {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dipendenza circolare riscontrata ed evitata."
-#define STRING_TASK_VALID_DESC       "Un task deve avere una descrizione."
 #define STRING_TASK_VALID_BLANK      "Impossibile aggiungere un task vuoto."
 #define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index e6e27ab3e..0f1c294b9 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -526,7 +526,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
 #define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_DESC       "A task must have a description."
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
 #define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5ad24223f..5d0f8e350 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -526,7 +526,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Nie można usunąć zależności dla zadania {1} - nie znaleziono."
 #define STRING_TASK_DEPEND_DUP       "Zadanie {1} już jest zależne od zadania {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Wykryto i nie dopuszczono do zależności cyklicznej."
-#define STRING_TASK_VALID_DESC       "Zadanie musi posiadać opis."
 #define STRING_TASK_VALID_BLANK      "Nie można dodać pustego zadania."
 #define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1692d31c4..326af90ef 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -526,7 +526,6 @@
 #define STRING_TASK_DEPEND_MISS_DEL  "Não foi possível eliminar a dependência da tarefa {1} - esta não existe."
 #define STRING_TASK_DEPEND_DUP       "Tarefa {1} já depende da tarefa {2}."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dependência circular detetada e não permitida."
-#define STRING_TASK_VALID_DESC       "Uma tarefa necessita de uma descrição."
 #define STRING_TASK_VALID_BLANK      "Não é possível adicionar uma tarefa em branco."
 #define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
 #define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."

From 58ff0e74f4a49498ff2231aec27c7f225a9efd1a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:52:26 -0500
Subject: [PATCH 629/879] l10n: Eliminated STRING_CMD_START_*

---
 src/commands/CmdStart.cpp | 12 ++++++------
 src/commands/Command.cpp  |  3 +--
 src/l10n/deu-DEU.h        |  9 ---------
 src/l10n/eng-USA.h        |  9 ---------
 src/l10n/epo-RUS.h        |  9 ---------
 src/l10n/esp-ESP.h        |  9 ---------
 src/l10n/fra-FRA.h        |  9 ---------
 src/l10n/ita-ITA.h        |  9 ---------
 src/l10n/jpn-JPN.h        |  9 ---------
 src/l10n/pol-POL.h        |  9 ---------
 src/l10n/por-PRT.h        |  9 ---------
 11 files changed, 7 insertions(+), 89 deletions(-)

diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index d813c8adf..af7bb9c8b 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -41,7 +41,7 @@ CmdStart::CmdStart ()
 {
   _keyword               = "start";
   _usage                 = "task <filter> start <mods>";
-  _description           = STRING_CMD_START_USAGE;
+  _description           = "Marks specified task as started";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -79,7 +79,7 @@ int CmdStart::execute (std::string&)
       Task before (task);
 
       // Start the specified task.
-      std::string question = format (STRING_CMD_START_CONFIRM,
+      std::string question = format ("Start task {1} '{2}'?",
                                      task.identifier (true),
                                      task.get ("description"));
       task.modify (Task::modAnnotate);
@@ -100,7 +100,7 @@ int CmdStart::execute (std::string&)
         updateRecurrenceMask (task);
         context.tdb2.modify (task);
         ++count;
-        feedback_affected (STRING_CMD_START_TASK, task);
+        feedback_affected ("Starting task {1} '{2}'.", task);
         if (!nagged)
           nagged = nag (task);
         dependencyChainOnStart (task);
@@ -109,7 +109,7 @@ int CmdStart::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_START_NO << '\n';
+        std::cout << "Task not started.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -117,7 +117,7 @@ int CmdStart::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_START_ALREADY,
+      std::cout << format ("Task {1} '{2}' already started.",
                            task.id,
                            task.get ("description"))
                 << '\n';
@@ -130,7 +130,7 @@ int CmdStart::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_START_1 : STRING_CMD_START_N, count);
+  feedback_affected (count == 1 ? "Started {1} task." : "Started {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index ac964b3db..79c7583e0 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -31,7 +31,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <Command.h>
 #include <main.h>
 
@@ -190,7 +189,7 @@ void Command::factory (std::map <std::string, Command*>& all)
   {
     // Make sure a custom report does not clash with a built-in command.
     if (all.find (report) != all.end ())
-      throw format (STRING_CMD_CONFLICT, report);
+      throw format ("Custom report '{1}' conflicts with built-in task command.", report);
 
     c = new CmdCustom (
               report,
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ef73ed3bb..a9ccb402b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Benutzerdefinierter Report '{1}' steht mit eingebautem task-Befehl in Konflikt."
 #define STRING_CMD_VERSION_USAGE     "Zeigt die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_USAGE2    "Zeigt ausschließlich die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
@@ -257,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Kennzeichnet die gewählte Aufgabe als begonnen."
-#define STRING_CMD_START_NO          "Aufgabe nicht begonnen."
-#define STRING_CMD_START_ALREADY     "Aufgabe {1} '{2}' ist bereits gestartet."
-#define STRING_CMD_START_TASK        "Starte Aufgabe {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Aufgabe {1} '{2}' starten?"
-#define STRING_CMD_START_1           "{1} Aufgabe gestartet."
-#define STRING_CMD_START_N           "{1} Aufgaben gestartet."
-
 #define STRING_CMD_STOP_USAGE        "Entfernt die 'start'-Zeit einer Aufgabe"
 #define STRING_CMD_STOP_NO           "Aufgabe nicht beendet."
 #define STRING_CMD_STOP_ALREADY      "Aufgabe {1} '{2}' nicht beendet."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 2967dd227..2e94ef1e6 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "Shows the Taskwarrior version number"
 #define STRING_CMD_VERSION_USAGE2    "Shows only the Taskwarrior version number"
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
@@ -254,14 +253,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "Task not started."
-#define STRING_CMD_START_ALREADY     "Task {1} '{2}' already started."
-#define STRING_CMD_START_TASK        "Starting task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Start task {1} '{2}'?"
-#define STRING_CMD_START_1           "Started {1} task."
-#define STRING_CMD_START_N           "Started {1} tasks."
-
 #define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
 #define STRING_CMD_STOP_NO           "Task not stopped."
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' not started."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f43072a09..118cf6e20 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Personala raporto '{1}' konfliktas kun enkonstruita taskkomando."
 #define STRING_CMD_VERSION_USAGE     "Montras la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Montras sole la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Oni povas trovi la dokumentojn por Taskwarrior kun 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq', aŭ ĉe http://taskwarrior.org."
@@ -257,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Markas la specifatan taskon kiel ekita"
-#define STRING_CMD_START_NO          "Ne ekis taskon."
-#define STRING_CMD_START_ALREADY     "Tasko {1} '{2}' jam ekita."
-#define STRING_CMD_START_TASK        "Ekanta taskon {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Eki taskon {1} '{2}'?"
-#define STRING_CMD_START_1           "Ekis {1} taskon."
-#define STRING_CMD_START_N           "Ekis {1} taskojn."
-
 #define STRING_CMD_STOP_USAGE        "Viŝas la ek-tempon de tasko"
 #define STRING_CMD_STOP_NO           "Tasko ne haltita."
 #define STRING_CMD_STOP_ALREADY      "Tasko {1} '{2}' ne ekita."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 06c3a7980..00d7d2c97 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -104,7 +104,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "informe personalizado '{1}' en conflicto con comando interno de taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Muestra el número de versión de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Muestra el número de versión (solamente) de taskwarrior"
 
@@ -265,14 +264,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Marca la tarea especificada como comenzada"
-#define STRING_CMD_START_NO          "Tarea no comenzada."
-#define STRING_CMD_START_ALREADY     "Tarea {1} '{2}' ya comenzada."
-#define STRING_CMD_START_TASK        "Comenzando tarea {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "¿Comenzar tarea {1} '{2}'?"
-#define STRING_CMD_START_1           "Comenzada {1} tarea."
-#define STRING_CMD_START_N           "Comenzadas {1} tareas."
-
 #define STRING_CMD_STOP_USAGE        "Elimina el tiempo de 'comienzo' de una tarea"
 
 #define STRING_CMD_STOP_NO           "Tarea no detenida."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 150dda2fe..b2478230f 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Le rapport personnalisé '{1}' entre en conflit avec une commande prédéfinie de task."
 #define STRING_CMD_VERSION_USAGE     "Affiche le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Affiche uniquement le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "Tâche non démarrée."
-#define STRING_CMD_START_ALREADY     "Tâche {1} '{2}' déjà démarré."
-#define STRING_CMD_START_TASK        "Starting task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Start task {1} '{2}'?"
-#define STRING_CMD_START_1           "Started {1} task."
-#define STRING_CMD_START_N           "Started {1} tasks."
-
 #define STRING_CMD_STOP_USAGE        "Suppression de l'attribut 'start' d'une tâche"
 #define STRING_CMD_STOP_NO           "Tâche non arrếtée"
 #define STRING_CMD_STOP_ALREADY      "Tâche {1} '{2}' non arrêtée" // Étrange
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 48e7f0fab..e8e2df9da 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -103,7 +103,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "Report personalizzato '{1}' provoca conflitto con un comando standard."
 #define STRING_CMD_VERSION_USAGE     "Mostra il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Mostra solo il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
@@ -258,14 +257,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Contrassegna i task specificati come avviati"
-#define STRING_CMD_START_NO          "Task non avviato."
-#define STRING_CMD_START_ALREADY     "Task {1} '{2}' già avviati."
-#define STRING_CMD_START_TASK        "Avvio task {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Avviare task {1} '{2}'?"
-#define STRING_CMD_START_1           "Task {1} avviato."
-#define STRING_CMD_START_N           "Task {1} avviati."
-
 #define STRING_CMD_STOP_USAGE        "Rimuove il tempo di 'avvio' dal task"
 #define STRING_CMD_STOP_NO           "Task non fermato."
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' non fermato."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0f1c294b9..40288f7c5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Custom report '{1}' conflicts with built-in task command."
 #define STRING_CMD_VERSION_USAGE     "taskwarrior バージョン番号の表示"
 #define STRING_CMD_VERSION_USAGE2    "taskwarrior バージョン番号のみの表示"
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
@@ -259,14 +258,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Marks specified task as started"
-#define STRING_CMD_START_NO          "タスク は開始していません。"
-#define STRING_CMD_START_ALREADY     "タスク {1} '{2}' は既に開始しています。"
-#define STRING_CMD_START_TASK        "タスク {1} '{2}' を開始。"
-#define STRING_CMD_START_CONFIRM     "タスク {1} '{2}' を開始?"
-#define STRING_CMD_START_1           " {1} タスク を開始しました。"
-#define STRING_CMD_START_N           " {1} タスク を開始しました。"
-
 #define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
 #define STRING_CMD_STOP_NO           "Task は停止できません。"
 #define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' は停止できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5d0f8e350..c6f1d7d4e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -104,7 +104,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_CONFLICT          "Raport urzytkownika '{1}' jest w konflikcie z wbudowanym poleceniem."
 #define STRING_CMD_VERSION_USAGE     "Pokazuje wersję programu taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Pokazuje numer wersji programu taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Oznacza zadanie jako uruchomione"
-#define STRING_CMD_START_NO          "Zadanie nie uruchomione"
-#define STRING_CMD_START_ALREADY     "Zadanie {1} '{2}' jest już uruchomione"
-#define STRING_CMD_START_TASK        "Uruchamianie zadania {1} '{2}'"
-#define STRING_CMD_START_CONFIRM     "Uruchomić zadanie {1} '{2}'?"
-#define STRING_CMD_START_1           "Uruchomiono {1} zadanie."
-#define STRING_CMD_START_N           "Uruchomiono {1} zadań."
-
 #define STRING_CMD_STOP_USAGE        "Usuwa marker 'start' z zadania"
 #define STRING_CMD_STOP_NO           "Zadanie nie zatrzymane"
 #define STRING_CMD_STOP_ALREADY      "Zadanie {1} '{2}' nie jest uruchomione"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 326af90ef..999132796 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -104,7 +104,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
 
 // commands/Cmd*
-#define STRING_CMD_CONFLICT          "Conflito entre relatório personalizado '{1}' e um comando interno do taskwarrior."
 #define STRING_CMD_VERSION_USAGE     "Exibe o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_USAGE2    "Exibe apenas o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
@@ -259,14 +258,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_START_USAGE       "Assinala a tarefa especificada como iniciada"
-#define STRING_CMD_START_NO          "Tarefa não iniciada."
-#define STRING_CMD_START_ALREADY     "Tarefa {1} '{2}' já iniciada."
-#define STRING_CMD_START_TASK        "A iniciar tarefa {1} '{2}'."
-#define STRING_CMD_START_CONFIRM     "Iniciar tarefa {1} '{2}'?"
-#define STRING_CMD_START_1           "Iniciada {1} tarefa."
-#define STRING_CMD_START_N           "Iniciadas {1} tarefas."
-
 #define STRING_CMD_STOP_USAGE        "Remove o estado de iniciado 'start' de uma tarefa"
 #define STRING_CMD_STOP_NO           "Tarefa não parada."
 #define STRING_CMD_STOP_ALREADY      "Tarefa {1} '{2}' não iniciada."

From 4f082124158a203d002b6f1de31405055dfab52d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:54:27 -0500
Subject: [PATCH 630/879] l10n: Eliminated STRING_CMD_LOGO_*

---
 src/commands/CmdLogo.cpp | 5 ++---
 src/l10n/deu-DEU.h       | 2 --
 src/l10n/eng-USA.h       | 2 --
 src/l10n/epo-RUS.h       | 2 --
 src/l10n/esp-ESP.h       | 2 --
 src/l10n/fra-FRA.h       | 2 --
 src/l10n/ita-ITA.h       | 2 --
 src/l10n/jpn-JPN.h       | 2 --
 src/l10n/pol-POL.h       | 2 --
 src/l10n/por-PRT.h       | 2 --
 10 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index b495038cf..f9e9c77c6 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -28,7 +28,6 @@
 #include <CmdLogo.h>
 #include <Context.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -37,7 +36,7 @@ CmdLogo::CmdLogo ()
 {
   _keyword               = "logo";
   _usage                 = "task          logo";
-  _description           = STRING_CMD_LOGO_USAGE;
+  _description           = "Displays the Taskwarrior logo";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -85,7 +84,7 @@ int CmdLogo::execute (std::string& output)
   };
 
   if (! context.color ())
-    throw std::string (STRING_CMD_LOGO_COLOR_REQ);
+    throw std::string ("The logo command requires that color support is enabled.");
 
   std::string indent (context.config.getInteger ("indent.report"), ' ');
   output += optionalBlankLine ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index a9ccb402b..c947fc346 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Zeigt ausschließlich die taskwarrior-Versionsnummer"
 #define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "unbekannt"
-#define STRING_CMD_LOGO_USAGE        "Zeigt das taskwarrior-Logo"
-#define STRING_CMD_LOGO_COLOR_REQ    "Der Logo-Befehle benötigt aktivierte Farbunterstützung"
 #define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
 #define STRING_CMD_URGENCY_USAGE     "Zeigt die Dringlichkeit einer Aufgabe an"
 #define STRING_CMD_URGENCY_RESULT    "Aufgabe {1}, Dringlichkeit {2}"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 2e94ef1e6..b6aad088c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Shows only the Taskwarrior version number"
 #define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_LOGO_USAGE        "Displays the Taskwarrior logo"
-#define STRING_CMD_LOGO_COLOR_REQ    "The logo command requires that color support is enabled."
 #define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
 #define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 118cf6e20..650f88c73 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Montras sole la versinombro de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Oni povas trovi la dokumentojn por Taskwarrior kun 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq', aŭ ĉe http://taskwarrior.org."
 #define STRING_CMD_VERSION_UNKNOWN   "nekonata"
-#define STRING_CMD_LOGO_USAGE        "Montras la logotipon de Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "La komando 'logo' bezonas, ke la kolor-subtenado estus ebligata."
 #define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
 #define STRING_CMD_URGENCY_USAGE     "Montras la urĝec-mezuro de tasko"
 #define STRING_CMD_URGENCY_RESULT    "tasko {1} urĝeco {2}"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 00d7d2c97..979ae8c42 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -109,8 +109,6 @@
 
 #define STRING_CMD_VERSION_DOCS      "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-color', y 'man task-sync' o en http://taskwarrior.org."
 #define STRING_CMD_VERSION_UNKNOWN   "desconocido"
-#define STRING_CMD_LOGO_USAGE        "Muestra el logo de Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "El comando logo requiere que el soporte de color esté habilitado."
 #define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
 #define STRING_CMD_URGENCY_USAGE     "Muestra la medida de urgencia de una tarea"
 #define STRING_CMD_URGENCY_RESULT    "tarea {1} urgencia {2}"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b2478230f..0beecd5ee 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Affiche uniquement le numéro de version de taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "inconnu"
-#define STRING_CMD_LOGO_USAGE        "Affiche le logo de Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "La commande logo nécessite le support des couleurs."
 #define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
 #define STRING_CMD_URGENCY_USAGE     "Affiche l'indice d'urgence de la tâche"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index e8e2df9da..95d91b0c7 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -107,8 +107,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Mostra solo il numero di versione di taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "sconosciuto"
-#define STRING_CMD_LOGO_USAGE        "Mostra il logo di Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "Il comando logo richiede l'abilitazione del supporto ai colori."
 #define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
 #define STRING_CMD_URGENCY_USAGE     "Mostra l'urgenza di un task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgenza {2}"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 40288f7c5..b57669064 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "taskwarrior バージョン番号のみの表示"
 #define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
 #define STRING_CMD_VERSION_UNKNOWN   "unknown"
-#define STRING_CMD_LOGO_USAGE        "Taskwarrior ロゴの表示"
-#define STRING_CMD_LOGO_COLOR_REQ    "色のサポートをする logo コマンドが有効になりました。"
 #define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
 #define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index c6f1d7d4e..980c8192d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Pokazuje numer wersji programu taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "nieznana"
-#define STRING_CMD_LOGO_USAGE        "Wyświetla logo Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "Polecenie logo wymaga wsparcia kolorowania."
 #define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
 #define STRING_CMD_URGENCY_USAGE     "Wyświetla pomiar ważności zadania"
 #define STRING_CMD_URGENCY_RESULT    "zadanie {1} ważność {2}"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 999132796..27e4bf4ca 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -108,8 +108,6 @@
 #define STRING_CMD_VERSION_USAGE2    "Exibe apenas o número de versão do taskwarrior"
 #define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
 #define STRING_CMD_VERSION_UNKNOWN   "desconhecido"
-#define STRING_CMD_LOGO_USAGE        "Exibe o logotipo do Taskwarrior"
-#define STRING_CMD_LOGO_COLOR_REQ    "O comando logo requer que o suporte de cor seja ativado."
 #define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
 #define STRING_CMD_URGENCY_USAGE     "Exibe o valor de urgência de uma tarefa"
 #define STRING_CMD_URGENCY_RESULT    "Tarefa {1} urgência {2}"

From 3d1a430b625be44d9500712aa9610fe7f784ce1e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:59:56 -0500
Subject: [PATCH 631/879] l10n: Eliminated STRING_CMD_STOP_*

---
 src/commands/CmdStop.cpp | 12 ++++++------
 src/l10n/deu-DEU.h       |  8 --------
 src/l10n/eng-USA.h       |  8 --------
 src/l10n/epo-RUS.h       |  8 --------
 src/l10n/esp-ESP.h       |  9 ---------
 src/l10n/fra-FRA.h       |  8 --------
 src/l10n/ita-ITA.h       |  8 --------
 src/l10n/jpn-JPN.h       |  8 --------
 src/l10n/pol-POL.h       |  8 --------
 src/l10n/por-PRT.h       |  8 --------
 10 files changed, 6 insertions(+), 79 deletions(-)

diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index b7acbbbcf..8e89e0c62 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -40,7 +40,7 @@ CmdStop::CmdStop ()
 {
   _keyword               = "stop";
   _usage                 = "task <filter> stop <mods>";
-  _description           = STRING_CMD_STOP_USAGE;
+  _description           = "Removes the 'start' time from a task";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -77,7 +77,7 @@ int CmdStop::execute (std::string&)
       Task before (task);
 
       // Stop the specified task.
-      std::string question = format (STRING_CMD_STOP_CONFIRM,
+      std::string question = format ("Stop task {1} '{2}'?",
                                      task.identifier (true),
                                      task.get ("description"));
 
@@ -92,14 +92,14 @@ int CmdStop::execute (std::string&)
         updateRecurrenceMask (task);
         context.tdb2.modify (task);
         ++count;
-        feedback_affected (STRING_CMD_STOP_TASK, task);
+        feedback_affected ("Stopping task {1} '{2}'.", task);
         dependencyChainOnStart (task);
         if (context.verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task, false);
       }
       else
       {
-        std::cout << STRING_CMD_STOP_NO << '\n';
+        std::cout << "Task not stopped.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -107,7 +107,7 @@ int CmdStop::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_STOP_ALREADY,
+      std::cout << format ("Task {1} '{2}' not started.",
                            task.identifier (true),
                            task.get ("description"))
                 << '\n';
@@ -120,7 +120,7 @@ int CmdStop::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_STOP_1 : STRING_CMD_STOP_N, count);
+  feedback_affected (count == 1 ?  "Stopped {1} task." : "Stopped {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c947fc346..db0de6306 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -254,14 +254,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Entfernt die 'start'-Zeit einer Aufgabe"
-#define STRING_CMD_STOP_NO           "Aufgabe nicht beendet."
-#define STRING_CMD_STOP_ALREADY      "Aufgabe {1} '{2}' nicht beendet."
-#define STRING_CMD_STOP_TASK         "Beende Aufgabe {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Aufgabe {1} '{2}' beenden?"
-#define STRING_CMD_STOP_1            "{1} Aufgabe beendet."
-#define STRING_CMD_STOP_N            "{1} Aufgaben beendet."
-
 #define STRING_CMD_APPEND_USAGE      "Fügt einer Aufgabenbeschreibung Text hinzu"
 #define STRING_CMD_APPEND_1          "Zu {1} Aufgabe hinzugefügt."
 #define STRING_CMD_APPEND_N          "Zu {1} Aufgaben hinzugefügt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index b6aad088c..e0a83fd70 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -251,14 +251,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
-#define STRING_CMD_STOP_NO           "Task not stopped."
-#define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' not started."
-#define STRING_CMD_STOP_TASK         "Stopping task {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Stop task {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Stopped {1} task."
-#define STRING_CMD_STOP_N            "Stopped {1} tasks."
-
 #define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
 #define STRING_CMD_APPEND_1          "Appended {1} task."
 #define STRING_CMD_APPEND_N          "Appended {1} tasks."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 650f88c73..6413acf93 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -254,14 +254,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Viŝas la ek-tempon de tasko"
-#define STRING_CMD_STOP_NO           "Tasko ne haltita."
-#define STRING_CMD_STOP_ALREADY      "Tasko {1} '{2}' ne ekita."
-#define STRING_CMD_STOP_TASK         "Haltanta taskon {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Halti taskon {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Haltis {1} taskon."
-#define STRING_CMD_STOP_N            "Haltis {1} taskojn."
-
 #define STRING_CMD_APPEND_USAGE      "Aldonas tekston post task-priskribo"
 #define STRING_CMD_APPEND_1          "Aldonis al {1} tasko."
 #define STRING_CMD_APPEND_N          "Aldonis al {1} taskoj."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 979ae8c42..d8a92fa96 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -262,15 +262,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Elimina el tiempo de 'comienzo' de una tarea"
-
-#define STRING_CMD_STOP_NO           "Tarea no detenida."
-#define STRING_CMD_STOP_ALREADY      "Tarea {1} '{2}' no comenzada."
-#define STRING_CMD_STOP_TASK         "Deteniendo tarea {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "¿Detener tarea {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Detenida {1} tarea."
-#define STRING_CMD_STOP_N            "Detenidas {1} tareas."
-
 #define STRING_CMD_APPEND_USAGE      "Añade texto al final de la descripción de una tarea existente"
 #define STRING_CMD_APPEND_1          "Añadiendo texto a {1} tarea."
 #define STRING_CMD_APPEND_N          "Añadiendo texto a {1} tareas."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 0beecd5ee..c62be3994 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -256,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Suppression de l'attribut 'start' d'une tâche"
-#define STRING_CMD_STOP_NO           "Tâche non arrếtée"
-#define STRING_CMD_STOP_ALREADY      "Tâche {1} '{2}' non arrêtée" // Étrange
-#define STRING_CMD_STOP_TASK         "Arrêt de la tâche {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Stop task {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Stopped {1} task."
-#define STRING_CMD_STOP_N            "Stopped {1} tasks."
-
 #define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
 #define STRING_CMD_APPEND_1          "Appended {1} task."
 #define STRING_CMD_APPEND_N          "Appended {1} tasks."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 95d91b0c7..4ce96765b 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -255,14 +255,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Rimuove il tempo di 'avvio' dal task"
-#define STRING_CMD_STOP_NO           "Task non fermato."
-#define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' non fermato."
-#define STRING_CMD_STOP_TASK         "Sto fermando il task {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Fermare task {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Task {1} fermato."
-#define STRING_CMD_STOP_N            "Task {1} fermati."
-
 #define STRING_CMD_APPEND_USAGE      "Aggiunge testo alla fine di una descrizione di un task esistente"
 #define STRING_CMD_APPEND_1          "Aggiunta al task {1}."
 #define STRING_CMD_APPEND_N          "Aggiunte ai task {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index b57669064..634ea0abe 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -256,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Removes the 'start' time from a task"
-#define STRING_CMD_STOP_NO           "Task は停止できません。"
-#define STRING_CMD_STOP_ALREADY      "Task {1} '{2}' は停止できません。"
-#define STRING_CMD_STOP_TASK         "task {1} '{2}' を停止中。"
-#define STRING_CMD_STOP_CONFIRM      "task {1} '{2}' を停止?"
-#define STRING_CMD_STOP_1            "{1} タスク を停止。"
-#define STRING_CMD_STOP_N            "{1} タスク を停止。"
-
 #define STRING_CMD_APPEND_USAGE      "存在する task 説明文にテキストを追加"
 #define STRING_CMD_APPEND_1          "{1} タスク を追加。"
 #define STRING_CMD_APPEND_N          "{1} タスク を追加。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 980c8192d..58381efdb 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -256,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Usuwa marker 'start' z zadania"
-#define STRING_CMD_STOP_NO           "Zadanie nie zatrzymane"
-#define STRING_CMD_STOP_ALREADY      "Zadanie {1} '{2}' nie jest uruchomione"
-#define STRING_CMD_STOP_TASK         "Zatrzymywanie zadania {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Zatrzymać zadanie {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Zatrzymano {1} zadanie."
-#define STRING_CMD_STOP_N            "Zatrzymano {1} zadań."
-
 #define STRING_CMD_APPEND_USAGE      "Dodaje ciąg na końcu opisu zadania"
 #define STRING_CMD_APPEND_1          "Dodano ciąg do opisu {1} zadania"
 #define STRING_CMD_APPEND_N          "Dodano ciąg do opisu {1} zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 27e4bf4ca..f81bb2a2a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -256,14 +256,6 @@
 #define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
 #define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
 
-#define STRING_CMD_STOP_USAGE        "Remove o estado de iniciado 'start' de uma tarefa"
-#define STRING_CMD_STOP_NO           "Tarefa não parada."
-#define STRING_CMD_STOP_ALREADY      "Tarefa {1} '{2}' não iniciada."
-#define STRING_CMD_STOP_TASK         "A parar tarefa {1} '{2}'."
-#define STRING_CMD_STOP_CONFIRM      "Parar tarefa {1} '{2}'?"
-#define STRING_CMD_STOP_1            "Parada {1} tarefa."
-#define STRING_CMD_STOP_N            "Paradas {1} tarefas."
-
 #define STRING_CMD_APPEND_USAGE      "Acrescenta texto à descrição de uma tarefa existente"
 #define STRING_CMD_APPEND_1          "Acrescentada {1} tarefa."
 #define STRING_CMD_APPEND_N          "Acrescentadas {1} tarefas."

From 9244828618a62c1ec304a7c3d21f6fb310994c54 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 15:04:10 -0500
Subject: [PATCH 632/879] l10n: Eliminated STRING_CMD_DONE_*

---
 src/commands/CmdDone.cpp | 12 ++++++------
 src/l10n/deu-DEU.h       |  8 --------
 src/l10n/eng-USA.h       |  8 --------
 src/l10n/epo-RUS.h       |  8 --------
 src/l10n/esp-ESP.h       |  8 --------
 src/l10n/fra-FRA.h       |  8 --------
 src/l10n/ita-ITA.h       |  8 --------
 src/l10n/jpn-JPN.h       |  8 --------
 src/l10n/pol-POL.h       |  8 --------
 src/l10n/por-PRT.h       |  8 --------
 10 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 0d591f022..c066dc185 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -41,7 +41,7 @@ CmdDone::CmdDone ()
 {
   _keyword               = "done";
   _usage                 = "task <filter> done <mods>";
-  _description           = STRING_CMD_DONE_USAGE;
+  _description           = "Marks the specified task as completed";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -80,7 +80,7 @@ int CmdDone::execute (std::string&)
         task.getStatus () == Task::waiting)
     {
       // Complete the specified task.
-      std::string question = format (STRING_CMD_DONE_CONFIRM,
+      std::string question = format ("Complete task {1} '{2}'?",
                                      task.identifier (true),
                                      task.get ("description"));
 
@@ -102,7 +102,7 @@ int CmdDone::execute (std::string&)
         updateRecurrenceMask (task);
         context.tdb2.modify (task);
         ++count;
-        feedback_affected (STRING_CMD_DONE_TASK, task);
+        feedback_affected ("Completed task {1} '{2}'.", task);
         feedback_unblocked (task);
         if (!nagged)
           nagged = nag (task);
@@ -112,7 +112,7 @@ int CmdDone::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DONE_NO << '\n';
+        std::cout << "Task not completed.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -120,7 +120,7 @@ int CmdDone::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_DONE_NOTPEND,
+      std::cout << format ("Task {1} '{2}' is neither pending nor waiting.",
                            task.identifier (true),
                            task.get ("description"))
                 << '\n';
@@ -133,7 +133,7 @@ int CmdDone::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_DONE_1 : STRING_CMD_DONE_N, count);
+  feedback_affected (count == 1 ? "Completed {1} task." : "Completed {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index db0de6306..871f4ce5c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -194,14 +194,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Kennzeichnet die gewählte Aufgabe als erledigt"
-#define STRING_CMD_DONE_CONFIRM      "Aufgabe {1} '{2}' als erledigt kennzeichnen?"
-#define STRING_CMD_DONE_TASK         "Aufgabe {1} '{2}' erledigt."
-#define STRING_CMD_DONE_NO           "Aufgabe nicht erledigt."
-#define STRING_CMD_DONE_NOTPEND      "Aufgabe {1} '{2}' ist weder offen noch aufgeschoben."
-#define STRING_CMD_DONE_1            "{1} Aufgabe erledigt."
-#define STRING_CMD_DONE_N            "{1} Aufgaben erledigt."
-
 #define STRING_CMD_PROJECTS_USAGE    "Zeigt alle genutzten Projektnamen"
 #define STRING_CMD_PROJECTS_USAGE_2  "Zeigt ausschließlich alle genutzten Projektnamen"
 #define STRING_CMD_PROJECTS_NO       "Keine Projekte."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e0a83fd70..3ba43013b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -191,14 +191,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Marks the specified task as completed"
-#define STRING_CMD_DONE_CONFIRM      "Complete task {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Completed task {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Task not completed."
-#define STRING_CMD_DONE_NOTPEND      "Task {1} '{2}' is neither pending nor waiting."
-#define STRING_CMD_DONE_1            "Completed {1} task."
-#define STRING_CMD_DONE_N            "Completed {1} tasks."
-
 #define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
 #define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
 #define STRING_CMD_PROJECTS_NO       "No projects."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 6413acf93..c9a793035 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -194,14 +194,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Markas la specifatan taskon kiel finita"
-#define STRING_CMD_DONE_CONFIRM      "Fini taskon {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Finis taskon {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Tasko nefinita."
-#define STRING_CMD_DONE_NOTPEND      "La tasko {1} '{2}' ne estas ni pendanta ni atendanta."
-#define STRING_CMD_DONE_1            "Finis {1} taskon."
-#define STRING_CMD_DONE_N            "Finis {1} taskojn."
-
 #define STRING_CMD_PROJECTS_USAGE    "Montras la uzatajn projekt-nomojn"
 #define STRING_CMD_PROJECTS_USAGE_2  "Montras sole liston de ĉia uzata projekt-nomo"
 #define STRING_CMD_PROJECTS_NO       "Nenia projekto."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index d8a92fa96..54a0e833d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -202,14 +202,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
 
-#define STRING_CMD_DONE_USAGE        "Marca la tarea especificada como completada"
-#define STRING_CMD_DONE_CONFIRM      "¿Completar tarea {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Completada tarea {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Tarea no completada."
-#define STRING_CMD_DONE_NOTPEND      "La tarea {1} '{2}' no está pendiente ni esperando."
-#define STRING_CMD_DONE_1            "Completada {1} tarea."
-#define STRING_CMD_DONE_N            "Completadas {1} tareas."
-
 #define STRING_CMD_PROJECTS_USAGE    "Muestra todos los nombres de proyecto en uso"
 #define STRING_CMD_PROJECTS_USAGE_2  "Muestra una lista de todos los nombres (solamente) de proyecto en uso"
 #define STRING_CMD_PROJECTS_NO       "No hay proyectos."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index c62be3994..aa0fa6d33 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -196,14 +196,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Marque la tâche spécifiée comme terminée"
-#define STRING_CMD_DONE_CONFIRM      "Terminer la tâche {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Tâche {1} '{2}' terminée."
-#define STRING_CMD_DONE_NO           "Tâche non terminée."
-#define STRING_CMD_DONE_NOTPEND      "Tâche {1} '{2}' n'est plus ni en cours, ni en attente."
-#define STRING_CMD_DONE_1            "{1} tâche terminée."
-#define STRING_CMD_DONE_N            "{1} tâches terminées."
-
 #define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
 #define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
 #define STRING_CMD_PROJECTS_NO       "No projects."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 4ce96765b..7473338ad 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -195,14 +195,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Contrassegna il task specificato come completato"
-#define STRING_CMD_DONE_CONFIRM      "Completare il task {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Task completato {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Task non completato."
-#define STRING_CMD_DONE_NOTPEND      "Il task {1} '{2}' non è ne' pendente ne' in attesa."
-#define STRING_CMD_DONE_1            "Completato {1} task."
-#define STRING_CMD_DONE_N            "Completati {1} task."
-
 #define STRING_CMD_PROJECTS_USAGE    "Mostra tutti i nomi di progetto utilizzati"
 #define STRING_CMD_PROJECTS_USAGE_2  "Mostra solo i nomi di progetto utilizzati"
 #define STRING_CMD_PROJECTS_NO       "Nessun progetto."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 634ea0abe..2de22f97d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -196,14 +196,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Marks the specified task as completed"
-#define STRING_CMD_DONE_CONFIRM      "タスク {1} '{2}' を完了?"
-#define STRING_CMD_DONE_TASK         "タスク {1} '{2}' を完了します。"
-#define STRING_CMD_DONE_NO           "タスク は完了しなかった。"
-#define STRING_CMD_DONE_NOTPEND      "Task {1} '{2}' is neither pending nor waiting."
-#define STRING_CMD_DONE_1            "{1} task を完了。"
-#define STRING_CMD_DONE_N            "{1} task を完了。"
-
 #define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
 #define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
 #define STRING_CMD_PROJECTS_NO       "プロジェクトがない。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 58381efdb..0c52e615e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -196,14 +196,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Oznacza wybrane zadanie jako zakończone"
-#define STRING_CMD_DONE_CONFIRM      "Zakończyć zadanie {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Zakończono zadanie {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Zadanie niezakończone."
-#define STRING_CMD_DONE_NOTPEND      "Zadanie {1} '{2}' nie jest realizowane ani oczekujące."
-#define STRING_CMD_DONE_1            "Zakończono {1} zadanie."
-#define STRING_CMD_DONE_N            "Zakończono {1} zadań."
-
 #define STRING_CMD_PROJECTS_USAGE    "Pokazuje statystyki wszystkich projektów"
 #define STRING_CMD_PROJECTS_USAGE_2  "Pokazuje tylko nazwy prowadzonych projektów"
 #define STRING_CMD_PROJECTS_NO       "Brak projektów"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f81bb2a2a..3b6b9e914 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -196,14 +196,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_DONE_USAGE        "Concluí a tarefa indicada"
-#define STRING_CMD_DONE_CONFIRM      "Concluír tarefa {1} '{2}'?"
-#define STRING_CMD_DONE_TASK         "Concluída tarefa {1} '{2}'."
-#define STRING_CMD_DONE_NO           "Tarefa não concluída."
-#define STRING_CMD_DONE_NOTPEND      "Tarefa {1} '{2}' não está pendente nem em espera."
-#define STRING_CMD_DONE_1            "Concluída {1} tarefa."
-#define STRING_CMD_DONE_N            "Concluída {1} tarefas."
-
 #define STRING_CMD_PROJECTS_USAGE    "Exibe todos os nomes de projeto em uso"
 #define STRING_CMD_PROJECTS_USAGE_2  "Exibe apenas uma lista de todos os nomes de projeto em uso"
 #define STRING_CMD_PROJECTS_NO       "Sem projetos."

From 0daaf05782a456b082bbe729825c05281d035ae7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 15:22:25 -0500
Subject: [PATCH 633/879] l10n: Eliminated STRING_CMD_DIAG_*

---
 src/commands/CmdDiagnostics.cpp | 73 +++++++++++++++------------------
 src/l10n/deu-DEU.h              | 32 ---------------
 src/l10n/eng-USA.h              | 32 ---------------
 src/l10n/epo-RUS.h              | 32 ---------------
 src/l10n/esp-ESP.h              | 31 --------------
 src/l10n/fra-FRA.h              | 32 ---------------
 src/l10n/ita-ITA.h              | 32 ---------------
 src/l10n/jpn-JPN.h              | 32 ---------------
 src/l10n/pol-POL.h              | 32 ---------------
 src/l10n/por-PRT.h              | 32 ---------------
 10 files changed, 34 insertions(+), 326 deletions(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index db5f4cc31..1e9ff63bc 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -33,7 +33,6 @@
 #include <time.h>
 #include <RX.h>
 #include <Context.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 #ifdef HAVE_COMMIT
@@ -44,7 +43,6 @@
 #include <gnutls/gnutls.h>
 #endif
 
-
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -52,7 +50,7 @@ CmdDiagnostics::CmdDiagnostics ()
 {
   _keyword               = "diagnostics";
   _usage                 = "task          diagnostics";
-  _description           = STRING_CMD_DIAG_USAGE;
+  _description           = "Platform, build and environment details";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -79,17 +77,17 @@ int CmdDiagnostics::execute (std::string& output)
       << bold.colorize (PACKAGE_STRING)
       << '\n';
 
-  out << "   " << STRING_CMD_DIAG_PLATFORM << ": " << osName ()
+  out << "   Platform: " << osName ()
       << "\n\n";
 
   // Compiler.
-  out << bold.colorize (STRING_CMD_DIAG_COMPILER)
+  out << bold.colorize ("Compiler")
       << '\n'
 #ifdef __VERSION__
-      << "    " << STRING_CMD_DIAG_VERSION << ": "
+      << "    Version: "
       << __VERSION__ << '\n'
 #endif
-      << "       " << STRING_CMD_DIAG_CAPS << ':'
+      << "       Caps:"
 #ifdef __STDC__
       << " +stdc"
 #endif
@@ -119,18 +117,17 @@ int CmdDiagnostics::execute (std::string& output)
       << '\n';
 
   // Compiler compliance level.
-  out << ' ' << STRING_CMD_DIAG_COMPLIANCE
-      << ": "
+  out << " Compliance: "
       << cppCompliance ()
       << "\n\n";
 
-  out << bold.colorize (STRING_CMD_DIAG_FEATURES)
+  out << bold.colorize ("Build Features")
       << '\n'
 
   // Build date.
-      << "      " << STRING_CMD_DIAG_BUILT << ": " << __DATE__ << ' ' << __TIME__ << '\n'
+      << "      Built: " << __DATE__ << ' ' << __TIME__ << '\n'
 #ifdef HAVE_COMMIT
-      << "     " << STRING_CMD_DIAG_COMMIT << ": " << COMMIT << '\n'
+      << "     Commit: " << COMMIT << '\n'
 #endif
       << "      CMake: " << CMAKE_VERSION << '\n';
 
@@ -164,12 +161,12 @@ int CmdDiagnostics::execute (std::string& output)
 
   // Config: .taskrc found, readable, writable
   File rcFile (context.config.file ());
-  out << bold.colorize (STRING_CMD_DIAG_CONFIG)
+  out << bold.colorize ("Configuration")
       << '\n'
       << "       File: " << rcFile._data << ' '
       << (rcFile.exists ()
-           ? STRING_CMD_DIAG_FOUND
-           : STRING_CMD_DIAG_MISSING)
+           ? "(found)"
+           : "(missing)")
       << ", " << rcFile.size () << ' ' << "bytes"
       << ", mode "
       << std::setbase (8)
@@ -180,8 +177,8 @@ int CmdDiagnostics::execute (std::string& output)
   File location (context.config.get ("data.location"));
   out << "       Data: " << location._data << ' '
       << (location.exists ()
-           ? STRING_CMD_DIAG_FOUND
-           : STRING_CMD_DIAG_MISSING)
+           ? "(found)"
+           : "(missing)")
       << ", " << (location.is_directory () ? "dir" : "?")
       << ", mode "
       << std::setbase (8)
@@ -202,14 +199,14 @@ int CmdDiagnostics::execute (std::string& output)
 
   out << "    Locking: "
       << (context.config.getBoolean ("locking")
-           ? STRING_CMD_DIAG_ENABLED
-           : STRING_CMD_DIAG_DISABLED)
+           ? "Enabled"
+           : "Disabled")
       << '\n';
 
   out << "         GC: "
       << (context.config.getBoolean ("gc")
-           ? STRING_CMD_DIAG_ENABLED
-           : STRING_CMD_DIAG_DISABLED)
+           ? "Enabled"
+           : "Disabled")
       << '\n';
 
   // Determine rc.editor/$EDITOR/$VISUAL.
@@ -309,10 +306,10 @@ int CmdDiagnostics::execute (std::string& output)
     hookLocation += "hooks";
   }
 
-  out << bold.colorize (STRING_CMD_DIAG_HOOKS)
+  out << bold.colorize ("Hooks")
       << '\n'
       << "     System: "
-      << (context.config.getBoolean ("hooks") ? STRING_CMD_DIAG_HOOK_ENABLE : STRING_CMD_DIAG_HOOK_DISABLE)
+      << (context.config.getBoolean ("hooks") ? "Enabled" : "Disabled")
       << '\n'
       << "   Location: "
       << static_cast <std::string> (hookLocation)
@@ -346,8 +343,8 @@ int CmdDiagnostics::execute (std::string& output)
 
           out.width (longest);
           out << std::left << name
-              << format (" ({1})", STRING_CMD_DIAG_HOOK_EXEC)
-              << (p.is_link () ? format (" ({1})", STRING_CMD_DIAG_HOOK_SYMLINK) : "")
+              << " (executable)"
+              << (p.is_link () ? " (symlink)" : "")
               << '\n';
         }
       }
@@ -375,12 +372,12 @@ int CmdDiagnostics::execute (std::string& output)
 
           out.width (longest);
           out << std::left << name
-              << (p.executable () ? format (" ({1})", STRING_CMD_DIAG_HOOK_EXEC) : format (" ({1})", STRING_CMD_DIAG_HOOK_NO_EXEC))
-              << (p.is_link () ? format (" ({1})", STRING_CMD_DIAG_HOOK_SYMLINK) : "")
+              << (p.executable () ? " (executable)" : " (not executable)")
+              << (p.is_link () ? " (symlink)" : "")
               << ((name.substr (0, 6) == "on-add" ||
                    name.substr (0, 9) == "on-modify" ||
                    name.substr (0, 9) == "on-launch" ||
-                   name.substr (0, 7) == "on-exit") ? "" : format (" ({1})", STRING_CMD_DIAG_HOOK_NAME))
+                   name.substr (0, 7) == "on-exit") ? "" : "unrecognized hook name")
               << '\n';
         }
       }
@@ -390,12 +387,12 @@ int CmdDiagnostics::execute (std::string& output)
       out << '\n';
   }
   else
-    out << format ("             ({1})\n", STRING_CMD_DIAG_NONE);
+    out << "             (-none-)\n";
 
   out << '\n';
 
   // Verify UUIDs are all unique.
-  out << bold.colorize (STRING_CMD_DIAG_TESTS)
+  out << bold.colorize ("Tests")
       << '\n';
 
   // Report terminal dimensions.
@@ -420,25 +417,24 @@ int CmdDiagnostics::execute (std::string& output)
   }
 
   out << "       Dups: "
-      << format (STRING_CMD_DIAG_UUID_SCAN, all.size ())
+      << format ("Scanned {1} tasks for duplicate UUIDs:", all.size ())
       << '\n';
 
   if (dups.size ())
   {
     for (auto& d : dups)
-      out << "             " << format (STRING_CMD_DIAG_UUID_DUP, d) << '\n';
+      out << "             " << format ("Found duplicate {1}", d) << '\n';
   }
   else
   {
-    out << "             " << STRING_CMD_DIAG_UUID_NO_DUP
-        << '\n';
+    out << "             No duplicates found\n";
   }
 
   // Check all the UUID references
 
   bool noBrokenRefs = true;
   out << " Broken ref: "
-      << format (STRING_CMD_DIAG_REF_SCAN, all.size ())
+      << format ("Scanned {1} tasks for broken references:", all.size ())
       << '\n';
 
   for (auto& task : all)
@@ -449,7 +445,7 @@ int CmdDiagnostics::execute (std::string& output)
       if (! context.tdb2.has (uuid))
       {
         out << "             "
-            << format (STRING_CMD_DIAG_MISS_DEP, task.get ("uuid"), uuid)
+            << format ("Task {1} depends on nonexistent task: {2}", task.get ("uuid"), uuid)
             << '\n';
         noBrokenRefs = false;
       }
@@ -461,15 +457,14 @@ int CmdDiagnostics::execute (std::string& output)
     if (parentUUID != "" && ! context.tdb2.has (parentUUID))
     {
       out << "             "
-          << format (STRING_CMD_DIAG_MISS_PAR, task.get ("uuid"), parentUUID)
+          << format ("Task {1} has nonexistent recurrence template {2}", task.get ("uuid"), parentUUID)
           << '\n';
       noBrokenRefs = false;
     }
   }
 
   if (noBrokenRefs)
-    out << "             " << STRING_CMD_DIAG_REF_OK
-        << '\n';
+    out << "             No broken references found\n";
 
   out << '\n';
   output = out.str ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 871f4ce5c..4a8d4380f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -315,38 +315,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "Entweder ein CA-Zertifikat bereitstellen oder Prüfung deaktivieren, nicht jedoch beides."
 #define STRING_CMD_SYNC_TRUST_OBS    "Erlaubte Werte der 'taskd.trust'-Option sind nur noch 'strict', 'ignore hostname' und 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
-#define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_COMPILER     "Compiler"
-#define STRING_CMD_DIAG_VERSION      "Version"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Build Features"
-#define STRING_CMD_DIAG_BUILT        "Built"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(found)"
-#define STRING_CMD_DIAG_MISSING      "(missing)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Enabled"
-#define STRING_CMD_DIAG_DISABLED     "Disabled"
-#define STRING_CMD_DIAG_CONFIG       "Configuration"
-#define STRING_CMD_DIAG_TESTS        "Tests"
-#define STRING_CMD_DIAG_UUID_SCAN    "Scanned {1} tasks for duplicate UUIDs:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Found duplicate {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No duplicates found"
-#define STRING_CMD_DIAG_NONE         "-none-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Erzeugt eine Liste aller Befehle zur ZSH-Auto-Verfollständigung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3ba43013b..d365bf66e 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -312,38 +312,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
-#define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_COMPILER     "Compiler"
-#define STRING_CMD_DIAG_VERSION      "Version"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Build Features"
-#define STRING_CMD_DIAG_BUILT        "Built"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(found)"
-#define STRING_CMD_DIAG_MISSING      "(missing)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Enabled"
-#define STRING_CMD_DIAG_DISABLED     "Disabled"
-#define STRING_CMD_DIAG_CONFIG       "Configuration"
-#define STRING_CMD_DIAG_TESTS        "Tests"
-#define STRING_CMD_DIAG_UUID_SCAN    "Scanned {1} tasks for duplicate UUIDs:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Found duplicate {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No duplicates found"
-#define STRING_CMD_DIAG_NONE         "-none-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c9a793035..d5e3079b3 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -315,38 +315,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
-#define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_COMPILER     "Compiler"
-#define STRING_CMD_DIAG_VERSION      "Version"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Build Features"
-#define STRING_CMD_DIAG_BUILT        "Built"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(found)"
-#define STRING_CMD_DIAG_MISSING      "(missing)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Enabled"
-#define STRING_CMD_DIAG_DISABLED     "Disabled"
-#define STRING_CMD_DIAG_CONFIG       "Configuration"
-#define STRING_CMD_DIAG_TESTS        "Tests"
-#define STRING_CMD_DIAG_UUID_SCAN    "Scanned {1} tasks for duplicate UUIDs:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Found duplicate {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No duplicates found"
-#define STRING_CMD_DIAG_NONE         "-none-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 54a0e833d..f39a2a14e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -298,7 +298,6 @@
 #define STRING_TASK_NO_DESC          "La anotación carece de descripción: {1}"
 #define STRING_TASK_NO_ENTRY         "La anotación carece de fecha de entrada: {1}"
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
 #define STRING_CMD_SYNC_USAGE        "Sincroniza datos con el Servidor Task"
 #define STRING_CMD_SYNC_NO_SERVER    "El Servidor Task no está configurado."
 #define STRING_CMD_SYNC_BAD_CRED     "Credenciales del Servidor Task incorrectas."
@@ -324,36 +323,6 @@
 #define STRING_CMD_SYNC_BAD_CA       "Certificado CA no encontrado."
 #define STRING_CMD_SYNC_TRUST_CA     "Debe proveer un certificado CA o la verificación de sobrescritura, pero no ambos."
 #define STRING_CMD_SYNC_TRUST_OBS    "Los ajustes de 'taskd.trust' ahora solo pueden contener uno de los valores 'strict', 'ignore hostname' o 'allow all'."
-#define STRING_CMD_DIAG_USAGE        "Detalles de plataforma, construcción y entorno"
-#define STRING_CMD_DIAG_PLATFORM     "Plataforma"
-#define STRING_CMD_DIAG_COMPILER     "Compilador"
-#define STRING_CMD_DIAG_VERSION      "Versión"
-#define STRING_CMD_DIAG_CAPS         "Capacidades"
-#define STRING_CMD_DIAG_COMPLIANCE   "Conformidad"
-#define STRING_CMD_DIAG_FEATURES     "Características Constructivas"
-#define STRING_CMD_DIAG_BUILT        "Construido"
-#define STRING_CMD_DIAG_COMMIT       "Commit"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_DIAG_FOUND        "(encontrado)"
-#define STRING_CMD_DIAG_MISSING      "(no encontrado)"
-#define STRING_CMD_DIAG_MISS_DEP     "La tarea {1} depende de la tarea inexistente: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "La tarea {1} tiene un modelo de recurrencia inexistente {2}"
-#define STRING_CMD_DIAG_ENABLED      "Habilitado"
-#define STRING_CMD_DIAG_DISABLED     "deshabilitado"
-#define STRING_CMD_DIAG_CONFIG       "Configuración"
-#define STRING_CMD_DIAG_TESTS        "Comprobaciones"
-#define STRING_CMD_DIAG_UUID_SCAN    "Exploradas {1} tareas buscando UUIDs duplicados:"
-#define STRING_CMD_DIAG_REF_SCAN     "Exploradas {1} tareas buscando referencias rotas:"
-#define STRING_CMD_DIAG_REF_OK       "No se encontraron referencias rotas"
-#define STRING_CMD_DIAG_UUID_DUP     "Encontrado duplicado {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No se encontraron duplicados"
-#define STRING_CMD_DIAG_NONE         "-ninguno-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_DIAG_HOOK_NAME    "nombre de hook no reconocido"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_DIAG_HOOK_EXEC    "ejecutable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "no ejecutable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Habilitado"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Inhabilitado"
 
 #define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index aa0fa6d33..063d7b1a2 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -317,38 +317,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
-#define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_COMPILER     "Compiler"
-#define STRING_CMD_DIAG_VERSION      "Version"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Build Features"
-#define STRING_CMD_DIAG_BUILT        "Built"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(found)"
-#define STRING_CMD_DIAG_MISSING      "(missing)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Enabled"
-#define STRING_CMD_DIAG_DISABLED     "Disabled"
-#define STRING_CMD_DIAG_CONFIG       "Configuration"
-#define STRING_CMD_DIAG_TESTS        "Tests"
-#define STRING_CMD_DIAG_UUID_SCAN    "Scanned {1} tasks for duplicate UUIDs:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Found duplicate {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No duplicates found"
-#define STRING_CMD_DIAG_NONE         "-none-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7473338ad..c2d14e684 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -316,38 +316,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Dettagli su piattaforma, build e ambiente"
-#define STRING_CMD_DIAG_PLATFORM     "Piattaforma"
-#define STRING_CMD_DIAG_COMPILER     "Compilatore"
-#define STRING_CMD_DIAG_VERSION      "Versione"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Caratteristiche della Build"
-#define STRING_CMD_DIAG_BUILT        "Generato"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(trovato)"
-#define STRING_CMD_DIAG_MISSING      "(mancante)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Abilitato"
-#define STRING_CMD_DIAG_DISABLED     "Disabilitato"
-#define STRING_CMD_DIAG_CONFIG       "Configurazione"
-#define STRING_CMD_DIAG_TESTS        "Test"
-#define STRING_CMD_DIAG_UUID_SCAN    "Valutati {1} task per duplicazione UUID:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Trovato duplicato {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "Nessun duplicato trovato"
-#define STRING_CMD_DIAG_NONE         "-nessuno-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Genera la lista di tutti i comandi, per autocompletamento in zsh"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 2de22f97d..664f786e3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -317,38 +317,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Platform, build and environment details"
-#define STRING_CMD_DIAG_PLATFORM     "Platform"
-#define STRING_CMD_DIAG_COMPILER     "Compiler"
-#define STRING_CMD_DIAG_VERSION      "Version"
-#define STRING_CMD_DIAG_CAPS         "Caps"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Build Features"
-#define STRING_CMD_DIAG_BUILT        "Built"
-#define STRING_CMD_DIAG_COMMIT       "Commit"
-#define STRING_CMD_DIAG_FOUND        "(found)"
-#define STRING_CMD_DIAG_MISSING      "(missing)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Enabled"
-#define STRING_CMD_DIAG_DISABLED     "Disabled"
-#define STRING_CMD_DIAG_CONFIG       "Configuration"
-#define STRING_CMD_DIAG_TESTS        "Tests"
-#define STRING_CMD_DIAG_UUID_SCAN    "Scanned {1} tasks for duplicate UUIDs:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Found duplicate {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "No duplicates found"
-#define STRING_CMD_DIAG_NONE         "-none-"
-#define STRING_CMD_DIAG_HOOKS        "Hooks"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0c52e615e..0a23f1e01 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -317,38 +317,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "Powinieneś udostępnić certyfikat CA lub nadpisać weryfikację. Wybierz jedną z opcji."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Szczegóły platformy i środowiska budowania"
-#define STRING_CMD_DIAG_PLATFORM     "Platforma"
-#define STRING_CMD_DIAG_COMPILER     "Kompilator"
-#define STRING_CMD_DIAG_VERSION      "Wersja"
-#define STRING_CMD_DIAG_CAPS         "Flagi"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Opcje budowania"
-#define STRING_CMD_DIAG_BUILT        "Zbudowano"
-#define STRING_CMD_DIAG_COMMIT       "Zatwierdzenie"
-#define STRING_CMD_DIAG_FOUND        "(jest)"
-#define STRING_CMD_DIAG_MISSING      "(brak)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Włączone"
-#define STRING_CMD_DIAG_DISABLED     "Wyłączone"
-#define STRING_CMD_DIAG_CONFIG       "Konfiguracja"
-#define STRING_CMD_DIAG_TESTS        "Testy"
-#define STRING_CMD_DIAG_UUID_SCAN    "Zeskanowano {1} zadań w poszukiwaniu zdublowanych UUIDów:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "Znaleziono duplikaty {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "Nie znaleziono duplikatów"
-#define STRING_CMD_DIAG_NONE         "-brak-"
-#define STRING_CMD_DIAG_HOOKS        "Haki"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generuje listę wszystkich poleceń dla funkcji autouzupełniania w powłoce zsh"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 3b6b9e914..f2a61bd45 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -317,38 +317,6 @@
 #define STRING_CMD_SYNC_TRUST_CA     "Deve fornecer um certificado CA ou desactivar a verificação, mas não ambos."
 #define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
-// STRING_CMD_DIAG_* strings all appear on the 'diag' command output.
-#define STRING_CMD_DIAG_USAGE        "Plataforma, versão e detalhes de ambiente"
-#define STRING_CMD_DIAG_PLATFORM     "Plataforma"
-#define STRING_CMD_DIAG_COMPILER     "Compilador"
-#define STRING_CMD_DIAG_VERSION      "Versão"
-#define STRING_CMD_DIAG_CAPS         "Capacidades"
-#define STRING_CMD_DIAG_COMPLIANCE   "Compliance"
-#define STRING_CMD_DIAG_FEATURES     "Características da versão"
-#define STRING_CMD_DIAG_BUILT        "Criado"
-#define STRING_CMD_DIAG_COMMIT       "Commit"  // |por-PRT|==|eng-USA|
-#define STRING_CMD_DIAG_FOUND        "(presente)"
-#define STRING_CMD_DIAG_MISSING      "(em falta)"
-#define STRING_CMD_DIAG_MISS_DEP     "Task {1} depends on nonexistent task: {2}"
-#define STRING_CMD_DIAG_MISS_PAR     "Task {1} has nonexistent recurrence template {2}"
-#define STRING_CMD_DIAG_ENABLED      "Ativado"
-#define STRING_CMD_DIAG_DISABLED     "Desativado"
-#define STRING_CMD_DIAG_CONFIG       "Configuração"
-#define STRING_CMD_DIAG_TESTS        "Testes"
-#define STRING_CMD_DIAG_UUID_SCAN    "UUIDs duplicados em {1} tarefas:"
-#define STRING_CMD_DIAG_REF_SCAN     "Scanned {1} tasks for broken references:"
-#define STRING_CMD_DIAG_REF_OK       "No broken references found"
-#define STRING_CMD_DIAG_UUID_DUP     "UUID duplicado {1}"
-#define STRING_CMD_DIAG_UUID_NO_DUP  "Nenhum duplicado encontrado"
-#define STRING_CMD_DIAG_NONE         "-nenhum-"
-#define STRING_CMD_DIAG_HOOKS        "Âncoras"
-#define STRING_CMD_DIAG_HOOK_NAME    "unrecognized hook name"
-#define STRING_CMD_DIAG_HOOK_SYMLINK "symlink"
-#define STRING_CMD_DIAG_HOOK_EXEC    "executable"
-#define STRING_CMD_DIAG_HOOK_NO_EXEC "not executable"
-#define STRING_CMD_DIAG_HOOK_ENABLE  "Enabled"
-#define STRING_CMD_DIAG_HOOK_DISABLE "Disabled"
-
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Gera uma lista com todos os comandos, para terminação automática em zsh"

From 4e9267eed267c8636725827ec68ea56e6e8cf0c8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 15:34:00 -0500
Subject: [PATCH 634/879] l10n: Eliminated STRING_CMD_SYNC_*

---
 src/commands/CmdSync.cpp | 53 ++++++++++++++++++++--------------------
 src/l10n/deu-DEU.h       | 25 -------------------
 src/l10n/eng-USA.h       | 25 -------------------
 src/l10n/epo-RUS.h       | 25 -------------------
 src/l10n/esp-ESP.h       | 26 --------------------
 src/l10n/fra-FRA.h       | 25 -------------------
 src/l10n/ita-ITA.h       | 25 -------------------
 src/l10n/jpn-JPN.h       | 25 -------------------
 src/l10n/pol-POL.h       | 25 -------------------
 src/l10n/por-PRT.h       | 25 -------------------
 10 files changed, 26 insertions(+), 253 deletions(-)

diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index dea0e120c..19a8ad6f2 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -35,7 +35,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -44,7 +43,7 @@ CmdSync::CmdSync ()
 {
   _keyword               = "synchronize";
   _usage                 = "task          synchronize [initialize]";
-  _description           = STRING_CMD_SYNC_USAGE;
+  _description           = "Synchronizes data with the Taskserver";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -74,10 +73,10 @@ int CmdSync::execute (std::string& output)
     if (closeEnough ("initialize", word, 4))
     {
       if (!context.config.getBoolean ("confirmation") ||
-          confirm (STRING_CMD_SYNC_INIT))
+          confirm ("Please confirm that you wish to upload all your tasks to the Taskserver"))
         first_time_init = true;
       else
-        throw std::string (STRING_CMD_SYNC_NO_INIT);
+        throw std::string ("Taskwarrior will not proceed with first-time sync initialization.");
     }
   }
 
@@ -85,23 +84,23 @@ int CmdSync::execute (std::string& output)
   std::string connection = context.config.get ("taskd.server");
   if (connection == "" ||
       connection.rfind (':') == std::string::npos)
-    throw std::string (STRING_CMD_SYNC_NO_SERVER);
+    throw std::string ("Taskserver is not configured.");
 
   // Obtain credentials.
   std::string credentials_string = context.config.get ("taskd.credentials");
   if (credentials_string == "")
-    throw std::string (STRING_CMD_SYNC_BAD_CRED);
+    throw std::string ("Taskserver credentials malformed.");
 
   auto credentials = split (credentials_string, '/');
   if (credentials.size () != 3)
-    throw std::string (STRING_CMD_SYNC_BAD_CRED);
+    throw std::string ("Taskserver credentials malformed.");
 
   // This was a Boolean value in 2.3.0, and is a tri-state since 2.4.0.
   std::string trust_value = context.config.get ("taskd.trust");
   if (trust_value != "strict" &&
       trust_value != "ignore hostname" &&
       trust_value != "allow all")
-    throw std::string (STRING_CMD_SYNC_TRUST_OBS);
+    throw std::string ("The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'.");
 
   enum TLSClient::trust_level trust = TLSClient::strict;
   if (trust_value  == "allow all")
@@ -112,18 +111,18 @@ int CmdSync::execute (std::string& output)
   // CA must exist, if provided.
   File ca (context.config.get ("taskd.ca"));
   if (ca._data != "" && ! ca.exists ())
-    throw std::string (STRING_CMD_SYNC_BAD_CA);
+    throw std::string ("CA certificate not found.");
 
   if (trust == TLSClient::allow_all && ca._data != "")
-    throw std::string (STRING_CMD_SYNC_TRUST_CA);
+    throw std::string ("You should either provide a CA certificate or override verification, but not both.");
 
   File certificate (context.config.get ("taskd.certificate"));
   if (! certificate.exists ())
-    throw std::string (STRING_CMD_SYNC_BAD_CERT);
+    throw std::string ("Taskserver certificate missing.");
 
   File key (context.config.get ("taskd.key"));
   if (! key.exists ())
-    throw std::string (STRING_CMD_SYNC_BAD_KEY);
+    throw std::string ("Taskserver key missing.");
 
   // If this is a first-time initialization, send pending.data and
   // completed.data, but not backlog.data.
@@ -171,7 +170,7 @@ int CmdSync::execute (std::string& output)
   request.setPayload (payload);
 
   if (context.verbose ("sync"))
-    out << format (STRING_CMD_SYNC_PROGRESS, connection)
+    out << format ("Syncing with {1}", connection)
         << '\n';
 
   // Ignore harmful signals.
@@ -223,7 +222,7 @@ int CmdSync::execute (std::string& output)
             if (context.verbose ("sync"))
               out << "  "
                   << colorChanged.colorize (
-                       format (STRING_CMD_SYNC_MOD,
+                       format ("modify {1} '{2}'",
                                uuid,
                                from_server.get ("description")))
                   << '\n';
@@ -234,7 +233,7 @@ int CmdSync::execute (std::string& output)
             if (context.verbose ("sync"))
               out << "  "
                   << colorAdded.colorize (
-                       format (STRING_CMD_SYNC_ADD,
+                       format ("   add {1} '{2}'",
                                uuid,
                                from_server.get ("description")))
                   << '\n';
@@ -263,38 +262,38 @@ int CmdSync::execute (std::string& output)
         // Present a clear status message.
         if (upload_count == 0 && download_count == 0)
           // Note: should not happen - expect code 201 instead.
-          context.footnote (STRING_CMD_SYNC_SUCCESS0);
+          context.footnote ("Sync successful.");
         else if (upload_count == 0 && download_count > 0)
-          context.footnote (format (STRING_CMD_SYNC_SUCCESS2, download_count));
+          context.footnote (format ("Sync successful.  {1} changes downloaded.", download_count));
         else if (upload_count > 0 && download_count == 0)
-          context.footnote (format (STRING_CMD_SYNC_SUCCESS1, upload_count));
+          context.footnote (format ("Sync successful.  {1} changes uploaded.", upload_count));
         else if (upload_count > 0 && download_count > 0)
-          context.footnote (format (STRING_CMD_SYNC_SUCCESS3, upload_count, download_count));
+          context.footnote (format ("Sync successful.  {1} changes uploaded, {2} changes downloaded.", upload_count, download_count));
       }
 
       status = 0;
     }
     else if (code == "201")
     {
-      context.footnote (STRING_CMD_SYNC_SUCCESS_NOP);
+      context.footnote ("Sync successful.  No changes.");
       status = 0;
     }
     else if (code == "301")
     {
       std::string new_server = response.get ("info");
       context.config.set ("taskd.server", new_server);
-      context.error (STRING_CMD_SYNC_RELOCATE0);
-      context.error ("  " + format (STRING_CMD_SYNC_RELOCATE1, new_server));
+      context.error ("The server account has been relocated.  Please update your configuration using:");
+      context.error ("  " + format ("task config taskd.server {1}", new_server));
       status = 2;
     }
     else if (code == "430")
     {
-      context.error (STRING_CMD_SYNC_FAIL_ACCOUNT);
+      context.error ("Sync failed.  Either your credentials are incorrect, or your account doesn't exist on the Taskserver.");
       status = 2;
     }
     else
     {
-      context.error (format (STRING_CMD_SYNC_FAIL_ERROR,
+      context.error (format ("Sync failed.  The Taskserver returned error: {1} {2}",
                              code,
                              response.get ("status")));
       status = 2;
@@ -320,7 +319,7 @@ int CmdSync::execute (std::string& output)
   //   - No signal/cable
   else
   {
-    context.error (STRING_CMD_SYNC_FAIL_CONNECT);
+    context.error ("Sync failed.  Could not connect to the Taskserver.");
     status = 1;
   }
 
@@ -338,7 +337,7 @@ int CmdSync::execute (std::string& output)
 
 #else
   // Without GnuTLS found at compile time, there is no working sync command.
-  throw std::string (STRING_CMD_SYNC_NO_TLS);
+  throw std::string ("Taskwarrior was built without GnuTLS support.  Sync is not available.");
 #endif
   return status;
 }
@@ -358,7 +357,7 @@ bool CmdSync::send (
   // IPv6 addresses.
   auto colon = to.rfind (':');
   if (colon == std::string::npos)
-    throw format (STRING_CMD_SYNC_BAD_SERVER, to);
+    throw format ("Sync failed.  Malformed configuration setting '{1}'", to);
 
   std::string server = to.substr (0, colon);
   std::string port = to.substr (colon + 1);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4a8d4380f..43ffb01f5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -289,31 +289,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Kommentar fehlt Beschreibung: {1}"
 #define STRING_TASK_NO_ENTRY         "Kommentar fehlt Erfassungsdatum: {1}"
-#define STRING_CMD_SYNC_USAGE        "Gleicht Daten mit dem Task-Server ab"
-#define STRING_CMD_SYNC_NO_SERVER    "Task-Server nicht konfiguriert."
-#define STRING_CMD_SYNC_BAD_CRED     "Task-Server-Zugangsdaten in falschem Format."
-#define STRING_CMD_SYNC_BAD_CERT     "Task-Server-Zertifikat fehlt."
-#define STRING_CMD_SYNC_BAD_KEY      "Task-Server-Schlüssel fehlt."
-#define STRING_CMD_SYNC_ADD          "hinzugefügt {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "  verändert {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Datenabgleich mit {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Datenabgleich erfolgreich."
-#define STRING_CMD_SYNC_SUCCESS1     "Datenabgleich erfolgreich.  {1} Änderung(en) gesendet."
-#define STRING_CMD_SYNC_SUCCESS2     "Datenabgleich erfolgreich.  {1} Änderung(en) empfangen."
-#define STRING_CMD_SYNC_SUCCESS3     "Datenabgleich erfolgreich.  {1} Änderung(en) gesendet, {2} Änderung(en) empfangen."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Datenabgleich erfolgreich.  Keine Änderungen."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Datenabgleich fehlgeschlagen.  Zugangsdaten falsch oder Konto auf Task-Server nicht aktiviert."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Datenabgleich fehlgeschlagen.  Der Task-Server hat einen Fehler zurückgeliefert: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Datenabgleich fehlgeschlagen.  Konnte nicht mit dem Task-Server verbinden."
-#define STRING_CMD_SYNC_BAD_SERVER   "Datenabgleich fehlgeschlagen.  Fehlerhafte Konfiguration '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior wurde ohne GnuTLS-Unterstützung gebaut.  Datenabgleich ist nicht verfügbar."
-#define STRING_CMD_SYNC_INIT         "Alle offenen Aufgaben an den Task-Server senden?"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior wird nicht mit dem erstmaligen Datenabgleich fortfahren."
-#define STRING_CMD_SYNC_RELOCATE0    "Das Server-Konto wurde verschoben.  Bitte Konfiguration folgendermaßen ändern:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA-Zertifikat nicht gefunden."
-#define STRING_CMD_SYNC_TRUST_CA     "Entweder ein CA-Zertifikat bereitstellen oder Prüfung deaktivieren, nicht jedoch beides."
-#define STRING_CMD_SYNC_TRUST_OBS    "Erlaubte Werte der 'taskd.trust'-Option sind nur noch 'strict', 'ignore hostname' und 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d365bf66e..29124da30 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -286,31 +286,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
 #define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_CMD_SYNC_USAGE        "Synchronizes data with the Taskserver"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver is not configured."
-#define STRING_CMD_SYNC_BAD_CRED     "Taskserver credentials malformed."
-#define STRING_CMD_SYNC_BAD_CERT     "Taskserver certificate missing."
-#define STRING_CMD_SYNC_BAD_KEY      "Taskserver key missing."
-#define STRING_CMD_SYNC_ADD          "   add {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modify {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Syncing with {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sync successful."
-#define STRING_CMD_SYNC_SUCCESS1     "Sync successful.  {1} changes uploaded."
-#define STRING_CMD_SYNC_SUCCESS2     "Sync successful.  {1} changes downloaded."
-#define STRING_CMD_SYNC_SUCCESS3     "Sync successful.  {1} changes uploaded, {2} changes downloaded."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sync successful.  No changes."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sync failed.  Either your credentials are incorrect, or your account doesn't exist on the Taskserver."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Sync failed.  The Taskserver returned error: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed.  Could not connect to the Taskserver."
-#define STRING_CMD_SYNC_BAD_SERVER   "Sync failed.  Malformed configuration setting '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
-#define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d5e3079b3..9c2da5e30 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -289,31 +289,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Komento havas mankon de priskribo: {1}"
 #define STRING_TASK_NO_ENTRY         "Komento havas mankon de enskrib-dato: {1}"
-#define STRING_CMD_SYNC_USAGE        "Sinkronigas datumojn kun la Taskserver"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver ne estas agordita."
-#define STRING_CMD_SYNC_BAD_CRED     "Taskserver-akreditaĵoj malbone formataj."
-#define STRING_CMD_SYNC_BAD_CERT     "Taskserver-atestilo mankas."
-#define STRING_CMD_SYNC_BAD_KEY      "Taskserver-ĉifrigilo mankas."
-#define STRING_CMD_SYNC_ADD          "   add {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modify {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Sinkroniganta kun {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sukcesis sinkronigi."
-#define STRING_CMD_SYNC_SUCCESS1     "Sukcesis sinkronigi.  Alŝutis {1} ŝanĝojn."
-#define STRING_CMD_SYNC_SUCCESS2     "Sukcesis sinkronigi.  Elŝutis {1} ŝanĝojn."
-#define STRING_CMD_SYNC_SUCCESS3     "Sukcesis sinkronigi.  Alŝutis {1} ŝanĝojn, elŝutis {2}."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sukcesis sinkronigi.  Ne ŝanĝis nenion."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Malsukcesis sinkronigi.  Aŭ viaj akreditaĵoj estas malkorekta, aŭ via Taskserver-konto ne estas ebligata."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Malsukcesis sinkronigi.  La Taskserver redonis eraron: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Malsukcesis sinkronigi.  Ne povis konekti al la Taskserver."
-#define STRING_CMD_SYNC_BAD_SERVER   "Malsukcesis sinkronigi.  Agordo '{1}' ne rekonata"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior estis kompilata sen GnuTLS-subteno.  Sinkronigado ne estas disponebla."
-#define STRING_CMD_SYNC_INIT         "Bonvolu konfirmi, ke vi volas alŝuti ĉian pendantan taskon al la Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior ne procedos inicialigi sinkronigadon."
-#define STRING_CMD_SYNC_RELOCATE0    "La servila konto transloĝiĝis.  Bonvolu aktualigi via agordo kun:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index f39a2a14e..af598149b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -298,32 +298,6 @@
 #define STRING_TASK_NO_DESC          "La anotación carece de descripción: {1}"
 #define STRING_TASK_NO_ENTRY         "La anotación carece de fecha de entrada: {1}"
 
-#define STRING_CMD_SYNC_USAGE        "Sincroniza datos con el Servidor Task"
-#define STRING_CMD_SYNC_NO_SERVER    "El Servidor Task no está configurado."
-#define STRING_CMD_SYNC_BAD_CRED     "Credenciales del Servidor Task incorrectas."
-#define STRING_CMD_SYNC_BAD_CERT     "Certificado del Servidor Task no encontrado."
-#define STRING_CMD_SYNC_BAD_KEY      "Clave del Servidor Task no encontrada."
-#define STRING_CMD_SYNC_ADD          "   añade {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modifica {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Sincronizando con {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sincronización correcta."
-#define STRING_CMD_SYNC_SUCCESS1     "Sincronización correcta. {1} cambios enviados."
-#define STRING_CMD_SYNC_SUCCESS2     "Sincronización correcta. {1} cambios recibidos."
-#define STRING_CMD_SYNC_SUCCESS3     "Sincronización correcta. {1} cambios enviados, {2} cambios recibidos."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sincronización correcta. No hay cambios"
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronización fallida. O bien sus credenciales son incorrectas, o su cuenta en el servidor Task no existe."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Sincronización fallida. El Servidor Task devolvió error: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronización fallida. No se pudo conectar con el Servidor Task."
-#define STRING_CMD_SYNC_BAD_SERVER   "Sincronización fallida. Ajuste de configuración '{1}' incorrecto"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior fue construido sin soporte GnuTLS. Sincronización no disponible."
-#define STRING_CMD_SYNC_INIT         "Por favor, confirme que desea subir todas sus tareas pendientes al Servidor Task"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior no procederá a la inicialización de la sincronización por primera vez."
-#define STRING_CMD_SYNC_RELOCATE0    "La cuenta del servidor ha sido reubicada. Por favor, actualice su configuración utilizando:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"   // |esp-ESP|==|eng-USA|
-#define STRING_CMD_SYNC_BAD_CA       "Certificado CA no encontrado."
-#define STRING_CMD_SYNC_TRUST_CA     "Debe proveer un certificado CA o la verificación de sobrescritura, pero no ambos."
-#define STRING_CMD_SYNC_TRUST_OBS    "Los ajustes de 'taskd.trust' ahora solo pueden contener uno de los valores 'strict', 'ignore hostname' o 'allow all'."
-
 #define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado zsh"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 063d7b1a2..f0ac7e10e 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -291,31 +291,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
 #define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_CMD_SYNC_USAGE        "Synchronizes data with the Taskserver"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver is not configured."
-#define STRING_CMD_SYNC_BAD_CRED     "Taskserver credentials malformed."
-#define STRING_CMD_SYNC_BAD_CERT     "Taskserver certificate missing."
-#define STRING_CMD_SYNC_BAD_KEY      "Taskserver key missing."
-#define STRING_CMD_SYNC_ADD          "   add {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modify {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Syncing with {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sync successful."
-#define STRING_CMD_SYNC_SUCCESS1     "Sync successful.  {1} changes uploaded."
-#define STRING_CMD_SYNC_SUCCESS2     "Sync successful.  {1} changes downloaded."
-#define STRING_CMD_SYNC_SUCCESS3     "Sync successful.  {1} changes uploaded, {2} changes downloaded."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sync successful.  No changes."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sync failed.  Either your credentials are incorrect, or your account doesn't exist on the Taskserver."
-#define STRING_CMD_SYNC_FAIL_ERROR   "La synchrniqation a échouée.  Taskserver a renvoyé l'erreur: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed.  Could not connect to the Taskserver."
-#define STRING_CMD_SYNC_BAD_SERVER   "Sync failed.  Malformed configuration setting '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
-#define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index c2d14e684..81e531449 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -290,31 +290,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Annotazione senza descrizione: {1}"
 #define STRING_TASK_NO_ENTRY         "Annotazione senza data di immissione: {1}"
-#define STRING_CMD_SYNC_USAGE        "Sincronizza i dati con il Taskserver"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver non configurato."
-#define STRING_CMD_SYNC_BAD_CRED     "Credenziali del Taskserver malformate."
-#define STRING_CMD_SYNC_BAD_CERT     "Taskserver certificate missing."
-#define STRING_CMD_SYNC_BAD_KEY      "Taskserver key missing."
-#define STRING_CMD_SYNC_ADD          "   aggiunto {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modificato {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Sincronizzazione con {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sincronizzazione effettuata."
-#define STRING_CMD_SYNC_SUCCESS1     "Sincronizzazione effettuata.  {1} modifiche caricate."
-#define STRING_CMD_SYNC_SUCCESS2     "Sincronizzazione effettuata.  {1} modifiche scaricate."
-#define STRING_CMD_SYNC_SUCCESS3     "Sincronizzazione effettuata.  {1} modifiche caricate, {2} modifiche scaricate."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sincronizzazione effettuata.  Nessuna modifica."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronizzazione fallita.  Credenziali non corrette o Taskserver non abilitato."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Sincronizzazione fallita.  Il Taskserver ha ritornato l'errore: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronizzazione fallita.  Impossibile connettersi al Taskserver."
-#define STRING_CMD_SYNC_BAD_SERVER   "Sincronizzazione fallita.  Impostazione di configurazione '{1}' malformata"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior was built without GnuTLS support.  Sync is not available."
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
-#define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA certificate not found."
-#define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 664f786e3..69db8e6b7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -291,31 +291,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
 #define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_CMD_SYNC_USAGE        "Taskserver とデータを同期"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver が構成されていません。"
-#define STRING_CMD_SYNC_BAD_CRED     "Taskserver credentials malformed."
-#define STRING_CMD_SYNC_BAD_CERT     "Taskserver certificate missing."
-#define STRING_CMD_SYNC_BAD_KEY      "Taskserver key がありません。"
-#define STRING_CMD_SYNC_ADD          "   add {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modify {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "{1} と同期中"
-#define STRING_CMD_SYNC_SUCCESS0     "同期成功。"
-#define STRING_CMD_SYNC_SUCCESS1     "同期成功。  {1} 件の変更がアップロードされました。"
-#define STRING_CMD_SYNC_SUCCESS2     "同期成功。  {1} 件の変更がダウンロードされました。"
-#define STRING_CMD_SYNC_SUCCESS3     "同期成功。  {1} の変更がアップロードされ、{2} 件の本坑がダウンロードされました。"
-#define STRING_CMD_SYNC_SUCCESS_NOP  "同期成功。変更はありません。"
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "同期失敗。 認証情報が不正か Taskserver のアカウントが有効になっていません。"
-#define STRING_CMD_SYNC_FAIL_ERROR   "同期失敗。 Taskserver がエラー: {1} {2} を返した"
-#define STRING_CMD_SYNC_FAIL_CONNECT "同期失敗。 Taskserverに接続できない。"
-#define STRING_CMD_SYNC_BAD_SERVER   "同期失敗。 不正な形式の設定 '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior はGnuTLSサポートなしで構成されています。同期は無効です。"
-#define STRING_CMD_SYNC_INIT         "Please confirm that you wish to upload all your tasks to the Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior will not proceed with first-time sync initialization."
-#define STRING_CMD_SYNC_RELOCATE0    "The server account has been relocated.  Please update your configuration using:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "CA certificate が見つからない。"
-#define STRING_CMD_SYNC_TRUST_CA     "You should either provide a CA certificate or override verification, but not both."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0a23f1e01..ab514df14 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -291,31 +291,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Komentarz nie posiada treści: {1}"
 #define STRING_TASK_NO_ENTRY         "Komentarz nie posiada daty utworzenia: {1}"
-#define STRING_CMD_SYNC_USAGE        "Synchronizuje dane z serwerem zadań"
-#define STRING_CMD_SYNC_NO_SERVER    "Serwer zadań jest nieskonfigurowany."
-#define STRING_CMD_SYNC_BAD_CRED     "Zaburzone uwierzytelnianie dla serwera zadań."
-#define STRING_CMD_SYNC_BAD_CERT     "Nieznaleziony certyfikat serwera zadań."
-#define STRING_CMD_SYNC_BAD_KEY      "Nieznaleziony klucz serwera zadań."
-#define STRING_CMD_SYNC_ADD          "   dodaj {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modyfikuj {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "Synchronizacja z {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Synchronizacja udana"
-#define STRING_CMD_SYNC_SUCCESS1     "Synchronizacja udana.  {1} wysłanych zmian."
-#define STRING_CMD_SYNC_SUCCESS2     "Synchronizacja udana.  {1} ściągniętych zmian."
-#define STRING_CMD_SYNC_SUCCESS3     "Synchronizacja udana.  {1} wysłanych zmian, {2} ściągniętych zmian."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Synchronizacja udana.  Żadnych zmian."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Synchronizacja nieudana.  Nieudane uwierzytelnianie lub nie aktywne konto na serwerze zadań."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Synchronizacja nieudana.  Serwer zadań zwrócił błąd: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Synchronizacja nieudana.  Nie można połączyć się z serwerem zadań."
-#define STRING_CMD_SYNC_BAD_SERVER   "Synchronizacja nieudana.  Uszkodzone ustawienia konfiguracji '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "Taskwarrior zbudowany bez wsparcia dla GnuTLS. Synchronizacja niedostępna."
-#define STRING_CMD_SYNC_INIT         "Proszę potwierdzić zamiar wysłania na serwer zadań wszystkich twoich oczekujących zadań"
-#define STRING_CMD_SYNC_NO_INIT      "Taskwarrior nie wykona inicjalizacji dla pierwszej synchronizacji"
-#define STRING_CMD_SYNC_RELOCATE0    "Konto na serwerze zostało przeniesione.  Proszę uaktualnij swoją konfigurację używając:"
-#define STRING_CMD_SYNC_RELOCATE1    "konfiguracji taskd.server {1}"
-#define STRING_CMD_SYNC_BAD_CA       "Certyfikat CA nie znaleziony."
-#define STRING_CMD_SYNC_TRUST_CA     "Powinieneś udostępnić certyfikat CA lub nadpisać weryfikację. Wybierz jedną z opcji."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f2a61bd45..c93b16b9f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -291,31 +291,6 @@
 #define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_TASK_NO_DESC          "Descrição da anotação em falta: {1}"
 #define STRING_TASK_NO_ENTRY         "Data de entrada da anotação em falta: {1}"
-#define STRING_CMD_SYNC_USAGE        "Sincroniza dados com o Taskserver"
-#define STRING_CMD_SYNC_NO_SERVER    "Taskserver não está configurado."
-#define STRING_CMD_SYNC_BAD_CRED     "Credenciais para o Taskserver incorretas."
-#define STRING_CMD_SYNC_BAD_CERT     "Certificado do Taskserver em falta."
-#define STRING_CMD_SYNC_BAD_KEY      "Chave do Taskserver em falta."
-#define STRING_CMD_SYNC_ADD          "   adiciona {1} '{2}'"
-#define STRING_CMD_SYNC_MOD          "modifica {1} '{2}'"
-#define STRING_CMD_SYNC_PROGRESS     "A sincronizar com {1}"
-#define STRING_CMD_SYNC_SUCCESS0     "Sincronizado com sucesso."
-#define STRING_CMD_SYNC_SUCCESS1     "Sincronizado com sucesso. {1} alterações enviadas."
-#define STRING_CMD_SYNC_SUCCESS2     "Sincronizado com sucesso. {1} alterações recebidas."
-#define STRING_CMD_SYNC_SUCCESS3     "Sincronizado com sucesso. {1} alterações enviadas, {2} alterações recebidas."
-#define STRING_CMD_SYNC_SUCCESS_NOP  "Sincronizado com sucesso. Sem alterações."
-#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronização falhou. As suas credenciais estão incorretas ou a sua conta não existe no Taskserver."
-#define STRING_CMD_SYNC_FAIL_ERROR   "Sincronização falhou. O Taskserver devolveu o seguinte erro: {1} {2}"
-#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronização falhou. Não foi possível contactar ao Taskserver."
-#define STRING_CMD_SYNC_BAD_SERVER   "Sincronização falhou. Erro no parametro de configuração '{1}'"
-#define STRING_CMD_SYNC_NO_TLS       "O Taskwarrior foi compilado sem suporte de GnuTLS. A função de sincronização não está disponível."
-#define STRING_CMD_SYNC_INIT         "Por favor confirme que deseja enviar todas as tarefas pendentes para o Taskserver"
-#define STRING_CMD_SYNC_NO_INIT      "O Taskwarrior não irá executar a sincronização completa de primeira vez."
-#define STRING_CMD_SYNC_RELOCATE0    "A sua conta no servidor foi relocalizada. Por favor ajuste a configuração usando:"
-#define STRING_CMD_SYNC_RELOCATE1    "task config taskd.server {1}"  // |por-PRT|==|eng-USA|
-#define STRING_CMD_SYNC_BAD_CA       "Certificado CA não encontrado."
-#define STRING_CMD_SYNC_TRUST_CA     "Deve fornecer um certificado CA ou desactivar a verificação, mas não ambos."
-#define STRING_CMD_SYNC_TRUST_OBS    "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."
 
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"

From 026ac59326c716ea7945831b82f297d0ebba4742 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 15:40:22 -0500
Subject: [PATCH 635/879] l10n: Eliminated STRING_CMD_MODIFY_*

---
 src/Task.cpp               |  4 ++--
 src/commands/CmdModify.cpp | 19 +++++++++++--------
 src/l10n/deu-DEU.h         | 14 --------------
 src/l10n/eng-USA.h         | 14 --------------
 src/l10n/epo-RUS.h         | 14 --------------
 src/l10n/esp-ESP.h         | 15 ---------------
 src/l10n/fra-FRA.h         | 14 --------------
 src/l10n/ita-ITA.h         | 14 --------------
 src/l10n/jpn-JPN.h         | 14 --------------
 src/l10n/pol-POL.h         | 14 --------------
 src/l10n/por-PRT.h         | 14 --------------
 11 files changed, 13 insertions(+), 137 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index c415f2476..0ac65d278 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -2176,7 +2176,7 @@ void Task::modify (modType type, bool text_required /* = false */)
     }
   }
   else if (! mods && text_required)
-    throw std::string (STRING_CMD_MODIFY_NEED_TEXT);
+    throw std::string ("Additional text must be provided.");
 
   // Modifying completed/deleted tasks generates a message, if the modification
   // does not change status.
@@ -2184,7 +2184,7 @@ void Task::modify (modType type, bool text_required /* = false */)
       getStatus () == originalStatus)
   {
     auto uuid = get ("uuid").substr (0, 8);
-    context.footnote (format (STRING_CMD_MODIFY_INACTIVE, uuid, get ("status"), uuid));
+    context.footnote (format ("Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending", uuid, get ("status"), uuid));
   }
 }
 #endif
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index da55775d7..2ac074c44 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -34,6 +34,9 @@
 #include <shared.h>
 #include <i18n.h>
 
+#define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
+#define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +44,7 @@ CmdModify::CmdModify ()
 {
   _keyword               = "modify";
   _usage                 = "task <filter> modify <mods>";
-  _description           = STRING_CMD_MODIFY_USAGE1;
+  _description           = "Modifies the existing task with provided arguments.";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -81,7 +84,7 @@ int CmdModify::execute (std::string&)
       // Abort if change introduces inconsistencies.
       checkConsistency(before, task);
 
-      auto question = format (STRING_CMD_MODIFY_CONFIRM,
+      auto question = format ("Modify task {1} '{2}'?",
                               task.identifier (true),
                               task.get ("description"));
 
@@ -91,7 +94,7 @@ int CmdModify::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_MODIFY_NO << '\n';
+        std::cout << "Task not modified.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -104,7 +107,7 @@ int CmdModify::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_MODIFY_1 : STRING_CMD_MODIFY_N, count);
+  feedback_affected (count == 1 ?  "Modified {1} task." : "Modified {1} tasks.", count);
   return rc;
 }
 
@@ -116,18 +119,18 @@ void CmdModify::checkConsistency (Task &before, Task &after)
   if (after.has ("recur")  &&
       ! after.has ("due")   &&
       ! before.has ("due"))
-    throw std::string (STRING_CMD_MODIFY_NO_DUE);
+    throw std::string ("You cannot specify a recurring task without a due date.");
 
   if (before.has ("recur") &&
       before.has ("due")   &&
       (! after.has ("due")  ||
         after.get ("due") == ""))
-    throw std::string (STRING_CMD_MODIFY_REM_DUE);
+    throw std::string ("You cannot remove the due date from a recurring task.");
 
   if (before.has ("recur")  &&
       (! after.has ("recur") ||
         after.get ("recur") == ""))
-    throw std::string (STRING_CMD_MODIFY_REC_ALWAYS);
+    throw std::string ("You cannot remove the recurrence from a recurring task.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -139,7 +142,7 @@ int CmdModify::modifyAndUpdate (
   auto count = 1;
 
   updateRecurrenceMask (after);
-  feedback_affected (STRING_CMD_MODIFY_TASK, after);
+  feedback_affected ("Modifying task {1} '{2}'.", after);
   feedback_unblocked (after);
   context.tdb2.modify (after);
   if (context.verbose ("project") && projectChanges)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 43ffb01f5..8c1b93abe 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -296,20 +296,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
 #define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
 
-#define STRING_CMD_MODIFY_USAGE1     "Ändert eine bestehende Aufgabe mit den übergebenen Parametern"
-#define STRING_CMD_MODIFY_NO_DUE     "Wiederholende Aufgaben können nicht ohne Fälligkeitsdatum angelegt werden."
-#define STRING_CMD_MODIFY_REM_DUE    "Das Fälligkeitsdatum einer wiederholenden Aufgabe kann nicht gelöscht werden."
-#define STRING_CMD_MODIFY_REC_ALWAYS "Die Periode einer wiederholenden Aufgabe kann nicht gelöscht werden."
-#define STRING_CMD_MODIFY_TASK       "Ändere Aufgabe {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Ändere wiederholende Aufgabe {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "{1} Aufgabe geändert."
-#define STRING_CMD_MODIFY_N          "{1} Aufgaben geändert."
-#define STRING_CMD_MODIFY_NO         "Aufgabe nicht geändert."
-#define STRING_CMD_MODIFY_CONFIRM    "Aufgabe {1} '{2}' ändern?"
-#define STRING_CMD_MODIFY_RECUR      "Dies ist eine wiederholende Aufgabe.  Möchten Sie alle offenen Wiederholungen dieser Aufgabe ändern?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Weiterer Text muss angegeben werden."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "Alle Farben, ein Beispiel, oder eine Legende"
 #define STRING_CMD_COLOR_HERE        "Diese Farben werden zur Zeit genutzt:"
 #define STRING_CMD_COLOR_COLOR       "Farbe"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 29124da30..46141c59c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -293,20 +293,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
-#define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
-#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
-#define STRING_CMD_MODIFY_TASK       "Modifying task {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Modified {1} task."
-#define STRING_CMD_MODIFY_N          "Modified {1} tasks."
-#define STRING_CMD_MODIFY_NO         "Task not modified."
-#define STRING_CMD_MODIFY_CONFIRM    "Modify task {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Additional text must be provided."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
 #define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
 #define STRING_CMD_COLOR_COLOR       "Color"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 9c2da5e30..2812ce13e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -296,20 +296,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
-#define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
-#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
-#define STRING_CMD_MODIFY_TASK       "Modifying task {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Modified {1} task."
-#define STRING_CMD_MODIFY_N          "Modified {1} tasks."
-#define STRING_CMD_MODIFY_NO         "Task not modified."
-#define STRING_CMD_MODIFY_CONFIRM    "Modify task {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Additional text must be provided."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
 #define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
 #define STRING_CMD_COLOR_COLOR       "Color"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index af598149b..5cabb9d36 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -305,21 +305,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
 #define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifica la tarea existente con los argumentos provistos."
-//#define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_NO_DUE     "No puede especificar una tarea recurrente sin una fecha de vencimiento."
-#define STRING_CMD_MODIFY_REM_DUE    "No puede eliminar la fecha de vencimiento de una tarea recurrente."
-#define STRING_CMD_MODIFY_REC_ALWAYS "No puede eliminar la recurrencia de una tarea recurrente."
-#define STRING_CMD_MODIFY_TASK       "Modificando tarea {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modificando tarea recurrente {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Modificada {1} tarea."
-#define STRING_CMD_MODIFY_N          "Modificada {1} tareas."
-#define STRING_CMD_MODIFY_NO         "Tarea no modificada."
-#define STRING_CMD_MODIFY_CONFIRM    "¿Modificar tarea {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "Esta es una tarea recurrente. ¿Quiere modificar todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Se debe proveer texto adicional."
-#define STRING_CMD_MODIFY_INACTIVE   "Nota: la tarea modificada {1} está {2}. Podría querer marcar esta tarea como pendiente con: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "Todos los colores, una muestra, o una leyenda"
 #define STRING_CMD_COLOR_HERE        "Aquí están los colores en uso actualmente:"
 #define STRING_CMD_COLOR_COLOR       "Color"  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f0ac7e10e..1c0e0b507 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -298,20 +298,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
-#define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
-#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
-#define STRING_CMD_MODIFY_TASK       "Modifying task {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Modified {1} task."
-#define STRING_CMD_MODIFY_N          "Modified {1} tasks."
-#define STRING_CMD_MODIFY_NO         "Tâche non modifiée"
-#define STRING_CMD_MODIFY_CONFIRM    "Modify task {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Additional text must be provided."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
 #define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
 #define STRING_CMD_COLOR_COLOR       "Color"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 81e531449..8d9cab162 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -297,20 +297,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifica il task esistente usando gli argomenti specificati."
-#define STRING_CMD_MODIFY_NO_DUE     "Impossibile specificare un task periodico senza una data di scadenza."
-#define STRING_CMD_MODIFY_REM_DUE    "Impossibile eliminare una scadenza da un task periodico"
-#define STRING_CMD_MODIFY_REC_ALWAYS "Impossibile rimuovere un evento da un task periodico."
-#define STRING_CMD_MODIFY_TASK       "Modifica del task {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modifica del task periodico {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Task {1} modificato."
-#define STRING_CMD_MODIFY_N          "Task {1} modificati."
-#define STRING_CMD_MODIFY_NO         "Task non modificato."
-#define STRING_CMD_MODIFY_CONFIRM    "Modificare il task {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "Questo è un task periodico. Modificare tutti i task associati?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Testo aggiunti da specificare."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "Tutti i colori, un esempio, o una legenda"
 #define STRING_CMD_COLOR_HERE        "Coloti in uso:"
 #define STRING_CMD_COLOR_COLOR       "Colore"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 69db8e6b7..5556092e8 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -298,20 +298,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
-#define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
-#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
-#define STRING_CMD_MODIFY_TASK       "タスク {1} '{2}' を変更します。"
-#define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "{1} タスク を変更。"
-#define STRING_CMD_MODIFY_N          "{1} タスク を変更。"
-#define STRING_CMD_MODIFY_NO         "タスク は変更されませんでした。"
-#define STRING_CMD_MODIFY_CONFIRM    "タスク {1} '{2}' を変更しますか?"
-#define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Additional text must be provided."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
 #define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
 #define STRING_CMD_COLOR_COLOR       "Color"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index ab514df14..b137eadbf 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -298,20 +298,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modyfikuje istniejące zadanie pod kątem podanych argumentów."
-#define STRING_CMD_MODIFY_NO_DUE     "Nie możesz specyfikować rekurencyjnego zadania bez podania terminu."
-#define STRING_CMD_MODIFY_REM_DUE    "Nie możesz usunąć właściwości 'termin' z zadanie rekurencyjnego."
-#define STRING_CMD_MODIFY_REC_ALWAYS "Nie możesz usunąć właściwości 'rekurencja' z zadania rekurencyjnego."
-#define STRING_CMD_MODIFY_TASK       "Modyfikacja zadania {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "Modyfikacja zadania rekurencyjnego {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Zmodyfikowano {1} zadanie."
-#define STRING_CMD_MODIFY_N          "Zmodyfikowano {1} zadań."
-#define STRING_CMD_MODIFY_NO         "Zadanie nie zmodyfikowane."
-#define STRING_CMD_MODIFY_CONFIRM    "Zmienić zadanie {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "To zadanie jest cykliczne. Czy chcesz zmodyfikować kolejne zadania w cyklu?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "Należy podać tekst"
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "Wszystkie kolory, próbki lub legenda"
 #define STRING_CMD_COLOR_HERE        "To są aktualnie używane kolory:"
 #define STRING_CMD_COLOR_COLOR       "Kolor"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c93b16b9f..5498b955d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -298,20 +298,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
 #define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
 
-#define STRING_CMD_MODIFY_USAGE1     "Modifica a tarefa existente com os argumentos indicados."
-#define STRING_CMD_MODIFY_NO_DUE     "Não pode criar tarefas recorrentes sem uma data de vencimento."
-#define STRING_CMD_MODIFY_REM_DUE    "Não pode remover a data de vencimento de uma tarefa recorrente."
-#define STRING_CMD_MODIFY_REC_ALWAYS "Não pode remover o attributo de recorrência de uma tarefa recorrente."
-#define STRING_CMD_MODIFY_TASK       "A modificar a tarefa {1} '{2}'."
-#define STRING_CMD_MODIFY_TASK_R     "A modificar a tarefa recorrente {1} '{2}'."
-#define STRING_CMD_MODIFY_1          "Modificada {1} tarefa."
-#define STRING_CMD_MODIFY_N          "Modificadas {1} tarefas."
-#define STRING_CMD_MODIFY_NO         "Tarefa não modificada."
-#define STRING_CMD_MODIFY_CONFIRM    "Modificar tarefa {1} '{2}'?"
-#define STRING_CMD_MODIFY_RECUR      "Esta é uma tarefa recorrente. Deseja modificar todas as recorrências pendentes da mesma?"
-#define STRING_CMD_MODIFY_NEED_TEXT  "É necessário fornecer mais informação."
-#define STRING_CMD_MODIFY_INACTIVE   "Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending"
-
 #define STRING_CMD_COLOR_USAGE       "Todas as cores, uma amostra ou a legenda"
 #define STRING_CMD_COLOR_HERE        "Estas são as cores actualmente em uso:"
 #define STRING_CMD_COLOR_COLOR       "Cor"

From a66fe6de7357d93700c6a34db75faf85941f5b0b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 15:44:24 -0500
Subject: [PATCH 636/879] l10n: Eliminated STRING_CMD_DUPLICATE_*

---
 src/commands/CmdDuplicate.cpp | 15 ++++++++-------
 src/l10n/deu-DEU.h            |  9 ---------
 src/l10n/eng-USA.h            |  9 ---------
 src/l10n/epo-RUS.h            |  9 ---------
 src/l10n/esp-ESP.h            |  9 ---------
 src/l10n/fra-FRA.h            |  9 ---------
 src/l10n/ita-ITA.h            |  9 ---------
 src/l10n/jpn-JPN.h            |  9 ---------
 src/l10n/pol-POL.h            |  9 ---------
 src/l10n/por-PRT.h            |  9 ---------
 10 files changed, 8 insertions(+), 88 deletions(-)

diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 0baefe1b9..9f86b7512 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -41,7 +41,7 @@ CmdDuplicate::CmdDuplicate ()
 {
   _keyword               = "duplicate";
   _usage                 = "task <filter> duplicate <mods>";
-  _description           = STRING_CMD_DUPLICATE_USAGE;
+  _description           = "Duplicates the specified tasks";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -88,7 +88,7 @@ int CmdDuplicate::execute (std::string&)
       dup.remove ("recur");
       dup.remove ("until");
       dup.remove ("imask");
-      std::cout << format (STRING_CMD_DUPLICATE_NON_REC, task.identifier ())
+      std::cout << format ("Note: task {1} was a recurring task.  The duplicated task is not.", task.identifier ())
           << '\n';
     }
 
@@ -96,7 +96,7 @@ int CmdDuplicate::execute (std::string&)
     else if (dup.getStatus () == Task::recurring)
     {
       dup.remove ("mask");
-      std::cout << format (STRING_CMD_DUPLICATE_REC, task.identifier ())
+      std::cout << format ("Note: task {1} was a parent recurring task.  The duplicated task is too.", task.identifier ())
           << '\n';
     }
 
@@ -105,14 +105,14 @@ int CmdDuplicate::execute (std::string&)
 
     dup.modify (Task::modAnnotate);
 
-    if (permission (format (STRING_CMD_DUPLICATE_CONFIRM,
+    if (permission (format ("Duplicate task {1} '{2}'?",
                             task.identifier (true),
                             task.get ("description")),
                     filtered.size ()))
     {
       context.tdb2.add (dup);
       ++count;
-      feedback_affected (STRING_CMD_DUPLICATE_TASK, task);
+      feedback_affected ("Duplicated task {1} '{2}'.", task);
 
       auto status = dup.getStatus ();
       if (context.verbose ("new-id") &&
@@ -129,7 +129,7 @@ int CmdDuplicate::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_DUPLICATE_NO << '\n';
+      std::cout << "Task not duplicated.\n";
       rc = 1;
       if (_permission_quit)
         break;
@@ -141,7 +141,8 @@ int CmdDuplicate::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_DUPLICATE_1 : STRING_CMD_DUPLICATE_N, count);
+  feedback_affected (count == 1 ? "Duplicated {1} task." : "Duplicated {1} tasks.", count);
+
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 8c1b93abe..c004dd9a9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -229,15 +229,6 @@
 #define STRING_CMD_DELETE_1          "{1} Aufgabe gelöscht."
 #define STRING_CMD_DELETE_N          "{1} Aufgaben gelöscht."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Dupliziere die gewählte Aufgabe"
-#define STRING_CMD_DUPLICATE_REC     "Hinweis: Aufgabe {1} ist Vorgänger für wiederholende Aufgaben.  Die duplizierte Aufgabe ist dies auch."
-#define STRING_CMD_DUPLICATE_NON_REC "Hinweis: Aufgabe {1} ist eine wiederholende Aufgabe.  Die duplizierte Aufgabe ist dies nicht."
-#define STRING_CMD_DUPLICATE_CONFIRM "Aufgabe {1} '{2}' duplizieren?"
-#define STRING_CMD_DUPLICATE_TASK    "Aufgabe {1} '{2}' dupliziert."
-#define STRING_CMD_DUPLICATE_NO      "Aufgabe nicht verdoppelt."
-#define STRING_CMD_DUPLICATE_1       "{1} Aufgabe verdoppelt."
-#define STRING_CMD_DUPLICATE_N       "{1} Aufgaben verdoppelt."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 46141c59c..ea7146ca8 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -226,15 +226,6 @@
 #define STRING_CMD_DELETE_1          "Deleted {1} task."
 #define STRING_CMD_DELETE_N          "Deleted {1} tasks."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Duplicates the specified tasks"
-#define STRING_CMD_DUPLICATE_REC     "Note: task {1} was a parent recurring task.  The duplicated task is too."
-#define STRING_CMD_DUPLICATE_NON_REC "Note: task {1} was a recurring task.  The duplicated task is not."
-#define STRING_CMD_DUPLICATE_CONFIRM "Duplicate task {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Duplicated task {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Task not duplicated."
-#define STRING_CMD_DUPLICATE_1       "Duplicated {1} task."
-#define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 2812ce13e..199eb1372 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -229,15 +229,6 @@
 #define STRING_CMD_DELETE_1          "Viŝis {1} taskon."
 #define STRING_CMD_DELETE_N          "Viŝis {1} taskojn."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Kopias la specifatan taskon"
-#define STRING_CMD_DUPLICATE_REC     "Notu: tasko {1} estis patra reokazanta tasko.  La kopia tasko ankaŭ estas."
-#define STRING_CMD_DUPLICATE_NON_REC "Notu: tasko {1} estis reokazanta tasko.  La kopia tasko ne estas."
-#define STRING_CMD_DUPLICATE_CONFIRM "Kopii taskon {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Kopiis taskon {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Ne kopiis taskon."
-#define STRING_CMD_DUPLICATE_1       "Kopiis {1} taskon."
-#define STRING_CMD_DUPLICATE_N       "Kopiis {1} taskojn."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5cabb9d36..ee00bebe5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -237,15 +237,6 @@
 #define STRING_CMD_DELETE_1          "Suprimida {1} tarea."
 #define STRING_CMD_DELETE_N          "Suprimidas {1} tareas."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Duplica las tareas especificadas"
-#define STRING_CMD_DUPLICATE_REC     "Nota: la tarea {1} era una tarea madre recurrente. La tarea duplicada también lo es."
-#define STRING_CMD_DUPLICATE_NON_REC "Nota: la tarea {1} era una tarea recurrente. La tarea duplicada no lo es."
-#define STRING_CMD_DUPLICATE_CONFIRM "¿Duplicar tarea {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Duplicada tarea {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Tarea no duplicada."
-#define STRING_CMD_DUPLICATE_1       "Duplicada {1} tarea."
-#define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tareas."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 1c0e0b507..9464e7f82 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -231,15 +231,6 @@
 #define STRING_CMD_DELETE_1          "{1} tâche supprimée."
 #define STRING_CMD_DELETE_N          "{1} tâches supprimées."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Duplique la tâche spécifiée"
-#define STRING_CMD_DUPLICATE_REC     "Note : la tâche {1} était une tâche parent récurrente. Sa copie l'est aussi."
-#define STRING_CMD_DUPLICATE_NON_REC "Note : la tâche {1} était une tâche récurrente. Sa copie ne l'est pas."
-#define STRING_CMD_DUPLICATE_CONFIRM "Dupliquer la tâche {1} '{2}' ?"
-#define STRING_CMD_DUPLICATE_TASK    "Tâche {1} '{2}' dupliquée."
-#define STRING_CMD_DUPLICATE_NO      "Tâche non dupliquée"
-#define STRING_CMD_DUPLICATE_1       "Duplicated {1} task."
-#define STRING_CMD_DUPLICATE_N       "Duplicated {1} tasks."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8d9cab162..fa272fc1d 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -230,15 +230,6 @@
 #define STRING_CMD_DELETE_1          "Task {1} cancellato."
 #define STRING_CMD_DELETE_N          "Task {1} cancellati."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Duplica il task specificato"
-#define STRING_CMD_DUPLICATE_REC     "Nota: il task {1} genera task periodici.  Il task duplicato anche."
-#define STRING_CMD_DUPLICATE_NON_REC "Nota: il task {1} era un task periodico.  Il task duplicato non lo è."
-#define STRING_CMD_DUPLICATE_CONFIRM "Duplicare il task {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Duplicated task {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Task non duplicato"
-#define STRING_CMD_DUPLICATE_1       "Task {1} duplicato."
-#define STRING_CMD_DUPLICATE_N       "Task {1} duplicati."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5556092e8..5e4814ae7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -231,15 +231,6 @@
 #define STRING_CMD_DELETE_1          " {1} タスク を削除しました。"
 #define STRING_CMD_DELETE_N          " {1} タスク を削除しました。"
 
-#define STRING_CMD_DUPLICATE_USAGE   "指定したタスクが重複しています"
-#define STRING_CMD_DUPLICATE_REC     "Note: task {1} was a parent recurring task.  The duplicated task is too."
-#define STRING_CMD_DUPLICATE_NON_REC "Note: task {1} was a recurring task.  The duplicated task is not."
-#define STRING_CMD_DUPLICATE_CONFIRM "タスク {1} '{2}' が重複?"
-#define STRING_CMD_DUPLICATE_TASK    "タスク {1} '{2}' が重複。"
-#define STRING_CMD_DUPLICATE_NO      "タスク は重複していません。"
-#define STRING_CMD_DUPLICATE_1       "重複した {1} タスク。"
-#define STRING_CMD_DUPLICATE_N       "重複した {1} タスク。"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b137eadbf..71d65ccf9 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -231,15 +231,6 @@
 #define STRING_CMD_DELETE_1          "Usunięto {1} zadanie "
 #define STRING_CMD_DELETE_N          "Usunięto {1} zadań"
 
-#define STRING_CMD_DUPLICATE_USAGE   "Tworzy kopię wybranego zadania"
-#define STRING_CMD_DUPLICATE_REC     "Uwaga: zadanie {1} było cyklicznym zadaniem-rodzicem. Kopia jest nim również"
-#define STRING_CMD_DUPLICATE_NON_REC "Uwaga: zadanie {1} było cykliczne. Kopia nie jest cykliczna."
-#define STRING_CMD_DUPLICATE_CONFIRM "Skopiować zadanie {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Skopiowano zadanie {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Nie skopiowano zadańia"
-#define STRING_CMD_DUPLICATE_1       "Skopiowano {1} zadanie."
-#define STRING_CMD_DUPLICATE_N       "Skopiowano {1} zadań."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5498b955d..6b5a0f87a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -231,15 +231,6 @@
 #define STRING_CMD_DELETE_1          "Eliminada {1} tarefa."
 #define STRING_CMD_DELETE_N          "Eliminadas {1} tarefas."
 
-#define STRING_CMD_DUPLICATE_USAGE   "Duplica as tarefas especificadas"
-#define STRING_CMD_DUPLICATE_REC     "Nota: A tarefa {1} era uma tarefa mãe periódica. A tarefa duplicada também."
-#define STRING_CMD_DUPLICATE_NON_REC "Nota: A tarefa {1} era uma tarefa periódica. A tarefa duplicada não é."
-#define STRING_CMD_DUPLICATE_CONFIRM "Duplicar tarefa {1} '{2}'?"
-#define STRING_CMD_DUPLICATE_TASK    "Tarefa duplicada {1} '{2}'."
-#define STRING_CMD_DUPLICATE_NO      "Tarefa não duplicada."
-#define STRING_CMD_DUPLICATE_1       "Duplicada {1} tarefa."
-#define STRING_CMD_DUPLICATE_N       "Duplicadas {1} tarefas."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."

From c44a6433fddb3ffa90a4fc3870e77d7fc7e4b319 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 16:31:09 -0500
Subject: [PATCH 637/879] calc: Fixed string param

---
 src/calc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calc.cpp b/src/calc.cpp
index 0e77d8423..837cced10 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -89,7 +89,7 @@ int main (int argc, char** argv)
       else if (!strcmp (argv[i], "-v") || !strcmp (argv[i], "--version"))
       {
         std::cout << '\n'
-                  << format ("calc {2} built for ", VERSION)
+                  << format ("calc {1} built for ", VERSION)
                   << osName ()
                   << '\n'
                   << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."

From 0e2cb5866cd53adec796f0315d6779b445209d1b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 19:56:53 -0500
Subject: [PATCH 638/879] l10n: Eliminated STRING_COLUMN_LABEL_DEP*

---
 src/columns/ColDepends.cpp | 5 +++--
 src/l10n/deu-DEU.h         | 2 --
 src/l10n/eng-USA.h         | 2 --
 src/l10n/epo-RUS.h         | 2 --
 src/l10n/esp-ESP.h         | 2 --
 src/l10n/fra-FRA.h         | 2 --
 src/l10n/ita-ITA.h         | 2 --
 src/l10n/jpn-JPN.h         | 2 --
 src/l10n/pol-POL.h         | 2 --
 src/l10n/por-PRT.h         | 2 --
 10 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 22e0934b1..c74fdb2b9 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -31,10 +31,11 @@
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
-#include <i18n.h>
 #include <main.h>
 #include <stdlib.h>
 
+#define STRING_COLUMN_LABEL_DEP "Depends"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -61,7 +62,7 @@ void ColumnDepends::setStyle (const std::string& value)
   Column::setStyle (value);
 
        if (_style == "indicator" && _label == STRING_COLUMN_LABEL_DEP) _label = _label.substr (0, context.config.get ("dependency.indicator").length ());
-  else if (_style == "count"     && _label == STRING_COLUMN_LABEL_DEP) _label = STRING_COLUMN_LABEL_DEP_S;
+  else if (_style == "count"     && _label == STRING_COLUMN_LABEL_DEP) _label = "Dep";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c004dd9a9..b6d17f637 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Abhängig von"
-#define STRING_COLUMN_LABEL_DEP_S    "Abh."
 #define STRING_COLUMN_LABEL_DESC     "Beschreibung"
 #define STRING_COLUMN_LABEL_DUE      "Fällig"
 #define STRING_COLUMN_LABEL_END      "Ende"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ea7146ca8..7c0c20680 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Depends"
-#define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 199eb1372..5af4a2d20 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Dependoj"
-#define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Priskribo"
 #define STRING_COLUMN_LABEL_DUE      "Datlimo"
 #define STRING_COLUMN_LABEL_END      "Fino"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ee00bebe5..5366d5787 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Depende"
-#define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_DESC     "Descripción"
 #define STRING_COLUMN_LABEL_DUE      "Vencimiento"
 #define STRING_COLUMN_LABEL_END      "Fin"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 9464e7f82..390e0fede 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Dépends de"
-#define STRING_COLUMN_LABEL_DEP_S    "Dép"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Échéance"
 #define STRING_COLUMN_LABEL_END      "Fin"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index fa272fc1d..021054cc2 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Dipendenze"
-#define STRING_COLUMN_LABEL_DEP_S    "Dip"
 #define STRING_COLUMN_LABEL_DESC     "Descrizione"
 #define STRING_COLUMN_LABEL_DUE      "Scadenza"
 #define STRING_COLUMN_LABEL_END      "Fine"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5e4814ae7..1be893914 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Depends"
-#define STRING_COLUMN_LABEL_DEP_S    "Dep"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 71d65ccf9..fcc726839 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Związane"
-#define STRING_COLUMN_LABEL_DEP_S    "Zwi"
 #define STRING_COLUMN_LABEL_DESC     "Opis"
 #define STRING_COLUMN_LABEL_DUE      "Do"
 #define STRING_COLUMN_LABEL_END      "Koniec"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6b5a0f87a..82c37d50e 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,8 +28,6 @@
 #define INCLUDED_STRINGS
 
 // columns/Col*
-#define STRING_COLUMN_LABEL_DEP      "Depende"
-#define STRING_COLUMN_LABEL_DEP_S    "Dep"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_DESC     "Descrição"
 #define STRING_COLUMN_LABEL_DUE      "Vence"
 #define STRING_COLUMN_LABEL_END      "Fim"

From 7b2e45692e3ae1f8179a0175a7e83015e308152b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:02:08 -0500
Subject: [PATCH 639/879] l10n: Eliminated STRING_CMD_UDAS_*

---
 src/commands/CmdUDAs.cpp | 10 +++++-----
 src/l10n/deu-DEU.h       |  6 ------
 src/l10n/eng-USA.h       |  6 ------
 src/l10n/epo-RUS.h       |  6 ------
 src/l10n/esp-ESP.h       |  6 ------
 src/l10n/fra-FRA.h       |  6 ------
 src/l10n/ita-ITA.h       |  6 ------
 src/l10n/jpn-JPN.h       |  6 ------
 src/l10n/pol-POL.h       |  6 ------
 src/l10n/por-PRT.h       |  6 ------
 10 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 62534f371..c2add026e 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -122,13 +122,13 @@ int CmdUDAs::execute (std::string& output)
         << table.render ()
         << optionalBlankLine ()
         << (udas.size () == 1
-              ? format (STRING_CMD_UDAS_SUMMARY,  udas.size ())
-              : format (STRING_CMD_UDAS_SUMMARY2, udas.size ()))
+              ? format ("{1} UDA defined", udas.size ())
+              : format ("{1} UDAs defined", udas.size ()))
         << '\n';
   }
   else
   {
-    out << STRING_CMD_UDAS_NO << '\n';
+    out << "No UDAs defined.\n";
     rc = 1;
   }
 
@@ -162,8 +162,8 @@ int CmdUDAs::execute (std::string& output)
         << orphanTable.render ()
         << optionalBlankLine ()
         << (udas.size () == 1
-              ? format (STRING_CMD_UDAS_ORPHAN,  orphans.size ())
-              : format (STRING_CMD_UDAS_ORPHANS, orphans.size ()))
+              ? format ("{1} Orphan UDA", orphans.size ())
+              : format ("{1} Orphan UDAs", orphans.size ()))
         << '\n';
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b6d17f637..5b9642ad2 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -211,12 +211,6 @@
 #define STRING_CMD_GET_NO_DOM        "Keine DOM-Referenz spezifiziert."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Keine UDAs festgelegt."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA festgelegt"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDAs festgelegt"
-#define STRING_CMD_UDAS_ORPHAN       "{1} verwaister UDA"
-#define STRING_CMD_UDAS_ORPHANS      "{1} verwaiste UDAs"
-
 #define STRING_CMD_DELETE_USAGE      "Löscht die gewählte Aufgabe"
 #define STRING_CMD_DELETE_CONFIRM    "Aufgabe {1} '{2}' dauerhaft löschen?"
 #define STRING_CMD_DELETE_TASK       "Lösche Aufgabe {1} '{2}'."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 7c0c20680..886150609 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -208,12 +208,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "No UDAs defined."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA defined"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDAs defined"
-#define STRING_CMD_UDAS_ORPHAN       "{1} Orphan UDA"
-#define STRING_CMD_UDAS_ORPHANS      "{1} Orphan UDAs"
-
 #define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
 #define STRING_CMD_DELETE_CONFIRM    "Delete task {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 5af4a2d20..707be3a55 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -211,12 +211,6 @@
 #define STRING_CMD_GET_NO_DOM        "Nenia DOM-referenco specifata."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Nenia UDA definita."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA definita"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDA definitaj"
-#define STRING_CMD_UDAS_ORPHAN       "{1} Orfa UDA"
-#define STRING_CMD_UDAS_ORPHANS      "{1} Orfaj UDA"
-
 #define STRING_CMD_DELETE_USAGE      "Viŝas la specifatan taskon"
 #define STRING_CMD_DELETE_CONFIRM    "Forviŝi taskon {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Viŝanta taskon {1} '{2}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5366d5787..650688eae 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -219,12 +219,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referencia a DOM no especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' no es una referencia a DOM."
 
-#define STRING_CMD_UDAS_NO           "Ningún UDA definido."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA definido"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDAs definidos"
-#define STRING_CMD_UDAS_ORPHAN       "{1} UDA huérfano"
-#define STRING_CMD_UDAS_ORPHANS      "{1} UDAs huérfanos"
-
 #define STRING_CMD_DELETE_USAGE      "Suprime la tarea especificada"
 #define STRING_CMD_DELETE_CONFIRM    "¿Suprimir permanentemente la tarea {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Suprimiendo tarea {1} '{2}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 390e0fede..cd9fbd8e1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -213,12 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Aucune référence de DOM spécifié."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Aucuns ADUs définies."
-#define STRING_CMD_UDAS_SUMMARY      "{1} ADU définie"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} ADUs définies"
-#define STRING_CMD_UDAS_ORPHAN       "{1} ADU orphelin"
-#define STRING_CMD_UDAS_ORPHANS      "{1} ADUs orphelins"
-
 #define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
 #define STRING_CMD_DELETE_CONFIRM    "Permanently delete task {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 021054cc2..64c9dacb7 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -212,12 +212,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Nessun UDA definito."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA definito"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDAs defined"
-#define STRING_CMD_UDAS_ORPHAN       "{1} UDA orfano"
-#define STRING_CMD_UDAS_ORPHANS      "{1} UDA orfani"
-
 #define STRING_CMD_DELETE_USAGE      "Cancella il task specificato"
 #define STRING_CMD_DELETE_CONFIRM    "Cancellare permanentemente il task {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Cancellazione del task {1} '{2}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 1be893914..4fb7577a8 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -213,12 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "UDAが一つも定義されていません。"
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA が定義されました。"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDA が定義されました。"
-#define STRING_CMD_UDAS_ORPHAN       "{1} Orphan UDA"
-#define STRING_CMD_UDAS_ORPHANS      "{1} Orphan UDAs"
-
 #define STRING_CMD_DELETE_USAGE      "指定されたタスクの削除"
 #define STRING_CMD_DELETE_CONFIRM    "完全にタスク {1} '{2}' を削除して良いですか?"
 #define STRING_CMD_DELETE_TASK       "タスク {1} '{2}' を削除中。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index fcc726839..b27100a6a 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -213,12 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Brak zdefiniowanej referencji do DOM."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Nie zdefiniowano UDA"
-#define STRING_CMD_UDAS_SUMMARY      "{1} zdefiniowane UDA"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} zdefiniowanych UDA"
-#define STRING_CMD_UDAS_ORPHAN       "{1} Osierocone UDA"
-#define STRING_CMD_UDAS_ORPHANS      "{1} Osierocone UDA"
-
 #define STRING_CMD_DELETE_USAGE      "Usuwa wybrane zadanie"
 #define STRING_CMD_DELETE_CONFIRM    "Usunąć zadanie {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "Usuwanie zadania {1} '{2}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 82c37d50e..e1f76ea3a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -213,12 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referência DOM não especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_UDAS_NO           "Nenhum UDA definido."
-#define STRING_CMD_UDAS_SUMMARY      "{1} UDA definido"
-#define STRING_CMD_UDAS_SUMMARY2     "{1} UDAs definidos"
-#define STRING_CMD_UDAS_ORPHAN       "{1} UDA orfão"
-#define STRING_CMD_UDAS_ORPHANS      "{1} UDAs orfãos"
-
 #define STRING_CMD_DELETE_USAGE      "Elimina a tarefa indicada"
 #define STRING_CMD_DELETE_CONFIRM    "Eliminar permanentemente a tarefa {1} '{2}'?"
 #define STRING_CMD_DELETE_TASK       "A eliminar tarefa {1} '{2}'."

From cf1395afd831a09a7104edbebbe3f0f297b6d938 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:09:25 -0500
Subject: [PATCH 640/879] l10n: Eliminated STRING_CMD_DELETE_*

---
 src/commands/CmdDelete.cpp | 16 ++++++++++------
 src/l10n/deu-DEU.h         | 10 ----------
 src/l10n/eng-USA.h         | 10 ----------
 src/l10n/epo-RUS.h         | 10 ----------
 src/l10n/esp-ESP.h         | 10 ----------
 src/l10n/fra-FRA.h         | 10 ----------
 src/l10n/ita-ITA.h         | 10 ----------
 src/l10n/jpn-JPN.h         | 10 ----------
 src/l10n/pol-POL.h         | 10 ----------
 src/l10n/por-PRT.h         | 10 ----------
 10 files changed, 10 insertions(+), 96 deletions(-)

diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 17e0cadca..5b1ded102 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -34,6 +34,9 @@
 #include <i18n.h>
 #include <main.h>
 
+#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
+#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +44,7 @@ CmdDelete::CmdDelete ()
 {
   _keyword               = "delete";
   _usage                 = "task <filter> delete <mods>";
-  _description           = STRING_CMD_DELETE_USAGE;
+  _description           = "Deletes the specified task";
   _read_only             = false;
   _displays_id           = false;
   _needs_confirm         = true;
@@ -80,7 +83,7 @@ int CmdDelete::execute (std::string&)
     {
       // Delete the specified task.
       std::string question;
-      question = format (STRING_CMD_DELETE_CONFIRM,
+      question = format ("Delete task {1} '{2}'?",
                          task.identifier (true),
                          task.get ("description"));
 
@@ -94,7 +97,7 @@ int CmdDelete::execute (std::string&)
         updateRecurrenceMask (task);
         ++count;
         context.tdb2.modify (task);
-        feedback_affected (STRING_CMD_DELETE_TASK, task);
+        feedback_affected ("Deleting task {1} '{2}'.", task);
         feedback_unblocked (task);
         dependencyChainOnComplete (task);
         if (context.verbose ("project"))
@@ -159,7 +162,7 @@ int CmdDelete::execute (std::string&)
       }
       else
       {
-        std::cout << STRING_CMD_DELETE_NO << '\n';
+        std::cout << "Task not deleted.\n";
         rc = 1;
         if (_permission_quit)
           break;
@@ -167,7 +170,7 @@ int CmdDelete::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_DELETE_NOT_DEL,
+      std::cout << format ("Task {1} '{2}' is not deletable.",
                            task.identifier (true),
                            task.get ("description"))
           << '\n';
@@ -180,7 +183,8 @@ int CmdDelete::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_DELETE_1 : STRING_CMD_DELETE_N, count);
+  feedback_affected (count == 1 ? "Deleted {1} task." : "Deleted {1} tasks.", count);
+
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 5b9642ad2..35dc7a6db 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -211,16 +211,6 @@
 #define STRING_CMD_GET_NO_DOM        "Keine DOM-Referenz spezifiziert."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Löscht die gewählte Aufgabe"
-#define STRING_CMD_DELETE_CONFIRM    "Aufgabe {1} '{2}' dauerhaft löschen?"
-#define STRING_CMD_DELETE_TASK       "Lösche Aufgabe {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Lösche wiederholende Aufgabe {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Dies ist eine wiederholende Aufgabe.  Möchten Sie alle offenen Wiederholungen dieser Aufgabe löschen?"
-#define STRING_CMD_DELETE_NO         "Aufgabe nicht gelöscht."
-#define STRING_CMD_DELETE_NOT_DEL    "Aufgabe {1} '{2}' kann nicht gelöscht werden."
-#define STRING_CMD_DELETE_1          "{1} Aufgabe gelöscht."
-#define STRING_CMD_DELETE_N          "{1} Aufgaben gelöscht."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 886150609..f2cc1b14b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -208,16 +208,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
-#define STRING_CMD_DELETE_CONFIRM    "Delete task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "Task not deleted."
-#define STRING_CMD_DELETE_NOT_DEL    "Task {1} '{2}' is not deletable."
-#define STRING_CMD_DELETE_1          "Deleted {1} task."
-#define STRING_CMD_DELETE_N          "Deleted {1} tasks."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 707be3a55..59fd32003 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -211,16 +211,6 @@
 #define STRING_CMD_GET_NO_DOM        "Nenia DOM-referenco specifata."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Viŝas la specifatan taskon"
-#define STRING_CMD_DELETE_CONFIRM    "Forviŝi taskon {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Viŝanta taskon {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Viŝanta reokazantan taskon {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Tio estas reokazanta tasko. Ĉu vi volas viŝi ĉian pendantan okazon?"
-#define STRING_CMD_DELETE_NO         "Ne viŝis taskon."
-#define STRING_CMD_DELETE_NOT_DEL    "Tasko {1} '{2}' ne estas viŝebla."
-#define STRING_CMD_DELETE_1          "Viŝis {1} taskon."
-#define STRING_CMD_DELETE_N          "Viŝis {1} taskojn."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 650688eae..40c45e4db 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -219,16 +219,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referencia a DOM no especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' no es una referencia a DOM."
 
-#define STRING_CMD_DELETE_USAGE      "Suprime la tarea especificada"
-#define STRING_CMD_DELETE_CONFIRM    "¿Suprimir permanentemente la tarea {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Suprimiendo tarea {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Suprimiendo tarea recurrente {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Esta es una tarea recurrente. ¿Quiere suprimir todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_DELETE_NO         "Tarea no suprimida."
-#define STRING_CMD_DELETE_NOT_DEL    "La tarea {1} '{2}' no es suprimible."
-#define STRING_CMD_DELETE_1          "Suprimida {1} tarea."
-#define STRING_CMD_DELETE_N          "Suprimidas {1} tareas."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index cd9fbd8e1..60dba3c55 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Aucune référence de DOM spécifié."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Deletes the specified task"
-#define STRING_CMD_DELETE_CONFIRM    "Permanently delete task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Deleting task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "Tâche non supprimée."
-#define STRING_CMD_DELETE_NOT_DEL    "Tâche {1} '{2}' n'est pas supprimable."
-#define STRING_CMD_DELETE_1          "{1} tâche supprimée."
-#define STRING_CMD_DELETE_N          "{1} tâches supprimées."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 64c9dacb7..5d0eab67b 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -212,16 +212,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Cancella il task specificato"
-#define STRING_CMD_DELETE_CONFIRM    "Cancellare permanentemente il task {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Cancellazione del task {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Cancellazione del task periodico {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Questo è un task periodico. Cancellare tutti i task pendenti associati a queso task?"
-#define STRING_CMD_DELETE_NO         "Task non cancellato."
-#define STRING_CMD_DELETE_NOT_DEL    "Il task {1} '{2}' non può essere elminato."
-#define STRING_CMD_DELETE_1          "Task {1} cancellato."
-#define STRING_CMD_DELETE_N          "Task {1} cancellati."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4fb7577a8..acb14e1ce 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "指定されたタスクの削除"
-#define STRING_CMD_DELETE_CONFIRM    "完全にタスク {1} '{2}' を削除して良いですか?"
-#define STRING_CMD_DELETE_TASK       "タスク {1} '{2}' を削除中。"
-#define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
-#define STRING_CMD_DELETE_NO         "タスク は削除されませんでした。"
-#define STRING_CMD_DELETE_NOT_DEL    "タスク {1} '{2}' は削除できません。"
-#define STRING_CMD_DELETE_1          " {1} タスク を削除しました。"
-#define STRING_CMD_DELETE_N          " {1} タスク を削除しました。"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b27100a6a..bdcd91767 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Brak zdefiniowanej referencji do DOM."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Usuwa wybrane zadanie"
-#define STRING_CMD_DELETE_CONFIRM    "Usunąć zadanie {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "Usuwanie zadania {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "Usuwanie zadania cyklicznego {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "To zadanie jest cykliczne. Czy chcesz usunąć wszystkie pozostałe cykle tego zadania?"
-#define STRING_CMD_DELETE_NO         "Zadanie nie zostało usunięte"
-#define STRING_CMD_DELETE_NOT_DEL    "Zadanie {1} '{2}' jest nieusuwalne."
-#define STRING_CMD_DELETE_1          "Usunięto {1} zadanie "
-#define STRING_CMD_DELETE_N          "Usunięto {1} zadań"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e1f76ea3a..1b82d3d10 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -213,16 +213,6 @@
 #define STRING_CMD_GET_NO_DOM        "Referência DOM não especificada."
 #define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
-#define STRING_CMD_DELETE_USAGE      "Elimina a tarefa indicada"
-#define STRING_CMD_DELETE_CONFIRM    "Eliminar permanentemente a tarefa {1} '{2}'?"
-#define STRING_CMD_DELETE_TASK       "A eliminar tarefa {1} '{2}'."
-#define STRING_CMD_DELETE_TASK_R     "A eliminar tarefa recorrente {1} '{2}'."
-#define STRING_CMD_DELETE_CONFIRM_R  "Esta é uma tarefa recorrente. Deseja eliminar todas as ocorrências pendentes da mesma tarefa?"
-#define STRING_CMD_DELETE_NO         "Tarefa não eliminada."
-#define STRING_CMD_DELETE_NOT_DEL    "Tarefa {1} '{2}' não é eliminável."
-#define STRING_CMD_DELETE_1          "Eliminada {1} tarefa."
-#define STRING_CMD_DELETE_N          "Eliminadas {1} tarefas."
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."

From dbf76874b93c7445c42a64753a26b7927e65b206 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:33:39 -0500
Subject: [PATCH 641/879] l10n: Eliminated STRING_CMD_SHOW*

---
 src/commands/CmdShow.cpp | 28 +++++++++++++++-------------
 src/l10n/deu-DEU.h       | 16 ----------------
 src/l10n/eng-USA.h       | 16 ----------------
 src/l10n/epo-RUS.h       | 16 ----------------
 src/l10n/esp-ESP.h       | 16 ----------------
 src/l10n/fra-FRA.h       | 16 ----------------
 src/l10n/ita-ITA.h       | 16 ----------------
 src/l10n/jpn-JPN.h       | 16 ----------------
 src/l10n/pol-POL.h       | 16 ----------------
 src/l10n/por-PRT.h       | 16 ----------------
 10 files changed, 15 insertions(+), 157 deletions(-)

diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index d74694095..5f414d5b2 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -30,13 +30,15 @@
 #include <sstream>
 #include <algorithm>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 #include <Context.h>
 #include <FS.h>
 #include <Table.h>
 #include <util.h>
 
+#define STRING_CMD_SHOW_DIFFER_COLOR "These are highlighted in {1} above."
+#define STRING_CMD_SHOW_CONFIG_ERROR "Configuration error: {1} contains an unrecognized value '{2}'."
+
 extern Context context;
 extern std::string configurationDefaults;
 
@@ -45,7 +47,7 @@ CmdShow::CmdShow ()
 {
   _keyword               = "show";
   _usage                 = "task          show [all | substring]";
-  _description           = STRING_CMD_SHOW;
+  _description           = "Shows all configuration variables or subset";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -66,7 +68,7 @@ int CmdShow::execute (std::string& output)
   // have already been handled.
   std::vector <std::string> words = context.cli2.getWords ();
   if (words.size () > 1)
-    throw std::string (STRING_CMD_SHOW_ARGS);
+    throw std::string ("You can only specify 'all' or a search string.");
 
   int width = context.getWidth ();
 
@@ -264,8 +266,8 @@ int CmdShow::execute (std::string& output)
   // Create output view.
   Table view;
   view.width (width);
-  view.add (STRING_CMD_SHOW_CONF_VAR);
-  view.add (STRING_CMD_SHOW_CONF_VALUE);
+  view.add ("Config Variable");
+  view.add ("Value");
   setHeaderUnderline (view);
 
   Color error;
@@ -316,7 +318,7 @@ int CmdShow::execute (std::string& output)
           default_config[i.first] != "")
       {
         row = view.addRow ();
-        view.set (row, 0, std::string ("  ") + STRING_CMD_SHOW_CONF_DEFAULT, color);
+        view.set (row, 0, std::string ("  ") + "Default value", color);
         view.set (row, 1, default_config[i.first], color);
       }
     }
@@ -324,12 +326,12 @@ int CmdShow::execute (std::string& output)
 
   out << '\n'
       << view.render ()
-      << (view.rows () == 0 ? STRING_CMD_SHOW_NONE : "")
+      << (view.rows () == 0 ? "No matching configuration variables." : "")
       << (view.rows () == 0 ? "\n\n" : "\n");
 
   if (issue_warning)
   {
-    out << STRING_CMD_SHOW_DIFFER << '\n';
+    out << "Some of your .taskrc variables differ from the default values.\n";
 
     if (context.color () && warning.nontrivial ())
       out << "  "
@@ -340,7 +342,7 @@ int CmdShow::execute (std::string& output)
   // Display the unrecognized variables.
   if (issue_error)
   {
-    out << STRING_CMD_SHOW_UNREC << '\n';
+    out << "Your .taskrc file contains these unrecognized variables:\n";
 
     for (auto& i : unrecognized)
       out << "  " << i << '\n';
@@ -378,7 +380,7 @@ int CmdShow::execute (std::string& output)
 
   if (context.config.size () == 0)
   {
-    out << STRING_CMD_SHOW_EMPTY << '\n';
+    out << "Configuration error: .taskrc contains no entries.\n";
     rc = 1;
   }
   else
@@ -386,10 +388,10 @@ int CmdShow::execute (std::string& output)
     Directory location (context.config.get ("data.location"));
 
     if (location._data == "")
-      out << STRING_CMD_SHOW_NO_LOCATION << '\n';
+      out << "Configuration error: data.location not specified in .taskrc file.\n";
 
     if (! location.exists ())
-      out << STRING_CMD_SHOW_LOC_EXIST << '\n';
+      out << "Configuration error: data.location contains a directory name that doesn't exist, or is unreadable.\n";
   }
 
   output = out.str ();
@@ -401,7 +403,7 @@ CmdShowRaw::CmdShowRaw ()
 {
   _keyword     = "_show";
   _usage       = "task          _show";
-  _description = STRING_CMD_SHOWRAW;
+  _description = "Shows all configuration settings in a machine-readable format";
   _read_only   = true;
   _displays_id = false;
   _category    = Command::Category::internal;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 35dc7a6db..d42bc0618 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -373,22 +373,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 #define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Zeigt alle Konfigurations-Optionen oder eine Teilmenge davon"
-#define STRING_CMD_SHOW_ARGS         "Sie müssen 'all' oder ein Suchwort angeben."
-#define STRING_CMD_SHOW_NONE         "Keine zutreffendern Konfigurations-Optionen."
-#define STRING_CMD_SHOW_UNREC        "Die .taskrc-Datei enthält folgende nicht erkannte Optionen:"
-#define STRING_CMD_SHOW_DIFFER       "Manche Ihrer .taskrc-Optionen unterscheiden sich von den Standardwerten."
-#define STRING_CMD_SHOW_EMPTY        "Konfigurationsfehler: .taskrc enthält keine Werte."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Diese sind oben in {1} hervorgehoben."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Konfigurationsfehler: {1} enthält nicht erkannten Wert '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Konfigurationsfehler: data.location nicht in .taskrc-Datei angegeben."
-#define STRING_CMD_SHOW_LOC_EXIST    "Konfigurationsfehler: data.location enthält einen fehlenden oder nicht lesbaren Ordner."
-#define STRING_CMD_SHOW_CONF_VAR     "Konfigurations-Option"
-#define STRING_CMD_SHOW_CONF_VALUE   "Wert"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Standardwert"
-#define STRING_CMD_SHOWRAW           "Zeigt alle Konfigurations-Optionen in maschinenlesbarem Format"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior unterstützt Datei-Format 1 nicht mehr, welches ursprünglich zwischen dem 27. November 2006 und 31. Dezember 2007 eingesetzt wurde."
 #define STRING_TASK_NO_FF2           "Taskwarrior unterstützt Datei-Format 2 nicht mehr, welches ursprünglich zwischen dem 1. Januar 2008 und 12. April 2009 eingesetzt wurde."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f2cc1b14b..593b710d4 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -370,22 +370,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Shows all configuration variables or subset"
-#define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
-#define STRING_CMD_SHOW_NONE         "No matching configuration variables."
-#define STRING_CMD_SHOW_UNREC        "Your .taskrc file contains these unrecognized variables:"
-#define STRING_CMD_SHOW_DIFFER       "Some of your .taskrc variables differ from the default values."
-#define STRING_CMD_SHOW_EMPTY        "Configuration error: .taskrc contains no entries."
-#define STRING_CMD_SHOW_DIFFER_COLOR "These are highlighted in {1} above."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Configuration error: {1} contains an unrecognized value '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Configuration error: data.location not specified in .taskrc file."
-#define STRING_CMD_SHOW_LOC_EXIST    "Configuration error: data.location contains a directory name that doesn't exist, or is unreadable."
-#define STRING_CMD_SHOW_CONF_VAR     "Config Variable"
-#define STRING_CMD_SHOW_CONF_VALUE   "Value"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Default value"
-#define STRING_CMD_SHOWRAW           "Shows all configuration settings in a machine-readable format"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 59fd32003..548dda1c2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -373,22 +373,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 #define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Montras ĉian agordan variablon, aŭ subaron"
-#define STRING_CMD_SHOW_ARGS         "Oni sole povas specifi 'all' aŭ serĉĉenon."
-#define STRING_CMD_SHOW_NONE         "Nenia kongruanta agordvariablo."
-#define STRING_CMD_SHOW_UNREC        "Via dosiero .taskrc enhavas nekonatajn variablojn:"
-#define STRING_CMD_SHOW_DIFFER       "Variabloj ĉe .taskrc diferencas de la defaŭltaj valoroj."
-#define STRING_CMD_SHOW_EMPTY        "Erara agordo: .taskrc ne enhavas nenion."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Tioj estas markitaj supre, ĉe {1}."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Erara agordo: {1} enhavas nekonatan valoron '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Erara agordo: data.location ne specifita ĉe dosiero .taskrc."
-#define STRING_CMD_SHOW_LOC_EXIST    "Erara agordo: data.location enhavas dosierumnomon neekzistantan aŭ nelegeblan."
-#define STRING_CMD_SHOW_CONF_VAR     "Agordvariablo"
-#define STRING_CMD_SHOW_CONF_VALUE   "Valoro"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Defaŭlta valoro"
-#define STRING_CMD_SHOWRAW           "Montras ĉia agordvariablon je maŝinlegebla aranĝo"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior ne pli subtenas dosier-aranĝon 1, kiu estis originale uzata inter la 27-a de novembro 2006 kaj la 31-a de decembro 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior ne pli subtenas dosier-aranĝon 2, kiu estis originale uzata inter la 1-a de januaro 2008 kaj la 12-a de aprilo 2009."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 40c45e4db..0f7695103 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -383,22 +383,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
 #define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Muestra todas las variables de configuración o un subconjunto"
-#define STRING_CMD_SHOW_ARGS         "Solo puede especificar 'all' o un término de búsqueda."
-#define STRING_CMD_SHOW_NONE         "No hay variables de configuración que coincidan."
-#define STRING_CMD_SHOW_UNREC        "Su archivo .taskrc contiene estas variables no reconocidas:"
-#define STRING_CMD_SHOW_DIFFER       "Algunas de sus variables .taskrc difieren de los valores por defecto."
-#define STRING_CMD_SHOW_EMPTY        "Error de configuración: .taskrc no contiene ninguna entrada."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Las cambiadas aparecen resaltadas en {1} más arriba."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Error de configuración: {1} contiene un valor '{2}' no reconocido."
-#define STRING_CMD_SHOW_NO_LOCATION  "Error de configuración: data.location no especificado en el archivo .taskrc ."
-#define STRING_CMD_SHOW_LOC_EXIST    "Error de configuración: data.location contiene un nombre de directorio que no existe o no se puede leer."
-#define STRING_CMD_SHOW_CONF_VAR     "Variable Config"
-#define STRING_CMD_SHOW_CONF_VALUE   "Valor"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Valor por defecto"
-#define STRING_CMD_SHOWRAW           "Muestra todas las variables de configuración en un formato legible por la máquina"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior ya no admite el formato de archivo 1, usado originalmente entre el 27 de noviembre de 2006 y el 31 de diciembre de 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior ya no admite el formato de archivo 2, usado originalmente entre el 1 de enero de 2008 y el 12 de abril de 2009."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 60dba3c55..bb0a491a8 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -395,22 +395,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
 #define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Shows all configuration variables or subset"
-#define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
-#define STRING_CMD_SHOW_NONE         "No matching configuration variables."
-#define STRING_CMD_SHOW_UNREC        "Your .taskrc file contains these unrecognized variables:"
-#define STRING_CMD_SHOW_DIFFER       "Some of your .taskrc variables differ from the default values."
-#define STRING_CMD_SHOW_EMPTY        "Erreur de configuration : .taskrc ne contient pas d'entrées."
-#define STRING_CMD_SHOW_DIFFER_COLOR "These are highlighted in {1} above."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Erreur de configuration  : {1} contient une valeur non reconnue '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Erreur de configuration  : data.location non spécifié dans le fichier .taskrc."
-#define STRING_CMD_SHOW_LOC_EXIST    "Erreur de configuration  : data.location contains a directory name that doesn't exist, or is unreadable."
-#define STRING_CMD_SHOW_CONF_VAR     "Config Variable"
-#define STRING_CMD_SHOW_CONF_VALUE   "Value"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Default value"
-#define STRING_CMD_SHOWRAW           "Shows all configuration settings in a machine-readable format"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5d0eab67b..217b523d9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -374,22 +374,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Mostra i sottoinsiemi di variabili di configurazione"
-#define STRING_CMD_SHOW_ARGS         "Solo 'all' può essere specificata come stringa di ricerca."
-#define STRING_CMD_SHOW_NONE         "Variabile di configurazione non corrispondente."
-#define STRING_CMD_SHOW_UNREC        "Il file .taskrc contiene variabili non riconosciute:"
-#define STRING_CMD_SHOW_DIFFER       "Alcune variabili in .taskrc hanno valore diverso dal default."
-#define STRING_CMD_SHOW_EMPTY        "Errore di configurazione: .taskrc è vuoto."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Evidenziate sopra in {1}."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Errore di configurazione: {1} contiene un valore non riconosciuto '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Errore di configurazione: data.location non specificato in .taskrc."
-#define STRING_CMD_SHOW_LOC_EXIST    "Errore di configurazione: data.location contiene una directory che non esiste o non è leggibile."
-#define STRING_CMD_SHOW_CONF_VAR     "Variabile di configurazione"
-#define STRING_CMD_SHOW_CONF_VALUE   "Valore"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Default value"
-#define STRING_CMD_SHOWRAW           "Mostra le impostazioni di configurazione in formato processabile"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior non supporta più il formato di file 1, usato tra il 27 Novembre 2006 e il 31 Dicembre 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index acb14e1ce..7e966f66f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -375,22 +375,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Shows all configuration variables or subset"
-#define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
-#define STRING_CMD_SHOW_NONE         "No matching configuration variables."
-#define STRING_CMD_SHOW_UNREC        "Your .taskrc file contains these unrecognized variables:"
-#define STRING_CMD_SHOW_DIFFER       "Some of your .taskrc variables differ from the default values."
-#define STRING_CMD_SHOW_EMPTY        "Configuration error: .taskrc contains no entries."
-#define STRING_CMD_SHOW_DIFFER_COLOR "These are highlighted in {1} above."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Configuration error: {1} contains an unrecognized value '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Configuration error: data.location not specified in .taskrc file."
-#define STRING_CMD_SHOW_LOC_EXIST    "Configuration error: data.location contains a directory name that doesn't exist, or is unreadable."
-#define STRING_CMD_SHOW_CONF_VAR     "Config Variable"
-#define STRING_CMD_SHOW_CONF_VALUE   "Value"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Default value"
-#define STRING_CMD_SHOWRAW           "Shows all configuration settings in a machine-readable format"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bdcd91767..89da77dca 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -375,22 +375,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 #define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Pokazuje wszystkie zmienne konfiguracji lub ich podzbiór"
-#define STRING_CMD_SHOW_ARGS         "Możesz jedynie wybrać wszystkie lub wyszukać na podstawie ciągu."
-#define STRING_CMD_SHOW_NONE         "Brak dopasowania zmiennych konfiguracyjnych."
-#define STRING_CMD_SHOW_UNREC        "Twój plik .taskrc zawiera następujące nierozpoznane zmienne:"
-#define STRING_CMD_SHOW_DIFFER       "Niektóre ze zmiennych w twoim .taskrc różnią się od wartości domyślnych."
-#define STRING_CMD_SHOW_EMPTY        "Błąd konfiguracji: .taskrc jest puste."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Są one podświetlone na {1}."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Błąd konfiguracji: {1} zawiera nierozpoznaną wartość '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Błąd konfiguracji: data.location nie ustawione w pliku .taskrc."
-#define STRING_CMD_SHOW_LOC_EXIST    "Błąd konfiguracji: data.location zawiera nazwę katalogu który nie istnieje lub jest nieosiągalny."
-#define STRING_CMD_SHOW_CONF_VAR     "Zmienna Konfiguracji"
-#define STRING_CMD_SHOW_CONF_VALUE   "Wartość"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Domyślna wartość"
-#define STRING_CMD_SHOWRAW           "Pokazuje kompletną konfiguracjię w formacie dogodnym dla maszyny"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior nie wspiera więcej formatu plików 1, wcześniej używanego pomiędzy 27 Listopada 2006 i 31 Grudnia 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior nie wspiera więcej formatu plików 2, wcześniej używanego pomiędzy 1 Stycznia 2008 i 12 Kwietnia 2009."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1b82d3d10..f43f90802 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -375,22 +375,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
 #define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
 
-// 'show' command
-#define STRING_CMD_SHOW              "Mostra todas ou um subconjunto das variáveis de configuração"
-#define STRING_CMD_SHOW_ARGS         "Apenas pode específicar 'all' ou uma expressão a procurar."
-#define STRING_CMD_SHOW_NONE         "Nenhuma variável de configuração corresponde à procura."
-#define STRING_CMD_SHOW_UNREC        "O seu ficheiro .taskrc contém as seguintes variávies desconhecidas:"
-#define STRING_CMD_SHOW_DIFFER       "Algumas das variáveis no seu .taskrc diferem dos valores por defeito."
-#define STRING_CMD_SHOW_EMPTY        "Erro de configuração: o ficheiro .taskrc não contém nenhuma entrada."
-#define STRING_CMD_SHOW_DIFFER_COLOR "Estas estão realçadas com {1}."
-#define STRING_CMD_SHOW_CONFIG_ERROR "Erro de configuração: {1} contém um valor desconhecido '{2}'."
-#define STRING_CMD_SHOW_NO_LOCATION  "Erro de configuração: 'data.location' não especificada no ficheiro .taskrc ."
-#define STRING_CMD_SHOW_LOC_EXIST    "Erro de configuração: 'data.location' contém um diretório que não existe ou não é accessível."
-#define STRING_CMD_SHOW_CONF_VAR     "Variável de configuração"
-#define STRING_CMD_SHOW_CONF_VALUE   "Valor"
-#define STRING_CMD_SHOW_CONF_DEFAULT "Valor por defeito"
-#define STRING_CMD_SHOWRAW           "Mostra todas as definições de configuração num formato legível por máquina"
-
 // Task
 #define STRING_TASK_NO_FF1           "Taskwarrior já não suporta o formato 1, originalmente usado entre 27-Novembro-2006 e 31-Dezembro-2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior já não suporta o formato 2, originalmente usado entre 1-Janeiro-2008 e 12-April-2009."

From 23cc9b23e316828d670d3b8c57819e62bf4a85ee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:38:33 -0500
Subject: [PATCH 642/879] l10n: Eliminated STRING_CMD_GET_*

---
 src/commands/CmdGet.cpp | 7 +++----
 src/l10n/deu-DEU.h      | 3 ---
 src/l10n/eng-USA.h      | 3 ---
 src/l10n/epo-RUS.h      | 3 ---
 src/l10n/esp-ESP.h      | 3 ---
 src/l10n/fra-FRA.h      | 3 ---
 src/l10n/ita-ITA.h      | 3 ---
 src/l10n/jpn-JPN.h      | 3 ---
 src/l10n/pol-POL.h      | 3 ---
 src/l10n/por-PRT.h      | 3 ---
 10 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index aac14bfc5..d29093e47 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -32,7 +32,6 @@
 #include <main.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -41,7 +40,7 @@ CmdGet::CmdGet ()
 {
   _keyword               = "_get";
   _usage                 = "task          _get <DOM> [<DOM> ...]";
-  _description           = STRING_CMD_GET_USAGE;
+  _description           = "DOM Accessor";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -81,7 +80,7 @@ int CmdGet::execute (std::string& output)
     case Lexer::Type::identifier:
       if (! arg.hasTag ("BINARY") &&
           ! arg.hasTag ("CMD"))
-        throw format (STRING_CMD_GET_BAD_REF, arg.attribute ("raw"));
+        throw format ("'{1}' is not a DOM reference.", arg.attribute ("raw"));
 
     default:
       break;
@@ -89,7 +88,7 @@ int CmdGet::execute (std::string& output)
   }
 
   if (results.size () == 0)
-    throw std::string (STRING_CMD_GET_NO_DOM);
+    throw std::string ("No DOM reference specified.");
 
   output = join (" ", results);
   output += '\n';
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d42bc0618..354c7af17 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -207,9 +207,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "erledigt"
 #define STRING_CMD_SUMMARY_NONE      "(keine)"
 #define STRING_CMD_COUNT_USAGE       "Zählt gewählte Aufgaben"
-#define STRING_CMD_GET_USAGE         "DOM-Accessor"
-#define STRING_CMD_GET_NO_DOM        "Keine DOM-Referenz spezifiziert."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 593b710d4..860589abc 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -204,9 +204,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Complete"
 #define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "Counts matching tasks"
-#define STRING_CMD_GET_USAGE         "DOM Accessor"
-#define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 548dda1c2..7d783e181 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -207,9 +207,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Finitaj"
 #define STRING_CMD_SUMMARY_NONE      "(nenio)"
 #define STRING_CMD_COUNT_USAGE       "Nombras kongruantajn taskojn"
-#define STRING_CMD_GET_USAGE         "DOM-enirilo"
-#define STRING_CMD_GET_NO_DOM        "Nenia DOM-referenco specifata."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0f7695103..b2d1f711c 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -215,9 +215,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Completas"
 #define STRING_CMD_SUMMARY_NONE      "(ninguna)"
 #define STRING_CMD_COUNT_USAGE       "Cuenta tareas que coinciden"
-#define STRING_CMD_GET_USAGE         "Método de acceso al DOM"
-#define STRING_CMD_GET_NO_DOM        "Referencia a DOM no especificada."
-#define STRING_CMD_GET_BAD_REF       "'{1}' no es una referencia a DOM."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index bb0a491a8..b01455494 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -209,9 +209,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Complete"
 #define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "Compte les taches correspondantes"
-#define STRING_CMD_GET_USAGE         "Accesseur au DOM"
-#define STRING_CMD_GET_NO_DOM        "Aucune référence de DOM spécifié."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 217b523d9..6293046bb 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -208,9 +208,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Completi"
 #define STRING_CMD_SUMMARY_NONE      "(nessuno)"
 #define STRING_CMD_COUNT_USAGE       "Conteggia task corrispondenti"
-#define STRING_CMD_GET_USAGE         "DOM Accessor"
-#define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 7e966f66f..44568b23a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -209,9 +209,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Complete"
 #define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "一致した タスク をカウント"
-#define STRING_CMD_GET_USAGE         "DOM Accessor"
-#define STRING_CMD_GET_NO_DOM        "No DOM reference specified."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 89da77dca..934f0b081 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -209,9 +209,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Ukończone"
 #define STRING_CMD_SUMMARY_NONE      "(brak)"
 #define STRING_CMD_COUNT_USAGE       "Zlicza pasujące zadania"
-#define STRING_CMD_GET_USAGE         "DOM Akcesor"
-#define STRING_CMD_GET_NO_DOM        "Brak zdefiniowanej referencji do DOM."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f43f90802..37ceb6156 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -209,9 +209,6 @@
 #define STRING_CMD_SUMMARY_COMPLETE  "Completo"
 #define STRING_CMD_SUMMARY_NONE      "(nenhum)"
 #define STRING_CMD_COUNT_USAGE       "Conta tarefas correspondentes"
-#define STRING_CMD_GET_USAGE         "Método de acesso ao DOM"
-#define STRING_CMD_GET_NO_DOM        "Referência DOM não especificada."
-#define STRING_CMD_GET_BAD_REF       "'{1}' is not a DOM reference."
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."

From e830176d130d4ab29416b1c4629871b1f70428fd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:51:31 -0500
Subject: [PATCH 643/879] l10n: Eliminated STRING_CMD_BURN_*

---
 src/commands/CmdBurndown.cpp | 26 +++++++++++++-------------
 src/l10n/deu-DEU.h           | 13 -------------
 src/l10n/eng-USA.h           | 13 -------------
 src/l10n/epo-RUS.h           | 13 -------------
 src/l10n/esp-ESP.h           | 13 -------------
 src/l10n/fra-FRA.h           | 13 -------------
 src/l10n/ita-ITA.h           | 13 -------------
 src/l10n/jpn-JPN.h           | 13 -------------
 src/l10n/pol-POL.h           | 13 -------------
 src/l10n/por-PRT.h           | 13 -------------
 10 files changed, 13 insertions(+), 130 deletions(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index ec463781a..66e1536a2 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -387,13 +387,13 @@ std::string Chart::render ()
   if (_graph_height < 5 ||     // a 4-line graph is essentially unreadable.
       _graph_width < 2)        // A single-bar graph is useless.
   {
-    return std::string (STRING_CMD_BURN_TOO_SMALL) + '\n';
+    return std::string ("Terminal window too small to draw a graph.\n");
   }
 
   else if (_graph_height > 1000 || // each line is a string allloc
            _graph_width  > 1000)
   {
-    return std::string (STRING_CMD_BURN_TOO_LARGE) + '\n';
+    return std::string ("Terminal window too large to draw a graph.\n");
   }
 
   if (_max_value == 0)
@@ -408,12 +408,12 @@ std::string Chart::render ()
   std::string full_title;
   switch (_period)
   {
-  case 'D': full_title = STRING_CMD_BURN_DAILY;   break;
-  case 'W': full_title = STRING_CMD_BURN_WEEKLY;  break;
-  case 'M': full_title = STRING_CMD_BURN_MONTHLY; break;
+  case 'D': full_title = "Daily";   break;
+  case 'W': full_title = "Weekly";  break;
+  case 'M': full_title = "Monthly"; break;
   }
 
-  full_title += std::string (" ") + STRING_CMD_BURN_TITLE;
+  full_title += std::string (" Burndown");
 
   if (_title.length ())
   {
@@ -434,9 +434,9 @@ std::string Chart::render ()
   }
 
   // Legend.
-  _grid.replace (LOC (_graph_height / 2 - 1, _width - 10), 10, "DD " + leftJustify (STRING_CMD_BURN_DONE,    7));
-  _grid.replace (LOC (_graph_height / 2,     _width - 10), 10, "SS " + leftJustify (STRING_CMD_BURN_STARTED, 7));
-  _grid.replace (LOC (_graph_height / 2 + 1, _width - 10), 10, "PP " + leftJustify (STRING_CMD_BURN_PENDING, 7));
+  _grid.replace (LOC (_graph_height / 2 - 1, _width - 10), 10, "DD " + leftJustify ("Done",    7));
+  _grid.replace (LOC (_graph_height / 2,     _width - 10), 10, "SS " + leftJustify ("Started", 7));
+  _grid.replace (LOC (_graph_height / 2 + 1, _width - 10), 10, "PP " + leftJustify ("Pending", 7));
 
   // Determine y-axis labelling.
   std::vector <int> _labels;
@@ -857,7 +857,7 @@ void Chart::calculateRates ()
   }
   else
   {
-    _completion = STRING_CMD_BURN_NO_CONVERGE;
+    _completion = "No convergence";
   }
 }
 
@@ -910,7 +910,7 @@ CmdBurndownMonthly::CmdBurndownMonthly ()
 {
   _keyword               = "burndown.monthly";
   _usage                 = "task <filter> burndown.monthly";
-  _description           = STRING_CMD_BURN_USAGE_M;
+  _description           = "Shows a graphical burndown chart, by month";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -945,7 +945,7 @@ CmdBurndownWeekly::CmdBurndownWeekly ()
 {
   _keyword               = "burndown.weekly";
   _usage                 = "task <filter> burndown.weekly";
-  _description           = STRING_CMD_BURN_USAGE_W;
+  _description           = "Shows a graphical burndown chart, by week";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -980,7 +980,7 @@ CmdBurndownDaily::CmdBurndownDaily ()
 {
   _keyword               = "burndown.daily";
   _usage                 = "task <filter> burndown.daily";
-  _description           = STRING_CMD_BURN_USAGE_D;
+  _description           = "Shows a graphical burndown chart, by day";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 354c7af17..f3169ba91 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -316,19 +316,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Wöchentliche Zusammenfassung abgeschlossener und anfgefangener Aufgaben"
 #define STRING_CMD_TIMESHEET_STARTED "Begonnen ({1} Aufgaben)"
 #define STRING_CMD_TIMESHEET_DONE    "Abgeschlossen ({1} Aufgaben)"
-#define STRING_CMD_BURN_USAGE_M      "Zeigt ein Burn-Down-Diagramm, per Monat"
-#define STRING_CMD_BURN_USAGE_W      "Zeigt ein Burn-Down-Diagramm, per Woche"
-#define STRING_CMD_BURN_USAGE_D      "Zeigt ein Burn-Down-Diagramm, per Tag"
-#define STRING_CMD_BURN_TITLE        "Burn-Down"
-#define STRING_CMD_BURN_TOO_SMALL    "Terminal-Fenster zu klein um Graph zu zeichnen"
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Tägliches"
-#define STRING_CMD_BURN_WEEKLY       "Wöchentliches"
-#define STRING_CMD_BURN_MONTHLY      "Monatliches"
-#define STRING_CMD_BURN_STARTED      "Angef."          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Beendet"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Offen"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "Keine Konvergenz"
 #define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 860589abc..84061ff71 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -313,19 +313,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
 #define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
 #define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
-#define STRING_CMD_BURN_USAGE_M      "Shows a graphical burndown chart, by month"
-#define STRING_CMD_BURN_USAGE_W      "Shows a graphical burndown chart, by week"
-#define STRING_CMD_BURN_USAGE_D      "Shows a graphical burndown chart, by day"
-#define STRING_CMD_BURN_TITLE        "Burndown"
-#define STRING_CMD_BURN_TOO_SMALL    "Terminal window too small to draw a graph."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Daily"
-#define STRING_CMD_BURN_WEEKLY       "Weekly"
-#define STRING_CMD_BURN_MONTHLY      "Monthly"
-#define STRING_CMD_BURN_STARTED      "Started"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7d783e181..550896533 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -316,19 +316,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Ĉiusemajna resumo de ĉia tasko finita aŭ ekita"
 #define STRING_CMD_TIMESHEET_STARTED "Ekis ({1} taskojn)"
 #define STRING_CMD_TIMESHEET_DONE    "Finis ({1} taskojn)"
-#define STRING_CMD_BURN_USAGE_M      "Montras ĉiumonatan abakon de taskbrulo"
-#define STRING_CMD_BURN_USAGE_W      "Montras ĉiusemajnan abakon de taskbrulo"
-#define STRING_CMD_BURN_USAGE_D      "Montras ĉiutagan abakon de taskbrulo"
-#define STRING_CMD_BURN_TITLE        "Brulo"
-#define STRING_CMD_BURN_TOO_SMALL    "Terminala fenestro tro malgranda por vidigi grafeon."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Ĉiutaga"
-#define STRING_CMD_BURN_WEEKLY       "Ĉiusemajna"
-#define STRING_CMD_BURN_MONTHLY      "Ĉiumonata"
-#define STRING_CMD_BURN_STARTED      "Ekis"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Finis"         // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pendas"        // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "Nenia konverĝo"
 #define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b2d1f711c..ee8b7d83b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -326,19 +326,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Resumen semanal de tareas completadas y comenzadas"
 #define STRING_CMD_TIMESHEET_STARTED "Comenzadas ({1} tareas)"
 #define STRING_CMD_TIMESHEET_DONE    "Completadas ({1} tareas)"
-#define STRING_CMD_BURN_USAGE_M      "Muestra un diagrama burndown, por meses"
-#define STRING_CMD_BURN_USAGE_W      "Muestra un diagrama burndown, por semanas"
-#define STRING_CMD_BURN_USAGE_D      "Muestra un diagrama burndown, por días"
-#define STRING_CMD_BURN_TITLE        "Burndown"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_BURN_TOO_SMALL    "Ventana de terminal demasiado pequeña para dibujar una gráfica."
-#define STRING_CMD_BURN_TOO_LARGE    "Ventana de terminal demasiado grande para dibujar una gráfica."
-#define STRING_CMD_BURN_DAILY        "Diario"
-#define STRING_CMD_BURN_WEEKLY       "Semanal"
-#define STRING_CMD_BURN_MONTHLY      "Mensual"
-#define STRING_CMD_BURN_STARTED      "Comenz."             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Hechas"              // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pend."               // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "No converge"
 #define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b01455494..ef3490e83 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -318,19 +318,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Résumé hebdomadaire des tâches terminées et démarrées"
 #define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
 #define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
-#define STRING_CMD_BURN_USAGE_M      "Affiche un graphique d'avancement, par mois"
-#define STRING_CMD_BURN_USAGE_W      "Affiche un graphique d'avancement, par semaine"
-#define STRING_CMD_BURN_USAGE_D      "Affiche un graphique d'avancement, par jour"
-#define STRING_CMD_BURN_TITLE        "Burndown"
-#define STRING_CMD_BURN_TOO_SMALL    "Terminal window too small to draw a graph."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Daily"
-#define STRING_CMD_BURN_WEEKLY       "Weekly"
-#define STRING_CMD_BURN_MONTHLY      "Monthly"
-#define STRING_CMD_BURN_STARTED      "Started"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 6293046bb..756cc91dc 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -317,19 +317,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Sommario settimanale dei task completati e avviati"
 #define STRING_CMD_TIMESHEET_STARTED "Avviati ({1} task)"
 #define STRING_CMD_TIMESHEET_DONE    "Completati ({1} task)"
-#define STRING_CMD_BURN_USAGE_M      "Mostra un grafico del lavoro da svolgere, per mese"
-#define STRING_CMD_BURN_USAGE_W      "Mostra un grafico del lavoro da svolgere, per settimana"
-#define STRING_CMD_BURN_USAGE_D      "Mostra un grafico del lavoro da svolgere, per giorno"
-#define STRING_CMD_BURN_TITLE        "Lavoro da svolgere"
-#define STRING_CMD_BURN_TOO_SMALL    "Finestra troppo piccola per mostrare il grafico."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Giornaliero"
-#define STRING_CMD_BURN_WEEKLY       "Settimanale"
-#define STRING_CMD_BURN_MONTHLY      "Mensile"
-#define STRING_CMD_BURN_STARTED      "Avviato"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Chiuso"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Da fare"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "No convergenza"
 #define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 44568b23a..693bdf8ec 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -318,19 +318,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
 #define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
 #define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
-#define STRING_CMD_BURN_USAGE_M      "Shows a graphical burndown chart, by month"
-#define STRING_CMD_BURN_USAGE_W      "Shows a graphical burndown chart, by week"
-#define STRING_CMD_BURN_USAGE_D      "Shows a graphical burndown chart, by day"
-#define STRING_CMD_BURN_TITLE        "Burndown"
-#define STRING_CMD_BURN_TOO_SMALL    "Terminal window too small to draw a graph."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Daily"
-#define STRING_CMD_BURN_WEEKLY       "Weekly"
-#define STRING_CMD_BURN_MONTHLY      "Monthly"
-#define STRING_CMD_BURN_STARTED      "Started"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "No convergence"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 934f0b081..9ca16722c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -318,19 +318,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Tygodniowe podsumowanie z ukończonych i uruchomionych zadań"
 #define STRING_CMD_TIMESHEET_STARTED "Uruchomiono ({1} zadań)"
 #define STRING_CMD_TIMESHEET_DONE    "Ukończono ({1} zadań)"
-#define STRING_CMD_BURN_USAGE_M      "Wyświetla miesięczny postęp w postaci wykresu."
-#define STRING_CMD_BURN_USAGE_W      "Wyświetla tygodniowy postęp w postaci wykresu."
-#define STRING_CMD_BURN_USAGE_D      "Wyświetla dzienny postęp w postaci wykresu."
-#define STRING_CMD_BURN_TITLE        "Postęp"
-#define STRING_CMD_BURN_TOO_SMALL    "Okno terminal jest za małe do wyświetlenia wykresu."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Dzienny"
-#define STRING_CMD_BURN_WEEKLY       "Tygodniowy"
-#define STRING_CMD_BURN_MONTHLY      "Miesięczny"
-#define STRING_CMD_BURN_STARTED      "Started"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Done"             // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Pending"          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "Brak konwergencji" // ?
 #define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 37ceb6156..b66f5683a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -318,19 +318,6 @@
 #define STRING_CMD_TIMESHEET_USAGE   "Sumário semanal de tarefas concluídas e iniciadas"
 #define STRING_CMD_TIMESHEET_STARTED "Iniciadas ({1} tarefas)"
 #define STRING_CMD_TIMESHEET_DONE    "Concluídas ({1} tarefas)"
-#define STRING_CMD_BURN_USAGE_M      "Mostra um gráfico de burndown, por mês"
-#define STRING_CMD_BURN_USAGE_W      "Mostra um gráfico de burndown, por semana"
-#define STRING_CMD_BURN_USAGE_D      "Mostra um gráfico de burndown, por dia"
-#define STRING_CMD_BURN_TITLE        "Burndown"  // |por-PRT|==|eng-USA|
-#define STRING_CMD_BURN_TOO_SMALL    "Janela do terminal demasiado pequena para desenhar o gráfico."
-#define STRING_CMD_BURN_TOO_LARGE    "Terminal window too large to draw a graph."
-#define STRING_CMD_BURN_DAILY        "Diário"
-#define STRING_CMD_BURN_WEEKLY       "Semanal"
-#define STRING_CMD_BURN_MONTHLY      "Mensal"
-#define STRING_CMD_BURN_STARTED      "Inicia."          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_DONE         "Conclu."          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_PENDING      "Penden."          // Must be 7 or fewer characters
-#define STRING_CMD_BURN_NO_CONVERGE  "Não converge"
 #define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."

From b3aa531f4ad9a6b6b54d43a97bfef0d654248e80 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 20:56:54 -0500
Subject: [PATCH 644/879] l10n: Eliminated STRING_CMD_SUMMARY_*

---
 src/commands/CmdSummary.cpp | 12 ++++++------
 src/l10n/deu-DEU.h          |  6 ------
 src/l10n/eng-USA.h          |  6 ------
 src/l10n/epo-RUS.h          |  6 ------
 src/l10n/esp-ESP.h          |  6 ------
 src/l10n/fra-FRA.h          |  6 ------
 src/l10n/ita-ITA.h          |  6 ------
 src/l10n/jpn-JPN.h          |  6 ------
 src/l10n/pol-POL.h          |  6 ------
 src/l10n/por-PRT.h          |  6 ------
 10 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 0b4ecb9bc..880bdf625 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -45,7 +45,7 @@ CmdSummary::CmdSummary ()
 {
   _keyword               = "summary";
   _usage                 = "task <filter> summary";
-  _description           = STRING_CMD_SUMMARY_USAGE;
+  _description           = "Shows a report of task status by project";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -133,10 +133,10 @@ int CmdSummary::execute (std::string& output)
   // Create a table for output.
   Table view;
   view.width (context.getWidth ());
-  view.add (STRING_CMD_SUMMARY_PROJECT);
-  view.add (STRING_CMD_SUMMARY_REMAINING, false);
-  view.add (STRING_CMD_SUMMARY_AVG_AGE,   false);
-  view.add (STRING_CMD_SUMMARY_COMPLETE,  false);
+  view.add ("Project");
+  view.add ("Remaining", false);
+  view.add ("Avg age",   false);
+  view.add ("Complete",  false);
   view.add ("0%                        100%", true, false);
   setHeaderUnderline (view);
 
@@ -168,7 +168,7 @@ int CmdSummary::execute (std::string& output)
 
       int row = view.addRow ();
       view.set (row, 0, (i.first == ""
-                          ? STRING_CMD_SUMMARY_NONE
+                          ? "(none)"
                           : indentProject (i.first, "  ", '.')));
 
       view.set (row, 1, countPending[i.first]);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index f3169ba91..36b5fff40 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -200,12 +200,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} Projekte"
 #define STRING_CMD_PROJECTS_TASK     "({1} Aufgabe)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} Aufgaben)"
-#define STRING_CMD_SUMMARY_USAGE     "Zeigt einen Aufgabenstatusbericht nach Projekten"
-#define STRING_CMD_SUMMARY_PROJECT   "Projekt"
-#define STRING_CMD_SUMMARY_REMAINING "Verbleibend"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Durchschnittliches Alter"
-#define STRING_CMD_SUMMARY_COMPLETE  "erledigt"
-#define STRING_CMD_SUMMARY_NONE      "(keine)"
 #define STRING_CMD_COUNT_USAGE       "Zählt gewählte Aufgaben"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 84061ff71..24f8c02dd 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -197,12 +197,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-#define STRING_CMD_SUMMARY_USAGE     "Shows a report of task status by project"
-#define STRING_CMD_SUMMARY_PROJECT   "Project"
-#define STRING_CMD_SUMMARY_REMAINING "Remaining"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Avg age"
-#define STRING_CMD_SUMMARY_COMPLETE  "Complete"
-#define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "Counts matching tasks"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 550896533..c935d2755 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -200,12 +200,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektoj"
 #define STRING_CMD_PROJECTS_TASK     "({1} tasko)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} taskoj)"
-#define STRING_CMD_SUMMARY_USAGE     "Montras raporton de taska statuso per projekto"
-#define STRING_CMD_SUMMARY_PROJECT   "Projekto"
-#define STRING_CMD_SUMMARY_REMAINING "Restantaj"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Meznª aĝo"
-#define STRING_CMD_SUMMARY_COMPLETE  "Finitaj"
-#define STRING_CMD_SUMMARY_NONE      "(nenio)"
 #define STRING_CMD_COUNT_USAGE       "Nombras kongruantajn taskojn"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ee8b7d83b..6794f7cc7 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -208,12 +208,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} proyectos"
 #define STRING_CMD_PROJECTS_TASK     "({1} tarea)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tareas)"
-#define STRING_CMD_SUMMARY_USAGE     "Muestra un informe de estatus de tareas por proyecto"
-#define STRING_CMD_SUMMARY_PROJECT   "Proyecto"
-#define STRING_CMD_SUMMARY_REMAINING "Quedan"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Edad media"
-#define STRING_CMD_SUMMARY_COMPLETE  "Completas"
-#define STRING_CMD_SUMMARY_NONE      "(ninguna)"
 #define STRING_CMD_COUNT_USAGE       "Cuenta tareas que coinciden"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index ef3490e83..720756019 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -202,12 +202,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-#define STRING_CMD_SUMMARY_USAGE     "Shows a report of task status by project"
-#define STRING_CMD_SUMMARY_PROJECT   "Project"
-#define STRING_CMD_SUMMARY_REMAINING "Remaining"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Avg age"
-#define STRING_CMD_SUMMARY_COMPLETE  "Complete"
-#define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "Compte les taches correspondantes"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 756cc91dc..3a63bcdab 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -201,12 +201,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} progetti"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} task)"
-#define STRING_CMD_SUMMARY_USAGE     "Mostra un report dello stato dei task per progetto"
-#define STRING_CMD_SUMMARY_PROJECT   "Progetto"
-#define STRING_CMD_SUMMARY_REMAINING "Rimanenti"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Età media"
-#define STRING_CMD_SUMMARY_COMPLETE  "Completi"
-#define STRING_CMD_SUMMARY_NONE      "(nessuno)"
 #define STRING_CMD_COUNT_USAGE       "Conteggia task corrispondenti"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 693bdf8ec..f74d9043d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -202,12 +202,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} プロジェクト"
 #define STRING_CMD_PROJECTS_TASK     "({1} タスク)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} タスク)"
-#define STRING_CMD_SUMMARY_USAGE     "Shows a report of task status by project"
-#define STRING_CMD_SUMMARY_PROJECT   "Project"
-#define STRING_CMD_SUMMARY_REMAINING "Remaining"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Avg age"
-#define STRING_CMD_SUMMARY_COMPLETE  "Complete"
-#define STRING_CMD_SUMMARY_NONE      "(none)"
 #define STRING_CMD_COUNT_USAGE       "一致した タスク をカウント"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 9ca16722c..46345e68f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -202,12 +202,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektów"
 #define STRING_CMD_PROJECTS_TASK     "({1} zadanie)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} zadań)"
-#define STRING_CMD_SUMMARY_USAGE     "Pokazuje raport ze stanu zadań per projekt"
-#define STRING_CMD_SUMMARY_PROJECT   "Projekt"
-#define STRING_CMD_SUMMARY_REMAINING "Pozostało"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Średni wiek"
-#define STRING_CMD_SUMMARY_COMPLETE  "Ukończone"
-#define STRING_CMD_SUMMARY_NONE      "(brak)"
 #define STRING_CMD_COUNT_USAGE       "Zlicza pasujące zadania"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index b66f5683a..454751c92 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -202,12 +202,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projetos"
 #define STRING_CMD_PROJECTS_TASK     "({1} tarefa)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tarefas)"
-#define STRING_CMD_SUMMARY_USAGE     "Exibe um relatório do estado das tarefas por projeto"
-#define STRING_CMD_SUMMARY_PROJECT   "Projeto"
-#define STRING_CMD_SUMMARY_REMAINING "Por concluír"
-#define STRING_CMD_SUMMARY_AVG_AGE   "Idade méd"
-#define STRING_CMD_SUMMARY_COMPLETE  "Completo"
-#define STRING_CMD_SUMMARY_NONE      "(nenhum)"
 #define STRING_CMD_COUNT_USAGE       "Conta tarefas correspondentes"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."

From 7c5dca05532af267a561fa6659e7ab1b4daf2700 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:04:56 -0500
Subject: [PATCH 645/879] l10n: Eliminated STRING_CMD_STATS_*

---
 src/commands/CmdStats.cpp | 44 +++++++++++++++++++--------------------
 src/l10n/deu-DEU.h        | 22 --------------------
 src/l10n/eng-USA.h        | 22 --------------------
 src/l10n/epo-RUS.h        | 22 --------------------
 src/l10n/esp-ESP.h        | 24 ---------------------
 src/l10n/fra-FRA.h        | 22 --------------------
 src/l10n/ita-ITA.h        | 22 --------------------
 src/l10n/jpn-JPN.h        | 22 --------------------
 src/l10n/pol-POL.h        | 22 --------------------
 src/l10n/por-PRT.h        | 22 --------------------
 10 files changed, 22 insertions(+), 222 deletions(-)

diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 4d9dddeca..a47625256 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -46,7 +46,7 @@ CmdStats::CmdStats ()
 {
   _keyword               = "stats";
   _usage                 = "task <filter> stats";
-  _description           = STRING_CMD_STATS_USAGE;
+  _description           = "Shows task database statistics";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -158,8 +158,8 @@ int CmdStats::execute (std::string& output)
   Table view;
   view.width (context.getWidth ());
   view.intraPadding (2);
-  view.add (STRING_CMD_STATS_CATEGORY);
-  view.add (STRING_CMD_STATS_DATA);
+  view.add ("Category");
+  view.add ("Data");
   setHeaderUnderline (view);
 
   int row = view.addRow ();
@@ -183,45 +183,45 @@ int CmdStats::execute (std::string& output)
   view.set (row, 1, deletedT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_TOTAL);
+  view.set (row, 0, "Total");
   view.set (row, 1, totalT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_ANNOTATIONS);
+  view.set (row, 0, "Annotations");
   view.set (row, 1, annotationsT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_UNIQUE_TAGS);
+  view.set (row, 0, "Unique tags");
   view.set (row, 1, (int)allTags.size ());
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_PROJECTS);
+  view.set (row, 0, "Projects");
   view.set (row, 1, (int)allProjects.size ());
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_BLOCKED);
+  view.set (row, 0, "Blocked tasks");
   view.set (row, 1, blockedT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_BLOCKING);
+  view.set (row, 0, "Blocking tasks");
   view.set (row, 1, blockingT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_DATA_SIZE);
+  view.set (row, 0, "Data size");
   view.set (row, 1, formatBytes (dataSize));
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_UNDO_TXNS);
+  view.set (row, 0, "Undo transactions");
   view.set (row, 1, undoCount);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_CMD_STATS_BACKLOG);
+  view.set (row, 0, "Sync backlog transactions");
   view.set (row, 1, backlogCount);
 
   if (totalT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_TAGGED);
+    view.set (row, 0, "Tasks tagged");
 
     std::stringstream value;
     value << std::setprecision (3) << (100.0 * taggedT / totalT) << '%';
@@ -232,52 +232,52 @@ int CmdStats::execute (std::string& output)
   {
     Datetime e (earliest);
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_OLDEST);
+    view.set (row, 0, "Oldest task");
     view.set (row, 1, e.toString (dateformat));
 
     Datetime l (latest);
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_NEWEST);
+    view.set (row, 0, "Newest task");
     view.set (row, 1, l.toString (dateformat));
 
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_USED_FOR);
+    view.set (row, 0, "Task used for");
     view.set (row, 1, Duration (latest - earliest).formatVague ());
   }
 
   if (totalT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_ADD_EVERY);
+    view.set (row, 0, "Task added every");
     view.set (row, 1, Duration (((latest - earliest) / totalT)).formatVague ());
   }
 
   if (completedT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_COMP_EVERY);
+    view.set (row, 0, "Task completed every");
     view.set (row, 1, Duration ((latest - earliest) / completedT).formatVague ());
   }
 
   if (deletedT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_DEL_EVERY);
+    view.set (row, 0, "Task deleted every");
     view.set (row, 1, Duration ((latest - earliest) / deletedT).formatVague ());
   }
 
   if (pendingT || completedT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_AVG_PEND);
+    view.set (row, 0, "Average time pending");
     view.set (row, 1, Duration ((int) ((daysPending / (pendingT + completedT)) * 86400)).formatVague ());
   }
 
   if (totalT)
   {
     row = view.addRow ();
-    view.set (row, 0, STRING_CMD_STATS_DESC_LEN);
-    view.set (row, 1, format (STRING_CMD_STATS_CHARS, (int) (descLength / totalT)));
+    view.set (row, 0, "Average desc length");
+    view.set (row, 1, format ("{1} characters", (int) (descLength / totalT)));
   }
 
   // If an alternating row color is specified, notify the table.
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 36b5fff40..64ef42d18 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Letzte Änderung"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
-#define STRING_CMD_STATS_USAGE       "Zeigt Statistiken zur Aufgaben-Datenbank"
-#define STRING_CMD_STATS_CATEGORY    "Kategorie"
-#define STRING_CMD_STATS_DATA        "Daten"
-#define STRING_CMD_STATS_TOTAL       "Summe"
-#define STRING_CMD_STATS_ANNOTATIONS "Annotationen"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Unterschiedliche Schlagwörter"
-#define STRING_CMD_STATS_PROJECTS    "Projekte"
-#define STRING_CMD_STATS_DATA_SIZE   "Datenmenge"
-#define STRING_CMD_STATS_UNDO_TXNS   "Transaktionen rückgängig machen"
-#define STRING_CMD_STATS_BACKLOG     "Zu synchronisierende Aufgaben"
-#define STRING_CMD_STATS_TAGGED      "Verschlagwortete Aufgaben"
-#define STRING_CMD_STATS_OLDEST      "Älteste Aufgabe"
-#define STRING_CMD_STATS_NEWEST      "Neueste Aufgabe"
-#define STRING_CMD_STATS_USED_FOR    "Task genutzt"
-#define STRING_CMD_STATS_ADD_EVERY   "Aufgabe hinzugefügt alle"
-#define STRING_CMD_STATS_COMP_EVERY  "Aufgabe erledigt alle"
-#define STRING_CMD_STATS_DEL_EVERY   "Aufgabe gelöscht alle"
-#define STRING_CMD_STATS_AVG_PEND    "Durchschnittliche Zeit im Offen-Status"
-#define STRING_CMD_STATS_DESC_LEN    "Durchschnittliche Beschreibungslänge"
-#define STRING_CMD_STATS_CHARS       "{1} Zeichen"
-#define STRING_CMD_STATS_BLOCKED     "Blockierte Aufgaben"
-#define STRING_CMD_STATS_BLOCKING    "Blockierende Aufgaben"
 #define STRING_CMD_REPORTS_USAGE     "Zeigt alle unterstützten Reports"
 #define STRING_CMD_REPORTS_REPORT    "Report"
 #define STRING_CMD_REPORTS_DESC      "Beschreibung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 24f8c02dd..de10efd7d 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -132,28 +132,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Last modified"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_STATS_USAGE       "Shows task database statistics"
-#define STRING_CMD_STATS_CATEGORY    "Category"
-#define STRING_CMD_STATS_DATA        "Data"
-#define STRING_CMD_STATS_TOTAL       "Total"
-#define STRING_CMD_STATS_ANNOTATIONS "Annotations"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Unique tags"
-#define STRING_CMD_STATS_PROJECTS    "Projects"
-#define STRING_CMD_STATS_DATA_SIZE   "Data size"
-#define STRING_CMD_STATS_UNDO_TXNS   "Undo transactions"
-#define STRING_CMD_STATS_BACKLOG     "Sync backlog transactions"
-#define STRING_CMD_STATS_TAGGED      "Tasks tagged"
-#define STRING_CMD_STATS_OLDEST      "Oldest task"
-#define STRING_CMD_STATS_NEWEST      "Newest task"
-#define STRING_CMD_STATS_USED_FOR    "Task used for"
-#define STRING_CMD_STATS_ADD_EVERY   "Task added every"
-#define STRING_CMD_STATS_COMP_EVERY  "Task completed every"
-#define STRING_CMD_STATS_DEL_EVERY   "Task deleted every"
-#define STRING_CMD_STATS_AVG_PEND    "Average time pending"
-#define STRING_CMD_STATS_DESC_LEN    "Average desc length"
-#define STRING_CMD_STATS_CHARS       "{1} characters"
-#define STRING_CMD_STATS_BLOCKED     "Blocked tasks"
-#define STRING_CMD_STATS_BLOCKING    "Blocking tasks"
 #define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
 #define STRING_CMD_REPORTS_REPORT    "Report"
 #define STRING_CMD_REPORTS_DESC      "Description"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c935d2755..18e47a9dc 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Modifado lasta"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
-#define STRING_CMD_STATS_USAGE       "Montras statistikon de la taska datumbazo"
-#define STRING_CMD_STATS_CATEGORY    "Kategorio"
-#define STRING_CMD_STATS_DATA        "datumoj"
-#define STRING_CMD_STATS_TOTAL       "Totalo"
-#define STRING_CMD_STATS_ANNOTATIONS "Komentoj"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Unikaj etikedoj"
-#define STRING_CMD_STATS_PROJECTS    "Projektoj"
-#define STRING_CMD_STATS_DATA_SIZE   "Datena grandeco"
-#define STRING_CMD_STATS_UNDO_TXNS   "Malfaradoj"
-#define STRING_CMD_STATS_BACKLOG     "Sinkronigadoj"
-#define STRING_CMD_STATS_TAGGED      "Taskoj etikedataj"
-#define STRING_CMD_STATS_OLDEST      "Plej malnova tasko"
-#define STRING_CMD_STATS_NEWEST      "Plej nova tasko"
-#define STRING_CMD_STATS_USED_FOR    "Taskwarrior uzata ekde"
-#define STRING_CMD_STATS_ADD_EVERY   "Tasko kreata ĉiu"
-#define STRING_CMD_STATS_COMP_EVERY  "Tasko finata ĉiu"
-#define STRING_CMD_STATS_DEL_EVERY   "Tasko viŝata ĉiu"
-#define STRING_CMD_STATS_AVG_PEND    "Meznª pendtempo"
-#define STRING_CMD_STATS_DESC_LEN    "Meznª priskriblongeco"
-#define STRING_CMD_STATS_CHARS       "{1} signojn"
-#define STRING_CMD_STATS_BLOCKED     "Taskoj blokataj"
-#define STRING_CMD_STATS_BLOCKING    "Taskoj blokantaj"
 #define STRING_CMD_REPORTS_USAGE     "Listigas ĉian raporton subtenatan"
 #define STRING_CMD_REPORTS_REPORT    "Raporto"
 #define STRING_CMD_REPORTS_DESC      "Priskribo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 6794f7cc7..7e07f082b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -135,30 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Modificada por última vez"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Marcas virtuales"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
-#define STRING_CMD_STATS_USAGE       "Muestra estadísticas de la base de datos de tareas"
-#define STRING_CMD_STATS_CATEGORY    "Categoría"
-#define STRING_CMD_STATS_DATA        "Datos"
-#define STRING_CMD_STATS_TOTAL       "Total"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_STATS_ANNOTATIONS "Anotaciones"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Marcas únicas"
-#define STRING_CMD_STATS_PROJECTS    "Proyectos"
-#define STRING_CMD_STATS_DATA_SIZE   "Tamaño de datos"
-#define STRING_CMD_STATS_UNDO_TXNS   "Transacciones deshacer"
-#define STRING_CMD_STATS_BACKLOG     "Sincroniza transacciones atrasadas"
-#define STRING_CMD_STATS_TAGGED      "Tareas marcadas"
-#define STRING_CMD_STATS_OLDEST      "Tarea más antigua"
-#define STRING_CMD_STATS_NEWEST      "Tarea más reciente"
-//#define STRING_CMD_STATS_USED_FOR    "Tarea usada por"
-#define STRING_CMD_STATS_USED_FOR    "Tarea en uso durante"
-#define STRING_CMD_STATS_ADD_EVERY   "Tarea añadida cada"
-#define STRING_CMD_STATS_COMP_EVERY  "Tarea completada cada"
-#define STRING_CMD_STATS_DEL_EVERY   "Tarea suprimida cada"
-#define STRING_CMD_STATS_AVG_PEND    "Tiempo medio pendiente"
-
-#define STRING_CMD_STATS_DESC_LEN    "Longitud media de desc"
-#define STRING_CMD_STATS_CHARS       "{1} caracteres"
-#define STRING_CMD_STATS_BLOCKED     "Tareas bloqueadas"
-#define STRING_CMD_STATS_BLOCKING    "Tareas bloqueantes"
 #define STRING_CMD_REPORTS_USAGE     "Lista todos los informes soportados"
 #define STRING_CMD_REPORTS_REPORT    "Informe"
 #define STRING_CMD_REPORTS_DESC      "Descripción"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 720756019..14443fdf2 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Dernier modifié"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
-#define STRING_CMD_STATS_USAGE       "Affiche les statistiques de la base de donnée"
-#define STRING_CMD_STATS_CATEGORY    "Catégorie"
-#define STRING_CMD_STATS_DATA        "Données"
-#define STRING_CMD_STATS_TOTAL       "Total"
-#define STRING_CMD_STATS_ANNOTATIONS "Annotations"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Étiquettes uniques"
-#define STRING_CMD_STATS_PROJECTS    "Projets"
-#define STRING_CMD_STATS_DATA_SIZE   "Taille des données"
-#define STRING_CMD_STATS_UNDO_TXNS   "Transactions de défaire"
-#define STRING_CMD_STATS_BACKLOG     "Sync backlog transactions"
-#define STRING_CMD_STATS_TAGGED      "Tâches étiquetées"
-#define STRING_CMD_STATS_OLDEST      "Tâche la plus ancienne"
-#define STRING_CMD_STATS_NEWEST      "Tâche la plus récente"
-#define STRING_CMD_STATS_USED_FOR    "Taskwarrior utilisé depuis"
-#define STRING_CMD_STATS_ADD_EVERY   "Tâche ajoutée tous les"
-#define STRING_CMD_STATS_COMP_EVERY  "Tâche terminée tous les"
-#define STRING_CMD_STATS_DEL_EVERY   "Tâche supprimée tous les"
-#define STRING_CMD_STATS_AVG_PEND    "Durée moyenne d'activité"
-#define STRING_CMD_STATS_DESC_LEN    "Longueur moyenne des descriptions"
-#define STRING_CMD_STATS_CHARS       "{1} caractères"
-#define STRING_CMD_STATS_BLOCKED     "Tâches bloquées"
-#define STRING_CMD_STATS_BLOCKING    "Tâches bloquantes"
 #define STRING_CMD_REPORTS_USAGE     "Liste tous les rapports supportés"
 #define STRING_CMD_REPORTS_REPORT    "Rapport"
 #define STRING_CMD_REPORTS_DESC      "Description"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 3a63bcdab..2f54f594b 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -134,28 +134,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Ultima modifica"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
-#define STRING_CMD_STATS_USAGE       "Mostra le statistiche sul task"
-#define STRING_CMD_STATS_CATEGORY    "Categoria"
-#define STRING_CMD_STATS_DATA        "Dati"
-#define STRING_CMD_STATS_TOTAL       "Totale"
-#define STRING_CMD_STATS_ANNOTATIONS "Annotazioni"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Tag univoci"
-#define STRING_CMD_STATS_PROJECTS    "Progetti"
-#define STRING_CMD_STATS_DATA_SIZE   "Dimensione dati"
-#define STRING_CMD_STATS_UNDO_TXNS   "Transazioni di undo"
-#define STRING_CMD_STATS_BACKLOG     "Sincronizza le transazioni di backlog"
-#define STRING_CMD_STATS_TAGGED      "Task taggati"
-#define STRING_CMD_STATS_OLDEST      "Task più vecchio"
-#define STRING_CMD_STATS_NEWEST      "Task più recente"
-#define STRING_CMD_STATS_USED_FOR    "Task usati per"
-#define STRING_CMD_STATS_ADD_EVERY   "Task aggiunti ogni"
-#define STRING_CMD_STATS_COMP_EVERY  "Task completati ogni"
-#define STRING_CMD_STATS_DEL_EVERY   "Task cancellati ogni"
-#define STRING_CMD_STATS_AVG_PEND    "Tempo medio di attesa"
-#define STRING_CMD_STATS_DESC_LEN    "Lunghezza media delle descrizioni"
-#define STRING_CMD_STATS_CHARS       "{1} caratteri"
-#define STRING_CMD_STATS_BLOCKED     "Task bloccati"
-#define STRING_CMD_STATS_BLOCKING    "Task bloccanti"
 #define STRING_CMD_REPORTS_USAGE     "Lista dei report supportati"
 #define STRING_CMD_REPORTS_REPORT    "Report"
 #define STRING_CMD_REPORTS_DESC      "Descrizione"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f74d9043d..345d0f289 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Last modified"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_STATS_USAGE       "タスク データベース情報を表示"
-#define STRING_CMD_STATS_CATEGORY    "Category"
-#define STRING_CMD_STATS_DATA        "Data"
-#define STRING_CMD_STATS_TOTAL       "Total"
-#define STRING_CMD_STATS_ANNOTATIONS "Annotations"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Unique tags"
-#define STRING_CMD_STATS_PROJECTS    "Projects"
-#define STRING_CMD_STATS_DATA_SIZE   "Data size"
-#define STRING_CMD_STATS_UNDO_TXNS   "Undo transactions"
-#define STRING_CMD_STATS_BACKLOG     "Sync backlog transactions"
-#define STRING_CMD_STATS_TAGGED      "Tasks tagged"
-#define STRING_CMD_STATS_OLDEST      "最古の タスク"
-#define STRING_CMD_STATS_NEWEST      "最新の タスク"
-#define STRING_CMD_STATS_USED_FOR    "Task used for"
-#define STRING_CMD_STATS_ADD_EVERY   "Task added every"
-#define STRING_CMD_STATS_COMP_EVERY  "Task completed every"
-#define STRING_CMD_STATS_DEL_EVERY   "Task deleted every"
-#define STRING_CMD_STATS_AVG_PEND    "Average time pending"
-#define STRING_CMD_STATS_DESC_LEN    "Average desc length"
-#define STRING_CMD_STATS_CHARS       "{1} 文字"
-#define STRING_CMD_STATS_BLOCKED     "ブロックされたタスク"
-#define STRING_CMD_STATS_BLOCKING    "Blocking tasks"
 #define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
 #define STRING_CMD_REPORTS_REPORT    "Report"
 #define STRING_CMD_REPORTS_DESC      "Description"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 46345e68f..921e44e9d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Ostatnio zmodyfikowane"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
-#define STRING_CMD_STATS_USAGE       "Pokazuje statystyki bazy danych zadań"
-#define STRING_CMD_STATS_CATEGORY    "Kategoria"
-#define STRING_CMD_STATS_DATA        "Data"
-#define STRING_CMD_STATS_TOTAL       "Razem"
-#define STRING_CMD_STATS_ANNOTATIONS "Notatek"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Unikalnych tagów"
-#define STRING_CMD_STATS_PROJECTS    "Projekty"
-#define STRING_CMD_STATS_DATA_SIZE   "Rozmiar danych"
-#define STRING_CMD_STATS_UNDO_TXNS   "Transakcji Cofnij"
-#define STRING_CMD_STATS_BACKLOG     "Transakcji Sync backlog"
-#define STRING_CMD_STATS_TAGGED      "Otagowanych zadań"
-#define STRING_CMD_STATS_OLDEST      "Najstarsze zadanie"
-#define STRING_CMD_STATS_NEWEST      "Najnowsze zadanie"
-#define STRING_CMD_STATS_USED_FOR    "Zadanie używane przez"
-#define STRING_CMD_STATS_ADD_EVERY   "Zadanie dodawane co"
-#define STRING_CMD_STATS_COMP_EVERY  "Zadanie kończone co"
-#define STRING_CMD_STATS_DEL_EVERY   "Zadanie usuwane co"
-#define STRING_CMD_STATS_AVG_PEND    "Średni czas w toku"
-#define STRING_CMD_STATS_DESC_LEN    "Średnia długość opisu"
-#define STRING_CMD_STATS_CHARS       "{1} znaków"
-#define STRING_CMD_STATS_BLOCKED     "Zadania blokowane"
-#define STRING_CMD_STATS_BLOCKING    "Zadania blokujące"
 #define STRING_CMD_REPORTS_USAGE     "Lista wszystkich wspieranych raportów"
 #define STRING_CMD_REPORTS_REPORT    "Raport"
 #define STRING_CMD_REPORTS_DESC      "Opis"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 454751c92..331a43679 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -135,28 +135,6 @@
 #define STRING_CMD_INFO_MODIFIED     "Última modificação"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
-#define STRING_CMD_STATS_USAGE       "Exibe estatísticas da base de dados de tarefas"
-#define STRING_CMD_STATS_CATEGORY    "Categoria"
-#define STRING_CMD_STATS_DATA        "Dados"
-#define STRING_CMD_STATS_TOTAL       "Total"  // |por-PRT|==|eng-USA|
-#define STRING_CMD_STATS_ANNOTATIONS "Anotações"
-#define STRING_CMD_STATS_UNIQUE_TAGS "Marcas Únicas"
-#define STRING_CMD_STATS_PROJECTS    "Projetos"
-#define STRING_CMD_STATS_DATA_SIZE   "Tamanho dos dados"
-#define STRING_CMD_STATS_UNDO_TXNS   "Operações a desfazer - 'undo'"
-#define STRING_CMD_STATS_BACKLOG     "Operações a sincronizar - 'sync'"
-#define STRING_CMD_STATS_TAGGED      "Tarefas marcadas"
-#define STRING_CMD_STATS_OLDEST      "Tarefa mais antiga"
-#define STRING_CMD_STATS_NEWEST      "Tarefa mais recente"
-#define STRING_CMD_STATS_USED_FOR    "Task usado durante"
-#define STRING_CMD_STATS_ADD_EVERY   "Tarefa adicionada cada"
-#define STRING_CMD_STATS_COMP_EVERY  "Tarefa concluída cada"
-#define STRING_CMD_STATS_DEL_EVERY   "Tarefa eliminada cada"
-#define STRING_CMD_STATS_AVG_PEND    "Tempo médio pendente"
-#define STRING_CMD_STATS_DESC_LEN    "Tamanho médio de descrição"
-#define STRING_CMD_STATS_CHARS       "{1} caracteres"
-#define STRING_CMD_STATS_BLOCKED     "Tarefas bloqueadas"
-#define STRING_CMD_STATS_BLOCKING    "Tarefas a bloquear"
 #define STRING_CMD_REPORTS_USAGE     "Lista todos os relatórios suportados"
 #define STRING_CMD_REPORTS_REPORT    "Relatório"
 #define STRING_CMD_REPORTS_DESC      "Descrição"

From df7967c6f8dd0c94c5d747d0eb3b012993ccf249 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:07:37 -0500
Subject: [PATCH 646/879] l10n: Eliminated STRING_CMD_COUNT_*

---
 src/commands/CmdCount.cpp | 3 +--
 src/l10n/deu-DEU.h        | 1 -
 src/l10n/eng-USA.h        | 1 -
 src/l10n/epo-RUS.h        | 1 -
 src/l10n/esp-ESP.h        | 1 -
 src/l10n/fra-FRA.h        | 1 -
 src/l10n/ita-ITA.h        | 1 -
 src/l10n/jpn-JPN.h        | 1 -
 src/l10n/pol-POL.h        | 1 -
 src/l10n/por-PRT.h        | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 8ed278f42..7b40532e3 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -29,14 +29,13 @@
 #include <Filter.h>
 #include <main.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 CmdCount::CmdCount ()
 {
   _keyword               = "count";
   _usage                 = "task <filter> count";
-  _description           = STRING_CMD_COUNT_USAGE;
+  _description           = "Counts matching tasks";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 64ef42d18..b555687e4 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -178,7 +178,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} Projekte"
 #define STRING_CMD_PROJECTS_TASK     "({1} Aufgabe)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} Aufgaben)"
-#define STRING_CMD_COUNT_USAGE       "Zählt gewählte Aufgaben"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index de10efd7d..1354a544c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -175,7 +175,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-#define STRING_CMD_COUNT_USAGE       "Counts matching tasks"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 18e47a9dc..0f5a3e2d7 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -178,7 +178,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektoj"
 #define STRING_CMD_PROJECTS_TASK     "({1} tasko)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} taskoj)"
-#define STRING_CMD_COUNT_USAGE       "Nombras kongruantajn taskojn"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7e07f082b..9ffd75ccc 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -184,7 +184,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} proyectos"
 #define STRING_CMD_PROJECTS_TASK     "({1} tarea)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tareas)"
-#define STRING_CMD_COUNT_USAGE       "Cuenta tareas que coinciden"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 14443fdf2..9deba0045 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -180,7 +180,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-#define STRING_CMD_COUNT_USAGE       "Compte les taches correspondantes"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 2f54f594b..82275b321 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -179,7 +179,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} progetti"
 #define STRING_CMD_PROJECTS_TASK     "({1} task)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} task)"
-#define STRING_CMD_COUNT_USAGE       "Conteggia task corrispondenti"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 345d0f289..d30d808ae 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -180,7 +180,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} プロジェクト"
 #define STRING_CMD_PROJECTS_TASK     "({1} タスク)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} タスク)"
-#define STRING_CMD_COUNT_USAGE       "一致した タスク をカウント"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 921e44e9d..e7932695e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -180,7 +180,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektów"
 #define STRING_CMD_PROJECTS_TASK     "({1} zadanie)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} zadań)"
-#define STRING_CMD_COUNT_USAGE       "Zlicza pasujące zadania"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 331a43679..e07e84f59 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -180,7 +180,6 @@
 #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projetos"
 #define STRING_CMD_PROJECTS_TASK     "({1} tarefa)"
 #define STRING_CMD_PROJECTS_TASKS    "({1} tarefas)"
-#define STRING_CMD_COUNT_USAGE       "Conta tarefas correspondentes"
 
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."

From bbc9c0bb476f1d8aff8a79c8154f276d11c9bde7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:12:12 -0500
Subject: [PATCH 647/879] l10n: Eliminated STRING_CMD_ANNO_*

---
 src/commands/CmdAnnotate.cpp | 14 +++++++-------
 src/l10n/deu-DEU.h           |  9 ---------
 src/l10n/eng-USA.h           |  9 ---------
 src/l10n/epo-RUS.h           |  9 ---------
 src/l10n/esp-ESP.h           |  9 ---------
 src/l10n/fra-FRA.h           |  9 ---------
 src/l10n/ita-ITA.h           |  9 ---------
 src/l10n/jpn-JPN.h           |  9 ---------
 src/l10n/pol-POL.h           |  9 ---------
 src/l10n/por-PRT.h           |  9 ---------
 10 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 1ae5b1c9e..f837db508 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -41,7 +41,7 @@ CmdAnnotate::CmdAnnotate ()
 {
   _keyword               = "annotate";
   _usage                 = "task <filter> annotate <mods>";
-  _description           = STRING_CMD_ANNO_USAGE;
+  _description           = "Adds an annotation to an existing task";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -78,7 +78,7 @@ int CmdAnnotate::execute (std::string&)
     Task before (task);
 
     // Annotate the specified task.
-    std::string question = format (STRING_CMD_ANNO_CONFIRM,
+    std::string question = format ("Annotate task {1} '{2}'?",
                                    task.identifier (true),
                                    task.get ("description"));
 
@@ -88,7 +88,7 @@ int CmdAnnotate::execute (std::string&)
     {
       context.tdb2.modify (task);
       ++count;
-      feedback_affected (STRING_CMD_ANNO_TASK, task);
+      feedback_affected ("Annotating task {1} '{2}'.", task);
       if (context.verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
@@ -96,7 +96,7 @@ int CmdAnnotate::execute (std::string&)
       if (task.has ("parent"))
       {
         if ((context.config.get ("recurrence.confirmation") == "prompt"
-             && confirm (STRING_CMD_ANNO_CONFIRM_R)) ||
+             && confirm ("This is a recurring task.  Do you want to annotate all pending recurrences of this same task?")) ||
             context.config.getBoolean ("recurrence.confirmation"))
         {
           auto siblings = context.tdb2.siblings (task);
@@ -105,7 +105,7 @@ int CmdAnnotate::execute (std::string&)
             sibling.modify (Task::modAnnotate, true);
             context.tdb2.modify (sibling);
             ++count;
-            feedback_affected (STRING_CMD_ANNO_TASK_R, sibling);
+            feedback_affected ("Annotating recurring task {1} '{2}'.", sibling);
           }
 
           // Annotate the parent
@@ -118,7 +118,7 @@ int CmdAnnotate::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_ANNO_NO << '\n';
+      std::cout << "Task not annotated.\n";
       rc = 1;
       if (_permission_quit)
         break;
@@ -130,7 +130,7 @@ int CmdAnnotate::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_ANNO_1 : STRING_CMD_ANNO_N, count);
+  feedback_affected (count == 1 ? "Annotated {1} task." : "Annotated {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b555687e4..ede35d3e8 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -205,15 +205,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Vor Aufgabe {1} '{2}' anfügen?"
 #define STRING_CMD_PREPEND_NO        "Nicht vor Aufgabe angefügt."
 
-#define STRING_CMD_ANNO_USAGE        "Kommentiert eine bestehene Aufgabe"
-#define STRING_CMD_ANNO_CONFIRM      "Aufgabe {1} '{2}' kommentieren?"
-#define STRING_CMD_ANNO_TASK         "Kommentiere Aufgabe {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Kommentiere wiederholende Aufgabe {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "Dies ist eine wiederholende Aufgabe.  Möchten Sie alle offenen Wiederholungen dieser Aufgabe kommentieren?"
-#define STRING_CMD_ANNO_NO           "Aufgabe nicht kommentiert."
-#define STRING_CMD_ANNO_1            "{1} Aufgabe kommentiert."
-#define STRING_CMD_ANNO_N            "{1} Aufgaben kommentiert."
-
 #define STRING_CMD_DENO_USAGE        "Löscht einen Kommentar"
 #define STRING_CMD_DENO_NONE         "Die gewählte Aufgabe hat keine Kommentare, welche gelöscht werden können."
 #define STRING_CMD_DENO_CONFIRM      "Kommentar in Aufgabe {1} '{2}' löschen?"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1354a544c..784b48318 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -202,15 +202,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Task not prepended."
 
-#define STRING_CMD_ANNO_USAGE        "Adds an annotation to an existing task"
-#define STRING_CMD_ANNO_CONFIRM      "Annotate task {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Annotating task {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Annotating recurring task {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "This is a recurring task.  Do you want to annotate all pending recurrences of this same task?"
-#define STRING_CMD_ANNO_NO           "Task not annotated."
-#define STRING_CMD_ANNO_1            "Annotated {1} task."
-#define STRING_CMD_ANNO_N            "Annotated {1} tasks."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
 #define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0f5a3e2d7..050b66f29 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -205,15 +205,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Predonis al taskon {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Ne predonis al tasko."
 
-#define STRING_CMD_ANNO_USAGE        "Donas komenton al ekzistanta tasko"
-#define STRING_CMD_ANNO_CONFIRM      "Komenti taskon {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Komentanta taskon {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Komentanta reokazantan taskon {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "Tiu esta reokazanta tasko. Ĉu vi volas komenti ĉia pendanta okazaĵo de tiu tasko?"
-#define STRING_CMD_ANNO_NO           "Ne komentis taskon."
-#define STRING_CMD_ANNO_1            "Komentis {1} taskon."
-#define STRING_CMD_ANNO_N            "Komentis {1} taskojn."
-
 #define STRING_CMD_DENO_USAGE        "Viŝas komenton"
 #define STRING_CMD_DENO_NONE         "La specifita tasko ne havas nenian viŝeblan komenton."
 #define STRING_CMD_DENO_CONFIRM      "Malkomenti taskon {1} '{2}'?"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 9ffd75ccc..c06eeb693 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -211,15 +211,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "¿Anteponer texto a la tarea {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Texto no antepuesto."
 
-#define STRING_CMD_ANNO_USAGE        "Añade una anotación a una tarea existente"
-#define STRING_CMD_ANNO_CONFIRM      "¿Anotar la tarea {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Anotando la tarea {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Anotando la tarea recurrente {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "Esta es una tarea recurrente. ¿Quiere anotar todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_ANNO_NO           "Tarea no anotada."
-#define STRING_CMD_ANNO_1            "Anotada {1} tarea."
-#define STRING_CMD_ANNO_N            "Anotadas {1} tareas."
-
 #define STRING_CMD_DENO_USAGE        "Elimina una anotación"
 #define STRING_CMD_DENO_NONE         "La tarea especificada no tiene anotaciones que puedan ser eliminadas."
 #define STRING_CMD_DENO_CONFIRM      "¿Desanotar la tarea {1} '{2}'?"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 9deba0045..41bf3fee2 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Tâche not prepended."
 
-#define STRING_CMD_ANNO_USAGE        "Adds an annotation to an existing task"
-#define STRING_CMD_ANNO_CONFIRM      "Annotate task {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Annotating task {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Annotating recurring task {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "This is a recurring task.  Do you want to annotate all pending recurrences of this same task?"
-#define STRING_CMD_ANNO_NO           "Tâche non annotée."
-#define STRING_CMD_ANNO_1            "Annotated {1} task."
-#define STRING_CMD_ANNO_N            "Annotated {1} tasks."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
 #define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 82275b321..d109573ca 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -206,15 +206,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Aggiungere all'inizio della descrizione del task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Aggiunta non effettuata."
 
-#define STRING_CMD_ANNO_USAGE        "Aggiunge una annotazione a un task esistente"
-#define STRING_CMD_ANNO_CONFIRM      "Aggiungere una annotazione al task {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Aggiunta al task {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Aggiunta al task periodico {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "Questo è un task periodico. Aggiungere una annotazione a tutti i task associati?"
-#define STRING_CMD_ANNO_NO           "Aggiunta non effettuata."
-#define STRING_CMD_ANNO_1            "Aggiunta al task {1}."
-#define STRING_CMD_ANNO_N            "Aggiunte ai task {1}."
-
 #define STRING_CMD_DENO_USAGE        "Cancella una annotazione"
 #define STRING_CMD_DENO_NONE         "Il task specificato non ha annotazioni che possano essere cancellate."
 #define STRING_CMD_DENO_CONFIRM      "Denotare il task {1} '{2}'?"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index d30d808ae..6c33681ad 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Task not prepended."
 
-#define STRING_CMD_ANNO_USAGE        "既存のタスクに注釈を追加"
-#define STRING_CMD_ANNO_CONFIRM      "Annotate task {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "タスク{1} に注釈 '{2}' を追加"
-#define STRING_CMD_ANNO_TASK_R       "Annotating recurring task {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "This is a recurring task.  Do you want to annotate all pending recurrences of this same task?"
-#define STRING_CMD_ANNO_NO           "Task not annotated."
-#define STRING_CMD_ANNO_1            "{1} task に注釈付加."
-#define STRING_CMD_ANNO_N            "{1} task に注釈付加."
-
 #define STRING_CMD_DENO_USAGE        "Deletes an annotation"
 #define STRING_CMD_DENO_NONE         "指定されたtaskには注釈がないので削除できません。"
 #define STRING_CMD_DENO_CONFIRM      "タスク {1} から注釈 '{2}' を削除しますか?"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e7932695e..6c013be4f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Dodać ciąg do opisu zadania {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Nie dodano ciągu do opisu."
 
-#define STRING_CMD_ANNO_USAGE        "Dodaje komentarz do istniejącego zadania"
-#define STRING_CMD_ANNO_CONFIRM      "Skomentować zadanie {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "Komentowanie zadania {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "Komentowanie zadania cyklicznego {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "To zadanie jest cykliczne. Czy chcesz skomentować kolejne zadania w cyklu?"
-#define STRING_CMD_ANNO_NO           "Nie skomentowano zadania."
-#define STRING_CMD_ANNO_1            "Skomentowano {1} zadanie."
-#define STRING_CMD_ANNO_N            "Skomentowano {1} zadań."
-
 #define STRING_CMD_DENO_USAGE        "Usuwa komentarz"
 #define STRING_CMD_DENO_NONE         "Wybrane zadanie nie posiada komentarza do usunięcia."
 #define STRING_CMD_DENO_CONFIRM      "Usunąć komentarz zadania {1} '{2}'?"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e07e84f59..27068da7d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Antepor à tarefa {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Tarefa não anteposta."
 
-#define STRING_CMD_ANNO_USAGE        "Adiciona uma anotação a uma tarefa existente"
-#define STRING_CMD_ANNO_CONFIRM      "Anotar tarefa {1} '{2}'?"
-#define STRING_CMD_ANNO_TASK         "A anotar tarefa {1} '{2}'."
-#define STRING_CMD_ANNO_TASK_R       "A anotar tarefa recorrente {1} '{2}'."
-#define STRING_CMD_ANNO_CONFIRM_R    "Esta é uma tarefa recorrente. Deseja anotar em todas as ocorrências pendentes desta tarefa?"
-#define STRING_CMD_ANNO_NO           "Tarefa não anotada."
-#define STRING_CMD_ANNO_1            "Anotada {1} tarefa."
-#define STRING_CMD_ANNO_N            "Anotadas {1} tarefas."
-
 #define STRING_CMD_DENO_USAGE        "Elimina uma anotação"
 #define STRING_CMD_DENO_NONE         "A tarefa especificada não tem anotações que possam ser eliminadas."
 #define STRING_CMD_DENO_CONFIRM      "Remover anotação da tarefa {1} '{2}'?"

From cafe1478e61e62bfed696b7f9a1b6f56f582a254 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:16:21 -0500
Subject: [PATCH 648/879] l10n: Eliminated STRING_CMD_DENO_*

---
 src/commands/CmdDenotate.cpp | 14 +++++++++-----
 src/l10n/deu-DEU.h           |  9 ---------
 src/l10n/eng-USA.h           |  9 ---------
 src/l10n/epo-RUS.h           |  9 ---------
 src/l10n/esp-ESP.h           |  9 ---------
 src/l10n/fra-FRA.h           |  9 ---------
 src/l10n/ita-ITA.h           |  9 ---------
 src/l10n/jpn-JPN.h           |  9 ---------
 src/l10n/pol-POL.h           |  9 ---------
 src/l10n/por-PRT.h           |  9 ---------
 10 files changed, 9 insertions(+), 86 deletions(-)

diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 8da869b21..34d12ead3 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -35,6 +35,10 @@
 #include <i18n.h>
 #include <main.h>
 
+#define STRING_CMD_DENO_NO           "Task not denotated."
+#define STRING_CMD_DENO_1            "Denotated {1} task."
+#define STRING_CMD_DENO_N            "Denotated {1} tasks."
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -42,7 +46,7 @@ CmdDenotate::CmdDenotate ()
 {
   _keyword               = "denotate";
   _usage                 = "task <filter> denotate <pattern>";
-  _description           = STRING_CMD_DENO_USAGE;
+  _description           = "Deletes an annotation";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -93,7 +97,7 @@ int CmdDenotate::execute (std::string&)
     auto annotations = task.getAnnotations ();
 
     if (annotations.size () == 0)
-      throw std::string (STRING_CMD_DENO_NONE);
+      throw std::string ("The specified task has no annotations that can be deleted.");
 
     std::string anno;
     auto match = false;
@@ -126,7 +130,7 @@ int CmdDenotate::execute (std::string&)
 
     if (before.data != task.data)
     {
-      auto question = format (STRING_CMD_DENO_CONFIRM,
+      auto question = format ("Denotate task {1} '{2}'?",
                               task.identifier (true),
                               task.get ("description"));
 
@@ -134,7 +138,7 @@ int CmdDenotate::execute (std::string&)
       {
         ++count;
         context.tdb2.modify (task);
-        feedback_affected (format (STRING_CMD_DENO_FOUND, anno));
+        feedback_affected (format ("Found annotation '{1}' and deleted it.", anno));
         if (context.verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task, false);
       }
@@ -148,7 +152,7 @@ int CmdDenotate::execute (std::string&)
     }
     else
     {
-      std::cout << format (STRING_CMD_DENO_NOMATCH, pattern) << '\n';
+      std::cout << format ("Did not find any matching annotation to be deleted for '{1}'.\n", pattern);
       rc = 1;
     }
   }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ede35d3e8..8fda5e42b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -205,15 +205,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Vor Aufgabe {1} '{2}' anfügen?"
 #define STRING_CMD_PREPEND_NO        "Nicht vor Aufgabe angefügt."
 
-#define STRING_CMD_DENO_USAGE        "Löscht einen Kommentar"
-#define STRING_CMD_DENO_NONE         "Die gewählte Aufgabe hat keine Kommentare, welche gelöscht werden können."
-#define STRING_CMD_DENO_CONFIRM      "Kommentar in Aufgabe {1} '{2}' löschen?"
-#define STRING_CMD_DENO_FOUND        "Kommentar '{1}' gefunden und gelöscht."
-#define STRING_CMD_DENO_NOMATCH      "Keine passenden Kommentare zu '{1}' gefunden und gelöscht."
-#define STRING_CMD_DENO_NO           "Keine Kommentare gelöscht."
-#define STRING_CMD_DENO_1            "Kommentar zu {1} Aufgabe gelöscht."
-#define STRING_CMD_DENO_N            "Kommentare zu {1} Aufgaben gelöscht."
-
 #define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
 #define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 784b48318..568ce5794 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -202,15 +202,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Task not prepended."
 
-#define STRING_CMD_DENO_USAGE        "Deletes an annotation"
-#define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
-#define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Found annotation '{1}' and deleted it."
-#define STRING_CMD_DENO_NOMATCH      "Did not find any matching annotation to be deleted for '{1}'."
-#define STRING_CMD_DENO_NO           "Task not denotated."
-#define STRING_CMD_DENO_1            "Denotated {1} task."
-#define STRING_CMD_DENO_N            "Denotated {1} tasks."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 050b66f29..97f2f61d2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -205,15 +205,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Predonis al taskon {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Ne predonis al tasko."
 
-#define STRING_CMD_DENO_USAGE        "Viŝas komenton"
-#define STRING_CMD_DENO_NONE         "La specifita tasko ne havas nenian viŝeblan komenton."
-#define STRING_CMD_DENO_CONFIRM      "Malkomenti taskon {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Trovis kaj viŝis komenton '{1}'."
-#define STRING_CMD_DENO_NOMATCH      "Ne trovis nenian komenton por viŝi, kiu kongruas al '{1}'."
-#define STRING_CMD_DENO_NO           "Ne malkomentis taskon."
-#define STRING_CMD_DENO_1            "Malkomentis {1} taskon."
-#define STRING_CMD_DENO_N            "Malkomentis {1} taskojn."
-
 #define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
 #define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
 #define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c06eeb693..bddeb2557 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -211,15 +211,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "¿Anteponer texto a la tarea {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Texto no antepuesto."
 
-#define STRING_CMD_DENO_USAGE        "Elimina una anotación"
-#define STRING_CMD_DENO_NONE         "La tarea especificada no tiene anotaciones que puedan ser eliminadas."
-#define STRING_CMD_DENO_CONFIRM      "¿Desanotar la tarea {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Encontrada anotación '{1}' y eliminada."
-#define STRING_CMD_DENO_NOMATCH      "No se encontró ninguna anotación coincidente para eliminar en '{1}'."
-#define STRING_CMD_DENO_NO           "Tarea no desanotada."
-#define STRING_CMD_DENO_1            "Desanotada {1} tarea."
-#define STRING_CMD_DENO_N            "Desanotadas {1} tareas."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
 #define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 41bf3fee2..ac17006ec 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Tâche not prepended."
 
-#define STRING_CMD_DENO_USAGE        "Deletes an annotation"
-#define STRING_CMD_DENO_NONE         "The specified task has no annotations that can be deleted."
-#define STRING_CMD_DENO_CONFIRM      "Denotate task {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Found annotation '{1}' and deleted it."
-#define STRING_CMD_DENO_NOMATCH      "Did not find any matching annotation to be deleted for '{1}'."
-#define STRING_CMD_DENO_NO           "Tâche non désannotée."
-#define STRING_CMD_DENO_1            "Denotated {1} task."
-#define STRING_CMD_DENO_N            "Denotated {1} tasks."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d109573ca..cea2a8c36 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -206,15 +206,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Aggiungere all'inizio della descrizione del task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Aggiunta non effettuata."
 
-#define STRING_CMD_DENO_USAGE        "Cancella una annotazione"
-#define STRING_CMD_DENO_NONE         "Il task specificato non ha annotazioni che possano essere cancellate."
-#define STRING_CMD_DENO_CONFIRM      "Denotare il task {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Annotazione '{1}' trovata e cancellata."
-#define STRING_CMD_DENO_NOMATCH      "Nessuna annotazione da cancellare trovata per '{1}'."
-#define STRING_CMD_DENO_NO           "Annotazione non rimossa."
-#define STRING_CMD_DENO_1            "Annotazione rimossa da task {1}."
-#define STRING_CMD_DENO_N            "Annotazioni rimosse da task {1}."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
 #define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6c33681ad..5267bf944 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Task not prepended."
 
-#define STRING_CMD_DENO_USAGE        "Deletes an annotation"
-#define STRING_CMD_DENO_NONE         "指定されたtaskには注釈がないので削除できません。"
-#define STRING_CMD_DENO_CONFIRM      "タスク {1} から注釈 '{2}' を削除しますか?"
-#define STRING_CMD_DENO_FOUND        "注釈 '{1}' が見つかったので削除します。"
-#define STRING_CMD_DENO_NOMATCH      "'{1}' に一致する注釈が見つからなかったので削除できません。"
-#define STRING_CMD_DENO_NO           "Task not denotated."
-#define STRING_CMD_DENO_1            "Denotated {1} task."
-#define STRING_CMD_DENO_N            "Denotated {1} tasks."
-
 #define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
 #define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 6c013be4f..a2986ecab 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Dodać ciąg do opisu zadania {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Nie dodano ciągu do opisu."
 
-#define STRING_CMD_DENO_USAGE        "Usuwa komentarz"
-#define STRING_CMD_DENO_NONE         "Wybrane zadanie nie posiada komentarza do usunięcia."
-#define STRING_CMD_DENO_CONFIRM      "Usunąć komentarz zadania {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Znaleziono i usunięto komentarz '{1}'."
-#define STRING_CMD_DENO_NOMATCH      "Nie znaleziono żadnego pasującego komentarza do usunięcia '{1}'."
-#define STRING_CMD_DENO_NO           "Nie usunięto komentarza."
-#define STRING_CMD_DENO_1            "Usunięto {1} komentarz."
-#define STRING_CMD_DENO_N            "Usunięto {1} komentarzy."
-
 #define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
 #define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 27068da7d..ed7ae1360 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -207,15 +207,6 @@
 #define STRING_CMD_PREPEND_CONFIRM   "Antepor à tarefa {1} '{2}'?"
 #define STRING_CMD_PREPEND_NO        "Tarefa não anteposta."
 
-#define STRING_CMD_DENO_USAGE        "Elimina uma anotação"
-#define STRING_CMD_DENO_NONE         "A tarefa especificada não tem anotações que possam ser eliminadas."
-#define STRING_CMD_DENO_CONFIRM      "Remover anotação da tarefa {1} '{2}'?"
-#define STRING_CMD_DENO_FOUND        "Foi encontrada e removida a anotação '{1}'."
-#define STRING_CMD_DENO_NOMATCH      "Não foi encontrada nenhuma anotação a remover que corresponda a '{1}'."
-#define STRING_CMD_DENO_NO           "Nenhuma anotação removida da tarefa."
-#define STRING_CMD_DENO_1            "Removida(s) anotação(ôes) de {1} tarefa."
-#define STRING_CMD_DENO_N            "Removida(s) anotação(ôes) de {1} tarefas."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
 #define STRING_CMD_IMPORT_FILE       "A importar '{1}'"

From 12171e3318253bbbbdc8e40db6ee9d86911eac57 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:25:31 -0500
Subject: [PATCH 649/879] l10n: Eliminated STRING_CMD_PROJECTS_*

---
 src/commands/CmdProjects.cpp | 16 ++++++++--------
 src/commands/CmdSummary.cpp  |  4 ++--
 src/l10n/deu-DEU.h           |  9 ---------
 src/l10n/eng-USA.h           |  9 ---------
 src/l10n/epo-RUS.h           |  9 ---------
 src/l10n/esp-ESP.h           |  9 ---------
 src/l10n/fra-FRA.h           |  9 ---------
 src/l10n/ita-ITA.h           |  9 ---------
 src/l10n/jpn-JPN.h           |  9 ---------
 src/l10n/pol-POL.h           |  9 ---------
 src/l10n/por-PRT.h           |  9 ---------
 11 files changed, 10 insertions(+), 91 deletions(-)

diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index e116dd482..b1654b4c6 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -43,7 +43,7 @@ CmdProjects::CmdProjects ()
 {
   _keyword               = "projects";
   _usage                 = "task <filter> projects";
-  _description           = STRING_CMD_PROJECTS_USAGE;
+  _description           = "Shows all project names used";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -126,7 +126,7 @@ int CmdProjects::execute (std::string& output)
       }
       int row = view.addRow ();
       view.set (row, 0, (project.first == ""
-                          ? STRING_CMD_PROJECTS_NONE
+                          ? "(none)"
                           : indentProject (project.first, "  ", '.')));
       view.set (row, 1, project.second);
       processed.push_back (project.first);
@@ -140,17 +140,17 @@ int CmdProjects::execute (std::string& output)
         << view.render ()
         << optionalBlankLine ()
         << (number_projects == 1
-              ? format (STRING_CMD_PROJECTS_SUMMARY,  number_projects)
-              : format (STRING_CMD_PROJECTS_SUMMARY2, number_projects))
+              ? format ("{1} project",  number_projects)
+              : format ("{1} projects", number_projects))
         << ' '
         << (quantity == 1
-              ? format (STRING_CMD_PROJECTS_TASK,  quantity)
-              : format (STRING_CMD_PROJECTS_TASKS, quantity))
+              ? format ("({1} task)",  quantity)
+              : format ("({1} tasks)", quantity))
         << '\n';
   }
   else
   {
-    out << STRING_CMD_PROJECTS_NO << '\n';
+    out << "No projects.\n";
     rc = 1;
   }
 
@@ -163,7 +163,7 @@ CmdCompletionProjects::CmdCompletionProjects ()
 {
   _keyword               = "_projects";
   _usage                 = "task <filter> _projects";
-  _description           = STRING_CMD_PROJECTS_USAGE_2;
+  _description           = "Shows only a list of all project names used";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 880bdf625..1fd483d9b 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -210,11 +210,11 @@ int CmdSummary::execute (std::string& output)
         << view.render ()
         << optionalBlankLine ();
 
-    out << format (STRING_CMD_PROJECTS_SUMMARY2, view.rows ()) << '\n';
+    out << format ("{1} projects\n", view.rows ());
   }
   else
   {
-    out << STRING_CMD_PROJECTS_NO << '\n';
+    out << "No projects.\n";
     rc = 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 8fda5e42b..e38210476 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Zeigt alle genutzten Projektnamen"
-#define STRING_CMD_PROJECTS_USAGE_2  "Zeigt ausschließlich alle genutzten Projektnamen"
-#define STRING_CMD_PROJECTS_NO       "Keine Projekte."
-#define STRING_CMD_PROJECTS_NONE     "(keine)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} Projekt"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} Projekte"
-#define STRING_CMD_PROJECTS_TASK     "({1} Aufgabe)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} Aufgaben)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 568ce5794..355875026 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -167,15 +167,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
-#define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
-#define STRING_CMD_PROJECTS_NO       "No projects."
-#define STRING_CMD_PROJECTS_NONE     "(none)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} project"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
-#define STRING_CMD_PROJECTS_TASK     "({1} task)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 97f2f61d2..c366a980e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Montras la uzatajn projekt-nomojn"
-#define STRING_CMD_PROJECTS_USAGE_2  "Montras sole liston de ĉia uzata projekt-nomo"
-#define STRING_CMD_PROJECTS_NO       "Nenia projekto."
-#define STRING_CMD_PROJECTS_NONE     "(nenio)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} projekto"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektoj"
-#define STRING_CMD_PROJECTS_TASK     "({1} tasko)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} taskoj)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index bddeb2557..2af95ebbb 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -176,15 +176,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Muestra todos los nombres de proyecto en uso"
-#define STRING_CMD_PROJECTS_USAGE_2  "Muestra una lista de todos los nombres (solamente) de proyecto en uso"
-#define STRING_CMD_PROJECTS_NO       "No hay proyectos."
-#define STRING_CMD_PROJECTS_NONE     "(ninguno)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} proyecto"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} proyectos"
-#define STRING_CMD_PROJECTS_TASK     "({1} tarea)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} tareas)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index ac17006ec..3e0abbe91 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
-#define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
-#define STRING_CMD_PROJECTS_NO       "No projects."
-#define STRING_CMD_PROJECTS_NONE     "(none)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} project"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects"
-#define STRING_CMD_PROJECTS_TASK     "({1} task)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} tasks)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index cea2a8c36..0c729d399 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -171,15 +171,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Mostra tutti i nomi di progetto utilizzati"
-#define STRING_CMD_PROJECTS_USAGE_2  "Mostra solo i nomi di progetto utilizzati"
-#define STRING_CMD_PROJECTS_NO       "Nessun progetto."
-#define STRING_CMD_PROJECTS_NONE     "(nessuno)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} progetto"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} progetti"
-#define STRING_CMD_PROJECTS_TASK     "({1} task)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} task)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5267bf944..efacc1609 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Shows all project names used"
-#define STRING_CMD_PROJECTS_USAGE_2  "Shows only a list of all project names used"
-#define STRING_CMD_PROJECTS_NO       "プロジェクトがない。"
-#define STRING_CMD_PROJECTS_NONE     "(none)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} プロジェクト"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} プロジェクト"
-#define STRING_CMD_PROJECTS_TASK     "({1} タスク)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} タスク)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index a2986ecab..31d44e447 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Pokazuje statystyki wszystkich projektów"
-#define STRING_CMD_PROJECTS_USAGE_2  "Pokazuje tylko nazwy prowadzonych projektów"
-#define STRING_CMD_PROJECTS_NO       "Brak projektów"
-#define STRING_CMD_PROJECTS_NONE     "(brak)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} projekt"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projektów"
-#define STRING_CMD_PROJECTS_TASK     "({1} zadanie)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} zadań)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ed7ae1360..d06dfd780 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PROJECTS_USAGE    "Exibe todos os nomes de projeto em uso"
-#define STRING_CMD_PROJECTS_USAGE_2  "Exibe apenas uma lista de todos os nomes de projeto em uso"
-#define STRING_CMD_PROJECTS_NO       "Sem projetos."
-#define STRING_CMD_PROJECTS_NONE     "(nenhum)"
-#define STRING_CMD_PROJECTS_SUMMARY  "{1} projeto"
-#define STRING_CMD_PROJECTS_SUMMARY2 "{1} projetos"
-#define STRING_CMD_PROJECTS_TASK     "({1} tarefa)"
-#define STRING_CMD_PROJECTS_TASKS    "({1} tarefas)"
-
 #define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
 #define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
 #define STRING_CMD_PURGE_1           "Purged {1} task."

From 44a94b0b50071b15c9bf40b400fb82e51323c815 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:29:51 -0500
Subject: [PATCH 650/879] l10n: Eliminated STRING_CMD_PURGE_*

---
 src/commands/CmdPurge.cpp | 12 ++++++------
 src/l10n/deu-DEU.h        |  8 --------
 src/l10n/eng-USA.h        |  8 --------
 src/l10n/epo-RUS.h        |  8 --------
 src/l10n/esp-ESP.h        |  8 --------
 src/l10n/fra-FRA.h        |  8 --------
 src/l10n/ita-ITA.h        |  8 --------
 src/l10n/jpn-JPN.h        |  8 --------
 src/l10n/pol-POL.h        |  8 --------
 src/l10n/por-PRT.h        |  8 --------
 10 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 55d3dc758..19905d4f3 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -40,7 +40,7 @@ CmdPurge::CmdPurge ()
 {
   _keyword               = "purge";
   _usage                 = "task <filter> purge";
-  _description           = STRING_CMD_PURGE_USAGE;
+  _description           = "Removes the specified tasks from the data files. Causes permanent loss of data.";
   _read_only             = false;
   _displays_id           = false;
   _needs_confirm         = true;
@@ -104,7 +104,7 @@ void CmdPurge::handleChildren (Task& task, int& count)
     {
       if (child.getStatus () != Task::deleted)
         // In case any child task is not deleted, bail out
-        throw format (STRING_CMD_PURGE_NDEL_CHILD,
+        throw format ("Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged.",
                       task.get ("description"),
                       child.identifier (true));
       else
@@ -117,7 +117,7 @@ void CmdPurge::handleChildren (Task& task, int& count)
     return;
 
   // Ask for confirmation to purge them, if needed
-  std::string question = format (STRING_CMD_PURGE_CONFIRM_R,
+  std::string question = format ("Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?",
                                  task.get ("description"),
                                  children.size ());
 
@@ -129,7 +129,7 @@ void CmdPurge::handleChildren (Task& task, int& count)
       purgeTask (child, count);
   }
   else
-    throw std::string (STRING_CMD_PURGE_ABRT);
+    throw std::string ("Purge operation aborted.");
 }
 
 
@@ -160,7 +160,7 @@ int CmdPurge::execute (std::string&)
     if (task.getStatus () == Task::deleted)
     {
       std::string question;
-      question = format (STRING_CMD_PURGE_CONFIRM,
+      question = format ("Permanently remove task {1} '{2}'?",
                          task.identifier (true),
                          task.get ("description"));
 
@@ -169,7 +169,7 @@ int CmdPurge::execute (std::string&)
     }
   }
 
-  feedback_affected (count == 1 ? STRING_CMD_PURGE_1 : STRING_CMD_PURGE_N, count);
+  feedback_affected (count == 1 ? "Purged {1} task." : "Purged {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e38210476..d94f9c7bd 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -170,14 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Fügt einer Aufgabenbeschreibung Text hinzu"
 #define STRING_CMD_APPEND_1          "Zu {1} Aufgabe hinzugefügt."
 #define STRING_CMD_APPEND_N          "Zu {1} Aufgaben hinzugefügt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 355875026..52a133816 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -167,14 +167,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
 #define STRING_CMD_APPEND_1          "Appended {1} task."
 #define STRING_CMD_APPEND_N          "Appended {1} tasks."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index c366a980e..e1f5cdec2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -170,14 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Aldonas tekston post task-priskribo"
 #define STRING_CMD_APPEND_1          "Aldonis al {1} tasko."
 #define STRING_CMD_APPEND_N          "Aldonis al {1} taskoj."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 2af95ebbb..dacbb5450 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -176,14 +176,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Añade texto al final de la descripción de una tarea existente"
 #define STRING_CMD_APPEND_1          "Añadiendo texto a {1} tarea."
 #define STRING_CMD_APPEND_N          "Añadiendo texto a {1} tareas."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 3e0abbe91..be897936b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -172,14 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
 #define STRING_CMD_APPEND_1          "Appended {1} task."
 #define STRING_CMD_APPEND_N          "Appended {1} tasks."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0c729d399..ec5f016b6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -171,14 +171,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Aggiunge testo alla fine di una descrizione di un task esistente"
 #define STRING_CMD_APPEND_1          "Aggiunta al task {1}."
 #define STRING_CMD_APPEND_N          "Aggiunte ai task {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index efacc1609..725d4a3c4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -172,14 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "存在する task 説明文にテキストを追加"
 #define STRING_CMD_APPEND_1          "{1} タスク を追加。"
 #define STRING_CMD_APPEND_N          "{1} タスク を追加。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 31d44e447..859540f59 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -172,14 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Dodaje ciąg na końcu opisu zadania"
 #define STRING_CMD_APPEND_1          "Dodano ciąg do opisu {1} zadania"
 #define STRING_CMD_APPEND_N          "Dodano ciąg do opisu {1} zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d06dfd780..82c6ace2b 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -172,14 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PURGE_USAGE       "Removes the specified tasks from the data files. Causes permanent loss of data."
-#define STRING_CMD_PURGE_ABRT        "Purge operation aborted."
-#define STRING_CMD_PURGE_1           "Purged {1} task."
-#define STRING_CMD_PURGE_N           "Purged {1} tasks."
-#define STRING_CMD_PURGE_CONFIRM     "Permanently remove task {1} '{2}'?"
-#define STRING_CMD_PURGE_CONFIRM_R   "Task '{1}' is a recurrence template. All its {2} deleted children tasks will be purged as well. Continue?"
-#define STRING_CMD_PURGE_NDEL_CHILD  "Task '{1}' is a recurrence template. Its child task {2} must be deleted before it can be purged."
-
 #define STRING_CMD_APPEND_USAGE      "Acrescenta texto à descrição de uma tarefa existente"
 #define STRING_CMD_APPEND_1          "Acrescentada {1} tarefa."
 #define STRING_CMD_APPEND_N          "Acrescentadas {1} tarefas."

From 98f02b62b218cefcb1f0db5619f30ad278b2b94c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:39:49 -0500
Subject: [PATCH 651/879] l10n: Eliminated STRING_CMD_APPEND_*

---
 src/commands/CmdAppend.cpp | 14 +++++++-------
 src/l10n/deu-DEU.h         |  9 ---------
 src/l10n/eng-USA.h         |  9 ---------
 src/l10n/epo-RUS.h         |  9 ---------
 src/l10n/esp-ESP.h         |  9 ---------
 src/l10n/fra-FRA.h         |  9 ---------
 src/l10n/ita-ITA.h         |  9 ---------
 src/l10n/jpn-JPN.h         |  9 ---------
 src/l10n/pol-POL.h         |  9 ---------
 src/l10n/por-PRT.h         |  9 ---------
 10 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 893d9a46c..ec60631c4 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -41,7 +41,7 @@ CmdAppend::CmdAppend ()
 {
   _keyword               = "append";
   _usage                 = "task <filter> append <mods>";
-  _description           = STRING_CMD_APPEND_USAGE;
+  _description           = "Appends text to an existing task description";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -78,7 +78,7 @@ int CmdAppend::execute (std::string&)
     Task before (task);
 
     // Append to the specified task.
-    auto question = format (STRING_CMD_APPEND_CONFIRM,
+    auto question = format ("Append to task {1} '{2}'?",
                             task.identifier (true),
                             task.get ("description"));
 
@@ -88,7 +88,7 @@ int CmdAppend::execute (std::string&)
     {
       context.tdb2.modify (task);
       ++count;
-      feedback_affected (STRING_CMD_APPEND_TASK, task);
+      feedback_affected ("Appending to task {1} '{2}'.", task);
       if (context.verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
@@ -96,7 +96,7 @@ int CmdAppend::execute (std::string&)
       if (task.has ("parent"))
       {
         if ((context.config.get ("recurrence.confirmation") == "prompt"
-             && confirm (STRING_CMD_APPEND_CONFIRM_R)) ||
+             && confirm ("This is a recurring task.  Do you want to append to all pending recurrences of this same task?")) ||
             context.config.getBoolean ("recurrence.confirmation"))
         {
           std::vector <Task> siblings = context.tdb2.siblings (task);
@@ -105,7 +105,7 @@ int CmdAppend::execute (std::string&)
             sibling.modify (Task::modAppend, true);
             context.tdb2.modify (sibling);
             ++count;
-            feedback_affected (STRING_CMD_APPEND_TASK_R, sibling);
+            feedback_affected ("Appending to recurring task {1} '{2}'.", sibling);
           }
 
           // Append to the parent
@@ -118,7 +118,7 @@ int CmdAppend::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_APPEND_NO << '\n';
+      std::cout << "Task not appended.\n";
       rc = 1;
       if (_permission_quit)
         break;
@@ -130,7 +130,7 @@ int CmdAppend::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_APPEND_1 : STRING_CMD_APPEND_N, count);
+  feedback_affected (count == 1 ? "Appended {1} task." : "Appended {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d94f9c7bd..6c571be05 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Fügt einer Aufgabenbeschreibung Text hinzu"
-#define STRING_CMD_APPEND_1          "Zu {1} Aufgabe hinzugefügt."
-#define STRING_CMD_APPEND_N          "Zu {1} Aufgaben hinzugefügt."
-#define STRING_CMD_APPEND_TASK       "Füge zur Aufgabe {1} '{2}' hinzu."
-#define STRING_CMD_APPEND_TASK_R     "Füge zur wiederholenden Aufgabe {1} '{2}' hinzu."
-#define STRING_CMD_APPEND_CONFIRM_R  "Dies ist eine wiederholende Aufgabe.  Möchten Sie zu allen offenen Wiederholungen dieser Aufgabe hinzufügen?"
-#define STRING_CMD_APPEND_CONFIRM    "Zu Aufgabe {1} '{2}' hinzufügen?"
-#define STRING_CMD_APPEND_NO         "Nicht zu Aufgabe hinzugefügt."
-
 #define STRING_CMD_PREPEND_USAGE     "Stellt einer Aufgabenbeschreibung Text voran"
 #define STRING_CMD_PREPEND_1         "Vor {1} Aufgabe vorangestellt."
 #define STRING_CMD_PREPEND_N         "Vor {1} Aufgaben vorangestellt."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 52a133816..559dcfe9f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -167,15 +167,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
-#define STRING_CMD_APPEND_1          "Appended {1} task."
-#define STRING_CMD_APPEND_N          "Appended {1} tasks."
-#define STRING_CMD_APPEND_TASK       "Appending to task {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Appending to recurring task {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "This is a recurring task.  Do you want to append to all pending recurrences of this same task?"
-#define STRING_CMD_APPEND_CONFIRM    "Append to task {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Task not appended."
-
 #define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
 #define STRING_CMD_PREPEND_1         "Prepended {1} task."
 #define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e1f5cdec2..529a975a7 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Aldonas tekston post task-priskribo"
-#define STRING_CMD_APPEND_1          "Aldonis al {1} tasko."
-#define STRING_CMD_APPEND_N          "Aldonis al {1} taskoj."
-#define STRING_CMD_APPEND_TASK       "Aldonanta al tasko {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Aldonanta al reokazanta tasko {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "Tio estas reokazanta tasko. Ĉu vi volas aldoni al ĉia pendanta okazaĵo de ĉi tiu tasko?"
-#define STRING_CMD_APPEND_CONFIRM    "Aldoni al tasko {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Ne aldonis al tasko."
-
 #define STRING_CMD_PREPEND_USAGE     "Aldonas tekston antaŭ task-priskribo"
 #define STRING_CMD_PREPEND_1         "Predonis al {1} tasko."
 #define STRING_CMD_PREPEND_N         "Predonis {1} taskoj."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index dacbb5450..fc62aff1c 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -176,15 +176,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Añade texto al final de la descripción de una tarea existente"
-#define STRING_CMD_APPEND_1          "Añadiendo texto a {1} tarea."
-#define STRING_CMD_APPEND_N          "Añadiendo texto a {1} tareas."
-#define STRING_CMD_APPEND_TASK       "Añadiendo texto a la tarea {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Añadiendo texto a la tarea recurrente {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "Esta es una tarea recurrente. ¿Quiere añadir a todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_APPEND_CONFIRM    "¿Añadir a la tarea {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Texto no añadido a la tarea."
-
 #define STRING_CMD_PREPEND_USAGE     "Antepone texto a la descripción de una tarea existente"
 #define STRING_CMD_PREPEND_1         "Antepuesto texto a {1} tarea."
 #define STRING_CMD_PREPEND_N         "Antepuesto texto a {1} tareas."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index be897936b..18c210882 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Appends text to an existing task description"
-#define STRING_CMD_APPEND_1          "Appended {1} task."
-#define STRING_CMD_APPEND_N          "Appended {1} tasks."
-#define STRING_CMD_APPEND_TASK       "Appending to task {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Appending to recurring task {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "This is a recurring task.  Do you want to append to all pending recurrences of this same task?"
-#define STRING_CMD_APPEND_CONFIRM    "Append to task {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Tâche non suffixée."
-
 #define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
 #define STRING_CMD_PREPEND_1         "Prepended {1} task."
 #define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ec5f016b6..26343ce0f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -171,15 +171,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Aggiunge testo alla fine di una descrizione di un task esistente"
-#define STRING_CMD_APPEND_1          "Aggiunta al task {1}."
-#define STRING_CMD_APPEND_N          "Aggiunte ai task {1}."
-#define STRING_CMD_APPEND_TASK       "Aggiunta al task {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Aggiunta al task periodico {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "Questo è un task periodico. Aggiungere il testo alla fine della descrizione di tutti i task associati?"
-#define STRING_CMD_APPEND_CONFIRM    "Aggiungere alla fine della descrizione del task {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Aggiunta non effettuata."
-
 #define STRING_CMD_PREPEND_USAGE     "Aggiunge testo all'inizio di una descrizione di un task esistente"
 #define STRING_CMD_PREPEND_1         "Aggiunta al task {1}."
 #define STRING_CMD_PREPEND_N         "Aggiunte ai task {1}."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 725d4a3c4..9eb3e8604 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "存在する task 説明文にテキストを追加"
-#define STRING_CMD_APPEND_1          "{1} タスク を追加。"
-#define STRING_CMD_APPEND_N          "{1} タスク を追加。"
-#define STRING_CMD_APPEND_TASK       "タスク {1} '{2}' を追加中。"
-#define STRING_CMD_APPEND_TASK_R     "Appending to recurring task {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "This is a recurring task.  Do you want to append to all pending recurrences of this same task?"
-#define STRING_CMD_APPEND_CONFIRM    "タスク {1} '{2}' を追加?"
-#define STRING_CMD_APPEND_NO         "タスク を追加できませんでした。"
-
 #define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
 #define STRING_CMD_PREPEND_1         "Prepended {1} task."
 #define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 859540f59..00d91b9f2 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Dodaje ciąg na końcu opisu zadania"
-#define STRING_CMD_APPEND_1          "Dodano ciąg do opisu {1} zadania"
-#define STRING_CMD_APPEND_N          "Dodano ciąg do opisu {1} zadań"
-#define STRING_CMD_APPEND_TASK       "Dodawanie ciągu do opisu zadania {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "Dodawanie ciągu do opisu zadania cyklicznego {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "To zadanie jest cykliczne. Czy chcesz dodać ciąg do opisu kolejnych zadań w cyklu?"
-#define STRING_CMD_APPEND_CONFIRM    "Dodać ciąg do opisu zadania {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Nie dodano ciągu do opisu."
-
 #define STRING_CMD_PREPEND_USAGE     "Dodaje ciąg na początku opisu zadania"
 #define STRING_CMD_PREPEND_1         "Dodano ciąg do opisu {1} zadania."
 #define STRING_CMD_PREPEND_N         "Dodano ciąg do opisu {1} zadań."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 82c6ace2b..63cf21edc 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_APPEND_USAGE      "Acrescenta texto à descrição de uma tarefa existente"
-#define STRING_CMD_APPEND_1          "Acrescentada {1} tarefa."
-#define STRING_CMD_APPEND_N          "Acrescentadas {1} tarefas."
-#define STRING_CMD_APPEND_TASK       "A acrescentar à tarefa {1} '{2}'."
-#define STRING_CMD_APPEND_TASK_R     "A acrescentar à tarefa recorrente {1} '{2}'."
-#define STRING_CMD_APPEND_CONFIRM_R  "Esta é uma tarefa recorrente. Deseja acrescentar a todas as ocorrências pendentes desta tarefa?"
-#define STRING_CMD_APPEND_CONFIRM    "Acrescentado à tarefa {1} '{2}'?"
-#define STRING_CMD_APPEND_NO         "Tarefa não acrescentada."
-
 #define STRING_CMD_PREPEND_USAGE     "Antepõe texto à descrição de uma tarefa existente"
 #define STRING_CMD_PREPEND_1         "Anteposta {1} tarefa."
 #define STRING_CMD_PREPEND_N         "Antepostas {1} tarefas."

From 86f260672b2f0576dfc110cad821649d983b671c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:40:46 -0500
Subject: [PATCH 652/879] l10n: Eliminated STRING_FEEDBACK_NO_TASKS_SP

---
 src/commands/CmdAnnotate.cpp  | 3 +--
 src/commands/CmdAppend.cpp    | 3 +--
 src/commands/CmdDelete.cpp    | 3 +--
 src/commands/CmdDenotate.cpp  | 3 +--
 src/commands/CmdDone.cpp      | 3 +--
 src/commands/CmdDuplicate.cpp | 2 +-
 src/commands/CmdModify.cpp    | 3 +--
 src/commands/CmdPrepend.cpp   | 2 +-
 src/commands/CmdPurge.cpp     | 3 +--
 src/commands/CmdStart.cpp     | 3 +--
 src/commands/CmdStop.cpp      | 3 +--
 src/commands/CmdUrgency.cpp   | 2 +-
 src/l10n/deu-DEU.h            | 1 -
 src/l10n/eng-USA.h            | 1 -
 src/l10n/epo-RUS.h            | 1 -
 src/l10n/esp-ESP.h            | 1 -
 src/l10n/fra-FRA.h            | 1 -
 src/l10n/ita-ITA.h            | 1 -
 src/l10n/jpn-JPN.h            | 1 -
 src/l10n/pol-POL.h            | 1 -
 src/l10n/por-PRT.h            | 1 -
 21 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index f837db508..40b5ba1a0 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -32,7 +32,6 @@
 #include <main.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -64,7 +63,7 @@ int CmdAnnotate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index ec60631c4..1579114fb 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -64,7 +63,7 @@ int CmdAppend::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 5b1ded102..06a547c06 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 
 #define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
@@ -68,7 +67,7 @@ int CmdDelete::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 34d12ead3..f2a0c3dca 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -32,7 +32,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
 #define STRING_CMD_DENO_NO           "Task not denotated."
@@ -70,7 +69,7 @@ int CmdDenotate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index c066dc185..d336fd89e 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <util.h>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -64,7 +63,7 @@ int CmdDone::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 9f86b7512..eea1a6f7c 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -64,7 +64,7 @@ int CmdDuplicate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 2ac074c44..520d9f788 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -32,7 +32,6 @@
 #include <main.h>
 #include <format.h>
 #include <shared.h>
-#include <i18n.h>
 
 #define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
 #define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
@@ -66,7 +65,7 @@ int CmdModify::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 91bfe4a1e..56abfb9b4 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -64,7 +64,7 @@ int CmdPrepend::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 19905d4f3..055833bd1 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -28,7 +28,6 @@
 #include <CmdPurge.h>
 #include <Context.h>
 #include <Filter.h>
-#include <i18n.h>
 #include <main.h>
 #include <format.h>
 #include <shared.h>
@@ -146,7 +145,7 @@ int CmdPurge::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index af7bb9c8b..964bdd35c 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -32,7 +32,6 @@
 #include <main.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -64,7 +63,7 @@ int CmdStart::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 8e89e0c62..d48af2930 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <main.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -63,7 +62,7 @@ int CmdStop::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index e07dd08e6..857d07d3a 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -63,7 +63,7 @@ int CmdUrgency::execute (std::string& output)
 
   if (filtered.size () == 0)
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
+    context.footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6c571be05..ccd81fb29 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -253,7 +253,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
-#define STRING_FEEDBACK_NO_TASKS_SP  "Keine Aufgaben angegeben."
 #define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 559dcfe9f..47d4791c5 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -250,7 +250,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_NO_TASKS_SP  "No tasks specified."
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 529a975a7..4955aec31 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -253,7 +253,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
-#define STRING_FEEDBACK_NO_TASKS_SP  "Nenia tasko specifata."
 #define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index fc62aff1c..a273e4c1d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -261,7 +261,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
-#define STRING_FEEDBACK_NO_TASKS_SP  "No se especificaron tareas."
 #define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 18c210882..b7b85f5db 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -275,7 +275,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_NO_TASKS_SP  "No tasks specified."
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 26343ce0f..489edcee3 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -254,7 +254,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
-#define STRING_FEEDBACK_NO_TASKS_SP  "Nessun task specificat."
 #define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 9eb3e8604..b09f70fb0 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -255,7 +255,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
-#define STRING_FEEDBACK_NO_TASKS_SP  "タスクが1つも指定されていません。"
 #define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 00d91b9f2..47a34cdc4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -255,7 +255,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
-#define STRING_FEEDBACK_NO_TASKS_SP  "Nie określono zadań"
 #define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 63cf21edc..dc96bafa7 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -255,7 +255,6 @@
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
-#define STRING_FEEDBACK_NO_TASKS_SP  "Nenhuma tarefa especificada."
 #define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"

From 5d08b64c23638b8f0eba0fd3446faf6fbdccac97 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:49:35 -0500
Subject: [PATCH 653/879] l10n: Eliminated STRING_CMD_COLOR_*

---
 src/commands/CmdColor.cpp | 34 +++++++++++++++-------------------
 src/l10n/deu-DEU.h        | 14 --------------
 src/l10n/eng-USA.h        | 14 --------------
 src/l10n/epo-RUS.h        | 14 --------------
 src/l10n/esp-ESP.h        | 15 ---------------
 src/l10n/fra-FRA.h        | 14 --------------
 src/l10n/ita-ITA.h        | 14 --------------
 src/l10n/jpn-JPN.h        | 14 --------------
 src/l10n/pol-POL.h        | 14 --------------
 src/l10n/por-PRT.h        | 14 --------------
 10 files changed, 15 insertions(+), 146 deletions(-)

diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index f79e97562..23c9cd4e8 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -33,7 +33,6 @@
 #include <Color.h>
 #include <format.h>
 #include <shared.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -42,7 +41,7 @@ CmdColor::CmdColor ()
 {
   _keyword               = "colors";
   _usage                 = "task          colors [sample | legend]";
-  _description           = STRING_CMD_COLOR_USAGE;
+  _description           = "All colors, a sample, or a legend";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -72,14 +71,14 @@ int CmdColor::execute (std::string& output)
     // use.
     if (legend)
     {
-      out << '\n' << STRING_CMD_COLOR_HERE << '\n';
+      out << "\nHere are the colors currently in use:\n";
 
       Table view;
       view.width (context.getWidth ());
       if (context.config.getBoolean ("color"))
         view.forceColor ();
-      view.add (STRING_CMD_COLOR_COLOR);
-      view.add (STRING_CMD_COLOR_DEFINITION);
+      view.add ("Color");
+      view.add ("Definition");
 
       for (auto& item : context.config)
       {
@@ -123,19 +122,19 @@ int CmdColor::execute (std::string& output)
       Color sample (swatch);
 
       out << '\n'
-          << STRING_CMD_COLOR_EXPLANATION                                          << '\n'
+          << "Use this command to see how colors are displayed by your terminal.\n"
           << "\n\n"
-          << STRING_CMD_COLOR_16                                                   << '\n'
+          << "16-color usage (supports underline, bold text, bright background):\n"
           << "  " << one.colorize ("task color black on bright yellow")            << '\n'
           << "  " << two.colorize ("task color underline cyan on bright blue")     << '\n'
           << '\n'
-          << STRING_CMD_COLOR_256                                                  << '\n'
+          << "256-color usage (supports underline):\n"
           << "  " << three.colorize ("task color color214 on color202")            << '\n'
           << "  " << four.colorize ("task color rgb150 on rgb020")                 << '\n'
           << "  " << five.colorize ("task color underline grey10 on grey3")        << '\n'
           << "  " << six.colorize ("task color red on color173")                   << '\n'
           << '\n'
-          << STRING_CMD_COLOR_YOURS                                                << "\n\n"
+          << "Your sample:\n\n"
           << "  " << sample.colorize ("task color " + swatch)                      << "\n\n";
     }
 
@@ -143,8 +142,7 @@ int CmdColor::execute (std::string& output)
     else
     {
       out << '\n'
-          << STRING_CMD_COLOR_BASIC
-          << '\n'
+          << "Basic colors\n"
           << ' ' << Color::colorize (" black ",   "black")
           << ' ' << Color::colorize (" red ",     "red")
           << ' ' << Color::colorize (" blue ",    "blue")
@@ -164,8 +162,7 @@ int CmdColor::execute (std::string& output)
           << ' ' << Color::colorize (" white ",   "black on white")
           << "\n\n";
 
-      out << STRING_CMD_COLOR_EFFECTS
-          << '\n'
+      out << "Effects\n"
           << ' ' << Color::colorize (" red ",               "red")
           << ' ' << Color::colorize (" bold red ",          "bold red")
           << ' ' << Color::colorize (" underline on blue ", "underline on blue")
@@ -194,7 +191,7 @@ int CmdColor::execute (std::string& output)
       out << "          . . . 15\n\n";
 
       // Color cube.
-      out << STRING_CMD_COLOR_CUBE
+      out << "Color cube rgb"
           << Color::colorize ("0", "bold red")
           << Color::colorize ("0", "bold green")
           << Color::colorize ("0", "bold blue")
@@ -242,8 +239,7 @@ int CmdColor::execute (std::string& output)
       out << '\n';
 
       // Grey ramp.
-      out << STRING_CMD_COLOR_RAMP
-          << " gray0 - gray23 (also color232 - color255)\n"
+      out << "Gray ramp gray0 - gray23 (also color232 - color255)\n"
           << "  0 1 2 . . .                             . . . 23\n"
           << "  ";
       for (int g = 0; g < 24; ++g)
@@ -254,13 +250,13 @@ int CmdColor::execute (std::string& output)
       }
 
       out << "\n\n"
-          << format (STRING_CMD_COLOR_TRY, "task color white on red")
-          << "\n\n";
+          << "Try running 'task color white on red'.\n"
+          << '\n';
     }
   }
   else
   {
-    out << STRING_CMD_COLOR_OFF << '\n';
+    out << "Color is currently turned off in your .taskrc file.  To enable color, remove the line 'color=off', or change the 'off' to 'on'.\n";
     rc = 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ccd81fb29..22f58dd77 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -193,20 +193,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
 #define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
 
-#define STRING_CMD_COLOR_USAGE       "Alle Farben, ein Beispiel, oder eine Legende"
-#define STRING_CMD_COLOR_HERE        "Diese Farben werden zur Zeit genutzt:"
-#define STRING_CMD_COLOR_COLOR       "Farbe"
-#define STRING_CMD_COLOR_DEFINITION  "Definition"
-#define STRING_CMD_COLOR_EXPLANATION "Nutzen Sie diesen Befehl, um zu sehen, wie die Farben auf Ihrem Terminal dargestellt werden."
-#define STRING_CMD_COLOR_16          "16 Farben (unterstützt underline, bold text, bright background):"
-#define STRING_CMD_COLOR_256         "256 Farben (unterstützt underline):"
-#define STRING_CMD_COLOR_YOURS       "Ihr Beispiel:"
-#define STRING_CMD_COLOR_BASIC       "Basisfarben"
-#define STRING_CMD_COLOR_EFFECTS     "Effekte"
-#define STRING_CMD_COLOR_CUBE        "RGB-Farbwürfel "
-#define STRING_CMD_COLOR_RAMP        "Grauskala"
-#define STRING_CMD_COLOR_TRY         "Versuchen Sie '{1}' auszuführen."
-#define STRING_CMD_COLOR_OFF         "Farben wurden in Ihrer .taskrc-Datei deaktiviert.  Um zie zu aktivieren, löschen Sie die Zeile 'color=off' oder ändern Sie 'off' zu 'on'."
 #define STRING_CMD_CONFIG_USAGE      "task-Konfiguration verändern"
 #define STRING_CMD_CONFIG_CONFIRM    "Wirklich die Option '{1}' von '{2}' zu '{3}' ändern?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Wirklich die Option '{1}' mit Wert '{2}' hinzufügen?"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 47d4791c5..171abf8ea 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -190,20 +190,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
-#define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
-#define STRING_CMD_COLOR_COLOR       "Color"
-#define STRING_CMD_COLOR_DEFINITION  "Definition"
-#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal."
-#define STRING_CMD_COLOR_16          "16-color usage (supports underline, bold text, bright background):"
-#define STRING_CMD_COLOR_256         "256-color usage (supports underline):"
-#define STRING_CMD_COLOR_YOURS       "Your sample:"
-#define STRING_CMD_COLOR_BASIC       "Basic colors"
-#define STRING_CMD_COLOR_EFFECTS     "Effects"
-#define STRING_CMD_COLOR_CUBE        "Color cube rgb"
-#define STRING_CMD_COLOR_RAMP        "Gray ramp"
-#define STRING_CMD_COLOR_TRY         "Try running '{1}'."
-#define STRING_CMD_COLOR_OFF         "Color is currently turned off in your .taskrc file.  To enable color, remove the line 'color=off', or change the 'off' to 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
 #define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4955aec31..10e6d39c1 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -193,20 +193,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
-#define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
-#define STRING_CMD_COLOR_COLOR       "Color"
-#define STRING_CMD_COLOR_DEFINITION  "Definition"
-#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal."
-#define STRING_CMD_COLOR_16          "16-color usage (supports underline, bold text, bright background):"
-#define STRING_CMD_COLOR_256         "256-color usage (supports underline):"
-#define STRING_CMD_COLOR_YOURS       "Your sample:"
-#define STRING_CMD_COLOR_BASIC       "Basic colors"
-#define STRING_CMD_COLOR_EFFECTS     "Effects"
-#define STRING_CMD_COLOR_CUBE        "Color cube rgb"
-#define STRING_CMD_COLOR_RAMP        "Gray ramp"
-#define STRING_CMD_COLOR_TRY         "Try running '{1}'."
-#define STRING_CMD_COLOR_OFF         "Color is currently turned off in your .taskrc file.  To enable color, remove the line 'color=off', or change the 'off' to 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
 #define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a273e4c1d..81fda5f21 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -200,21 +200,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
 #define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
 
-#define STRING_CMD_COLOR_USAGE       "Todos los colores, una muestra, o una leyenda"
-#define STRING_CMD_COLOR_HERE        "Aquí están los colores en uso actualmente:"
-#define STRING_CMD_COLOR_COLOR       "Color"  // |esp-ESP|==|eng-USA|
-#define STRING_CMD_COLOR_DEFINITION  "Definición"
-#define STRING_CMD_COLOR_EXPLANATION "Use este comando para ver como los colores son mostrados por su terminal."
-#define STRING_CMD_COLOR_16          "Uso de 16-colores (soporta subrayado, negrita, fondo brillante):"
-#define STRING_CMD_COLOR_256         "Uso de 256-colores (soporta subrayado):"
-#define STRING_CMD_COLOR_YOURS       "Su muestra:"
-#define STRING_CMD_COLOR_BASIC       "Colores básicos"
-#define STRING_CMD_COLOR_EFFECTS     "Efectos"
-#define STRING_CMD_COLOR_CUBE        "Cubo de color rgb"
-#define STRING_CMD_COLOR_RAMP        "Rampa de grises"
-#define STRING_CMD_COLOR_TRY         "Intente ejecutar '{1}'."
-//#define STRING_CMD_COLOR_TRY         "Try running '{1}'."
-#define STRING_CMD_COLOR_OFF         "El color está actualmente desactivado en su archivo .taskrc . Para activar el color elimine la línea 'color=off', o cambie el 'off' a 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Cambia los ajustes en la configuración de task"
 #define STRING_CMD_CONFIG_CONFIRM    "¿Está seguro de querer cambiar el valor de '{1}' de '{2}' a '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "¿Está seguro de querer añadir '{1}' con un valor de '{2}'?"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b7b85f5db..1866d1aae 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -195,20 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
-#define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
-#define STRING_CMD_COLOR_COLOR       "Color"
-#define STRING_CMD_COLOR_DEFINITION  "Definition"
-#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal."
-#define STRING_CMD_COLOR_16          "16-color usage (supports underline, bold text, bright background):"
-#define STRING_CMD_COLOR_256         "256-color usage (supports underline):"
-#define STRING_CMD_COLOR_YOURS       "Your sample:"
-#define STRING_CMD_COLOR_BASIC       "Basic colors"
-#define STRING_CMD_COLOR_EFFECTS     "Effects"
-#define STRING_CMD_COLOR_CUBE        "Color cube rgb"
-#define STRING_CMD_COLOR_RAMP        "Gray ramp"
-#define STRING_CMD_COLOR_TRY         "Try running '{1}'."
-#define STRING_CMD_COLOR_OFF         "Color is currently turned off in your .taskrc file.  To enable color, remove the line 'color=off', or change the 'off' to 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
 #define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 489edcee3..05eeef5f1 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -194,20 +194,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
 
-#define STRING_CMD_COLOR_USAGE       "Tutti i colori, un esempio, o una legenda"
-#define STRING_CMD_COLOR_HERE        "Coloti in uso:"
-#define STRING_CMD_COLOR_COLOR       "Colore"
-#define STRING_CMD_COLOR_DEFINITION  "Definizione"
-#define STRING_CMD_COLOR_EXPLANATION "Usare questo comando per vedere come i colori sono visualizzati sul terminale in uso."
-#define STRING_CMD_COLOR_16          "16-colori in uso (supporto per sottolineatura, grassetto, e sfondo):"
-#define STRING_CMD_COLOR_256         "256-colori in uso (supporto per sottolineatura):"
-#define STRING_CMD_COLOR_YOURS       "Esempio:"
-#define STRING_CMD_COLOR_BASIC       "Colori base"
-#define STRING_CMD_COLOR_EFFECTS     "Effetti"
-#define STRING_CMD_COLOR_CUBE        "Cubo dei colori RGB"
-#define STRING_CMD_COLOR_RAMP        "Rampa dei grigi"
-#define STRING_CMD_COLOR_TRY         "Provare eseguendo '{1}'."
-#define STRING_CMD_COLOR_OFF         "Il colore è attualmente disabilitato nel file .taskrc. Per abilitarlo, rimuovi la linea 'color=off', o cambia 'off' in 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Modifica le impostazioni nella configurazione dei task"
 #define STRING_CMD_CONFIG_CONFIRM    "Sei sicuro di voler cambiare il valore di '{1}' da '{2}' a '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Sei sicuro di voler aggiungere '{1}' con valore '{2}'?"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index b09f70fb0..0761fd6e3 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -195,20 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_COLOR_USAGE       "All colors, a sample, or a legend"
-#define STRING_CMD_COLOR_HERE        "Here are the colors currently in use:"
-#define STRING_CMD_COLOR_COLOR       "Color"
-#define STRING_CMD_COLOR_DEFINITION  "Definition"
-#define STRING_CMD_COLOR_EXPLANATION "Use this command to see how colors are displayed by your terminal."
-#define STRING_CMD_COLOR_16          "16-color usage (supports underline, bold text, bright background):"
-#define STRING_CMD_COLOR_256         "256-color usage (supports underline):"
-#define STRING_CMD_COLOR_YOURS       "Your sample:"
-#define STRING_CMD_COLOR_BASIC       "Basic colors"
-#define STRING_CMD_COLOR_EFFECTS     "Effects"
-#define STRING_CMD_COLOR_CUBE        "Color cube rgb"
-#define STRING_CMD_COLOR_RAMP        "Gray ramp"
-#define STRING_CMD_COLOR_TRY         "Try running '{1}'."
-#define STRING_CMD_COLOR_OFF         "Color is currently turned off in your .taskrc file.  To enable color, remove the line 'color=off', or change the 'off' to 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
 #define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 47a34cdc4..df5f70eb5 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -195,20 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
 
-#define STRING_CMD_COLOR_USAGE       "Wszystkie kolory, próbki lub legenda"
-#define STRING_CMD_COLOR_HERE        "To są aktualnie używane kolory:"
-#define STRING_CMD_COLOR_COLOR       "Kolor"
-#define STRING_CMD_COLOR_DEFINITION  "Definicja"
-#define STRING_CMD_COLOR_EXPLANATION "Użyj tego polecenia aby sprawdzić jak twój terminal wyświetla kolory."
-#define STRING_CMD_COLOR_16          "16 kolorów (wsparcie dla podkreślenia, pogrubienia, jasnego tła):"
-#define STRING_CMD_COLOR_256         "256 kolorów (wsparcie dla podkreślenia):"
-#define STRING_CMD_COLOR_YOURS       "Twoja próbka kolorów:"
-#define STRING_CMD_COLOR_BASIC       "Podstawowe kolory"
-#define STRING_CMD_COLOR_EFFECTS     "Efekty tekstu"
-#define STRING_CMD_COLOR_CUBE        "Kostka kolorów rgb"
-#define STRING_CMD_COLOR_RAMP        "Odcienie szarości"
-#define STRING_CMD_COLOR_TRY         "Spróbuj wykonać '{1}'."
-#define STRING_CMD_COLOR_OFF         "Aktualnie, kolorowanie jest wyłączone w twoim pliku .taskrc. Aby włączyć kolorowanie, usuń linie 'color=off', lub zmień wartość 'off' na 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Zmienia konfigurację programu"
 #define STRING_CMD_CONFIG_CONFIRM    "Czy na pewno chcesz zmienić wartość '{1}' z '{2}' na '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Czy na pewno chcesz dodać '{1}' z wartością '{2}'?"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index dc96bafa7..ff46fcb22 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -195,20 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
 #define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
 
-#define STRING_CMD_COLOR_USAGE       "Todas as cores, uma amostra ou a legenda"
-#define STRING_CMD_COLOR_HERE        "Estas são as cores actualmente em uso:"
-#define STRING_CMD_COLOR_COLOR       "Cor"
-#define STRING_CMD_COLOR_DEFINITION  "Definição"
-#define STRING_CMD_COLOR_EXPLANATION "Use este comando para ver como as cores são apresentadas no seu terminal."
-#define STRING_CMD_COLOR_16          "Modo 16-cores (suporta sublinhado, negrito e fundo brilhante):"
-#define STRING_CMD_COLOR_256         "Modo 256-cores (suporta sublinhado):"
-#define STRING_CMD_COLOR_YOURS       "A sua amostra:"
-#define STRING_CMD_COLOR_BASIC       "Cores básicas"
-#define STRING_CMD_COLOR_EFFECTS     "Efeitos"
-#define STRING_CMD_COLOR_CUBE        "Cubo de cor rgb"
-#define STRING_CMD_COLOR_RAMP        "Gradiente cinza"
-#define STRING_CMD_COLOR_TRY         "Tente executar '{1}'."
-#define STRING_CMD_COLOR_OFF         "O modo de cor encontra-se desactivado no seu ficheiro .taskrc. Para ativar cor, remova a linha 'color=off', ou altere de 'off' para 'on'."
 #define STRING_CMD_CONFIG_USAGE      "Altera parametros na configuração do 'task'"
 #define STRING_CMD_CONFIG_CONFIRM    "Tem a certeza que pretende alterar o valor de '{1}' de '{2}' para '{3}'?"
 #define STRING_CMD_CONFIG_CONFIRM2   "Tem a certeza que pretende adicionar '{1}' com o valor '{2}'?"

From 765c12a2d19bf5bd9e7dd69948a1f7a804703584 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 21:58:55 -0500
Subject: [PATCH 654/879] l10n: Eliminated STRING_CMD_CONTEXT_*

---
 src/commands/CmdContext.cpp | 41 ++++++++++++++++++-------------------
 src/l10n/deu-DEU.h          | 20 ------------------
 src/l10n/eng-USA.h          | 20 ------------------
 src/l10n/epo-RUS.h          | 20 ------------------
 src/l10n/esp-ESP.h          | 20 ------------------
 src/l10n/fra-FRA.h          | 20 ------------------
 src/l10n/ita-ITA.h          | 20 ------------------
 src/l10n/jpn-JPN.h          | 20 ------------------
 src/l10n/pol-POL.h          | 20 ------------------
 src/l10n/por-PRT.h          | 20 ------------------
 10 files changed, 20 insertions(+), 201 deletions(-)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 2b63d277b..644e3bb2e 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -32,7 +32,6 @@
 #include <Filter.h>
 #include <sstream>
 #include <algorithm>
-#include <i18n.h>
 #include <format.h>
 #include <shared.h>
 #include <util.h>
@@ -44,7 +43,7 @@ CmdContext::CmdContext ()
 {
   _keyword               = "context";
   _usage                 = "task          context [<name> | <subcommand>]";
-  _description           = STRING_CMD_CONTEXT_USAGE;
+  _description           = "Set and define contexts (default filters)";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -140,7 +139,7 @@ void CmdContext::defineContext (const std::vector <std::string>& words, std::str
     // Make sure nobody creates a context with name 'list', 'none' or 'show'
     if (words[1] == "none" or words[1] == "list" or words[1] == "show")
     {
-      throw format (STRING_CMD_CONTEXT_DEF_INVLD, words[1]);
+      throw format ("The name '{1}' is reserved and not allowed to use as a context name.", words[1]);
     }
 
     // Check if the value is a proper filter by filtering current pending.data
@@ -156,25 +155,25 @@ void CmdContext::defineContext (const std::vector <std::string>& words, std::str
     }
     catch (std::string exception)
     {
-      throw format (STRING_CMD_CONTEXT_DEF_ABRT2, exception);
+      throw format ("Filter validation failed: {1}", exception);
     }
 
     // Make user explicitly confirm filters that are matching no pending tasks
     if (filtered.size () == 0)
       if (confirmation &&
-          ! confirm (format (STRING_CMD_CONTEXT_DEF_CONF, value)))
-        throw std::string (STRING_CMD_CONTEXT_DEF_ABRT);
+          ! confirm (format ("The filter '{1}' matches 0 pending tasks. Do you wish to continue?", value)))
+        throw std::string ("Context definition aborted.");
 
     // Set context definition config variable
     bool success = CmdConfig::setConfigVariable (name, value, confirmation);
 
     if (!success)
-      throw format (STRING_CMD_CONTEXT_DEF_FAIL, words[1]);
+      throw format ("Context '{1}' not defined.", words[1]);
 
-    out << format (STRING_CMD_CONTEXT_DEF_SUCC, words[1]) << '\n';
+    out << format ("Context '{1}' defined. Use 'task context {1}' to activate.\n", words[1]);
   }
   else
-    throw std::string (STRING_CMD_CONTEXT_DEF_USAG);
+    throw std::string ("Both context name and its definition must be provided.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -203,12 +202,12 @@ void CmdContext::deleteContext (const std::vector <std::string>& words, std::str
 
     // Output feedback
     if (rc != 0)
-      throw format (STRING_CMD_CONTEXT_DEL_FAIL, words[1]);
+      throw format ("Context '{1}' not deleted.", words[1]);
 
-    out << format (STRING_CMD_CONTEXT_DEL_SUCC, words[1]) << '\n';
+    out << format ("Context '{1}' deleted.\n", words[1]);
   }
   else
-    throw std::string(STRING_CMD_CONTEXT_DEL_USAG);
+    throw std::string("Context name needs to be specified.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -252,7 +251,7 @@ void CmdContext::listContexts (std::stringstream& out)
         << optionalBlankLine ();
   }
   else
-    throw std::string (STRING_CMD_CONTEXT_LIST_EMPT);
+    throw std::string ("No contexts defined.");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -273,16 +272,16 @@ void CmdContext::setContext (const std::vector <std::string>& words, std::string
 
   // Check that the specified context is defined
   if (std::find (contexts.begin (), contexts.end (), value) == contexts.end ())
-    throw format (STRING_CMD_CONTEXT_SET_NFOU, value);
+    throw format ("Context '{1}' not found.", value);
 
   // Set the active context.
   // Should always succeed, as we do not require confirmation.
   bool success = CmdConfig::setConfigVariable ("context", value, false);
 
   if (! success)
-    throw format (STRING_CMD_CONTEXT_SET_FAIL, value);
+    throw format ("Context '{1}' not applied.", value);
 
-  out << format (STRING_CMD_CONTEXT_SET_SUCC, value) << '\n';
+  out << format ("Context '{1}' set. Use 'task context none' to remove.\n", value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -298,11 +297,11 @@ void CmdContext::showContext (std::stringstream& out)
   auto currentContext = context.config.get ("context");
 
   if (currentContext == "")
-    out << STRING_CMD_CONTEXT_SHOW_EMPT << '\n';
+    out << "No context is currently applied.\n";
   else
   {
     std::string currentFilter = context.config.get ("context." + currentContext);
-    out << format (STRING_CMD_CONTEXT_SHOW, currentContext, currentFilter) << '\n';
+    out << format ("Context '{1}' with filter '{2}' is currently applied.\n", currentContext, currentFilter);
   }
 }
 
@@ -319,9 +318,9 @@ void CmdContext::showContext (std::stringstream& out)
 void CmdContext::unsetContext (std::stringstream& out)
 {
   if (CmdConfig::unsetConfigVariable ("context", false))
-    throw std::string(STRING_CMD_CONTEXT_NON_FAIL);
+    throw std::string ("Context not unset.");
 
-  out << STRING_CMD_CONTEXT_NON_SUCC << '\n';
+  out << "Context unset.\n";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -329,7 +328,7 @@ CmdCompletionContext::CmdCompletionContext ()
 {
   _keyword               = "_context";
   _usage                 = "task          _context";
-  _description           = STRING_CMD_HCONTEXT_USAGE;
+  _description           = "Lists all supported contexts, for completion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 22f58dd77..ae7d32901 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -201,26 +201,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Konfigurationsdatei {1} verändert."
 #define STRING_CMD_CONFIG_NO_NAME    "Geben Sie den Wert der zu ändernden Option an."
 #define STRING_CMD_HCONFIG_USAGE     "Zeigt alle unterstützten Konfigurations-Optionen zur AUtovervollständigung"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
 #define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 171abf8ea..460a4e7d4 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -198,26 +198,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definition aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 10e6d39c1..f1beedf30 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -201,26 +201,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Agorda dosiero {1} modifita."
 #define STRING_CMD_CONFIG_NO_NAME    "Specifu la nomon de agordvariablo, kiun vi volas modifi."
 #define STRING_CMD_HCONFIG_USAGE     "Listigas çiun subtenatan agordan variablon, por motivo memkompletada"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
 #define STRING_CMD_CUSTOM_COUNT      "1 tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 81fda5f21..8d5552fa4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -208,26 +208,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Archivo de configuración {1} modificado."
 #define STRING_CMD_CONFIG_NO_NAME    "Especifique el nombre de una variable de configuración a modificar."
 #define STRING_CMD_HCONFIG_USAGE     "Lista todas las variables de configuración soportadas, a fines de completado"
-#define STRING_CMD_CONTEXT_USAGE     "Establece y define contextos (filtros por defecto)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Contexto '{1}' definido."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Contexto '{1}' no definido."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Se deben definir tanto el nombre de un contexto como su definición."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Definición de contexto abortada."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Validación de filtro fallida: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "El filtro '{1}' coincide con 0 tareas pendientes. ¿Quiere continuar?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Contexto '{1}' eliminado."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Contexto '{1}' no eliminado."
-#define STRING_CMD_CONTEXT_DEL_USAG  "El nombre del contexto necesita ser especificado."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No hay contextos definidos."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Contexto '{1}' noencontrado."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Contexto '{1}' establecido. Use 'task context none' para eliminarlo."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Contexto '{1}' no aplicado."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "Actualmente no se aplica ningún contexto."
-#define STRING_CMD_CONTEXT_SHOW      "El contexto '{1}' con filtro '{2}' se aplica actualmente."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Contexto deshabilitado."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context no deshabilitado."
-#define STRING_CMD_HCONTEXT_USAGE    "Lista todos los contextos soportados, con fines de completado"
 #define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarea"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 1866d1aae..e93307f6c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -203,26 +203,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
 #define STRING_CMD_CUSTOM_COUNT      "1 tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 05eeef5f1..9e6e08401 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -202,26 +202,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "File di configurazione {1} modificato."
 #define STRING_CMD_CONFIG_NO_NAME    "Specificare il nome di una variabile di configurazione da modificare."
 #define STRING_CMD_HCONFIG_USAGE     "Elenca le variabili di configurazione supportate, per autocompletamento"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0761fd6e3..d4c36991b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -203,26 +203,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
 #define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
 #define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index df5f70eb5..163a0fdb8 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -203,26 +203,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Plik konfiguracyjny {1} został zmodyfikowany."
 #define STRING_CMD_CONFIG_NO_NAME    "Podaj nazwę zmiennej w konfiguracji do zmiany."
 #define STRING_CMD_HCONFIG_USAGE     "Wylistuj wszystkie zmienne konfiguracji."
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
 #define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ff46fcb22..e46adc4be 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -203,26 +203,6 @@
 #define STRING_CMD_CONFIG_FILE_MOD   "Ficheiro de configuração {1} alterado."
 #define STRING_CMD_CONFIG_NO_NAME    "Especifique o nome da configuração a modificar."
 #define STRING_CMD_HCONFIG_USAGE     "Lista todas as configurações suportadas, para fins de terminação automática"
-#define STRING_CMD_CONTEXT_USAGE     "Set and define contexts (default filters)"
-#define STRING_CMD_CONTEXT_DEF_SUCC  "Context '{1}' defined. Use 'task context {1}' to activate."
-#define STRING_CMD_CONTEXT_DEF_FAIL  "Context '{1}' not defined."
-#define STRING_CMD_CONTEXT_DEF_USAG  "Both context name and its definition must be provided."
-#define STRING_CMD_CONTEXT_DEF_ABRT  "Context definiton aborted."
-#define STRING_CMD_CONTEXT_DEF_ABRT2 "Filter validation failed: {1}"
-#define STRING_CMD_CONTEXT_DEF_CONF  "The filter '{1}' matches 0 pending tasks. Do you wish to continue?"
-#define STRING_CMD_CONTEXT_DEF_INVLD "The name '{1}' is reserved and not allowed to use as a context name."
-#define STRING_CMD_CONTEXT_DEL_SUCC  "Context '{1}' deleted."
-#define STRING_CMD_CONTEXT_DEL_FAIL  "Context '{1}' not deleted."
-#define STRING_CMD_CONTEXT_DEL_USAG  "Context name needs to be specified."
-#define STRING_CMD_CONTEXT_LIST_EMPT "No contexts defined."
-#define STRING_CMD_CONTEXT_SET_NFOU  "Context '{1}' not found."
-#define STRING_CMD_CONTEXT_SET_SUCC  "Context '{1}' set. Use 'task context none' to remove."
-#define STRING_CMD_CONTEXT_SET_FAIL  "Context '{1}' not applied."
-#define STRING_CMD_CONTEXT_SHOW_EMPT "No context is currently applied."
-#define STRING_CMD_CONTEXT_SHOW      "Context '{1}' with filter '{2}' is currently applied."
-#define STRING_CMD_CONTEXT_NON_SUCC  "Context unset."
-#define STRING_CMD_CONTEXT_NON_FAIL  "Context not unset."
-#define STRING_CMD_HCONTEXT_USAGE    "Lists all supported contexts, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarefa"

From 375294a56ca3e327991bafea74981101e7996626 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:06:36 -0500
Subject: [PATCH 655/879] l10n: Eliminated STRING_CMD_CONFIG_*

---
 src/commands/CmdConfig.cpp | 20 +++++++++-----------
 src/l10n/deu-DEU.h         |  8 --------
 src/l10n/eng-USA.h         |  8 --------
 src/l10n/epo-RUS.h         |  8 --------
 src/l10n/esp-ESP.h         |  8 --------
 src/l10n/fra-FRA.h         |  8 --------
 src/l10n/ita-ITA.h         |  8 --------
 src/l10n/jpn-JPN.h         |  8 --------
 src/l10n/pol-POL.h         |  8 --------
 src/l10n/por-PRT.h         |  8 --------
 10 files changed, 9 insertions(+), 83 deletions(-)

diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index eb1f7c461..2e6dd61d3 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -30,7 +30,6 @@
 #include <algorithm>
 #include <Context.h>
 #include <JSON.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 
@@ -41,7 +40,7 @@ CmdConfig::CmdConfig ()
 {
   _keyword               = "config";
   _usage                 = "task          config [name [value | '']]";
-  _description           = STRING_CMD_CONFIG_USAGE;
+  _description           = "Change settings in the task configuration";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -77,7 +76,7 @@ bool CmdConfig::setConfigVariable (
     {
       found = true;
       if (!confirmation ||
-          confirm (format (STRING_CMD_CONFIG_CONFIRM, name, context.config.get (name), value)))
+          confirm (format ("Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?", name, context.config.get (name), value)))
       {
         line = name + '=' + json::encode (value);
 
@@ -92,7 +91,7 @@ bool CmdConfig::setConfigVariable (
   // Not found, so append instead.
   if (! found &&
       (! confirmation ||
-       confirm (format (STRING_CMD_CONFIG_CONFIRM2, name, value))))
+       confirm (format ("Are you sure you want to add '{1}' with a value of '{2}'?", name, value))))
   {
     contents.push_back (name + '=' + json::encode (value));
     change = true;
@@ -130,7 +129,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
 
       // Remove name
       if (!confirmation ||
-          confirm (format (STRING_CMD_CONFIG_CONFIRM3, name)))
+          confirm (format ("Are you sure you want to remove '{1}'?", name)))
       {
         // vector::erase method returns a valid iterator to the next object
         line = contents.erase (line);
@@ -209,26 +208,25 @@ int CmdConfig::execute (std::string& output)
           found = true;
 
         if (! found)
-          throw format (STRING_CMD_CONFIG_NO_ENTRY, name);
+          throw format ("No entry named '{1}' found.", name);
       }
 
       // Show feedback depending on whether .taskrc has been rewritten
       if (change)
       {
-        out << format (STRING_CMD_CONFIG_FILE_MOD,
-                       context.config.file ())
+        out << format ("Config file {1} modified.", context.config.file ())
             << '\n';
       }
       else
         out << "No changes made.\n";
     }
     else
-      throw std::string (STRING_CMD_CONFIG_NO_NAME);
+      throw std::string ("Specify the name of a config variable to modify.");
 
     output = out.str ();
   }
   else
-    throw std::string (STRING_CMD_CONFIG_NO_NAME);
+    throw std::string ("Specify the name of a config variable to modify.");
 
   return rc;
 }
@@ -238,7 +236,7 @@ CmdCompletionConfig::CmdCompletionConfig ()
 {
   _keyword               = "_config";
   _usage                 = "task          _config";
-  _description           = STRING_CMD_HCONFIG_USAGE;
+  _description           = "Lists all supported configuration variables, for completion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ae7d32901..c220511c2 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -193,14 +193,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
 #define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
 
-#define STRING_CMD_CONFIG_USAGE      "task-Konfiguration verändern"
-#define STRING_CMD_CONFIG_CONFIRM    "Wirklich die Option '{1}' von '{2}' zu '{3}' ändern?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Wirklich die Option '{1}' mit Wert '{2}' hinzufügen?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Wirklich die Option '{1}' entfernen?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "Kein Eintrag '{1}' gefunden."
-#define STRING_CMD_CONFIG_FILE_MOD   "Konfigurationsdatei {1} verändert."
-#define STRING_CMD_CONFIG_NO_NAME    "Geben Sie den Wert der zu ändernden Option an."
-#define STRING_CMD_HCONFIG_USAGE     "Zeigt alle unterstützten Konfigurations-Optionen zur AUtovervollständigung"
 #define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
 #define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 460a4e7d4..034a54006 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -190,14 +190,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
-#define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
-#define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
-#define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f1beedf30..13a146b42 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -193,14 +193,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
-#define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
-#define STRING_CMD_CONFIG_FILE_MOD   "Agorda dosiero {1} modifita."
-#define STRING_CMD_CONFIG_NO_NAME    "Specifu la nomon de agordvariablo, kiun vi volas modifi."
-#define STRING_CMD_HCONFIG_USAGE     "Listigas çiun subtenatan agordan variablon, por motivo memkompletada"
 #define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
 #define STRING_CMD_CUSTOM_COUNT      "1 tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 8d5552fa4..5953edc80 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -200,14 +200,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
 #define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
 
-#define STRING_CMD_CONFIG_USAGE      "Cambia los ajustes en la configuración de task"
-#define STRING_CMD_CONFIG_CONFIRM    "¿Está seguro de querer cambiar el valor de '{1}' de '{2}' a '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "¿Está seguro de querer añadir '{1}' con un valor de '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "¿Está seguro de querer eliminar '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "No se encontró una entrada llamada '{1}'."
-#define STRING_CMD_CONFIG_FILE_MOD   "Archivo de configuración {1} modificado."
-#define STRING_CMD_CONFIG_NO_NAME    "Especifique el nombre de una variable de configuración a modificar."
-#define STRING_CMD_HCONFIG_USAGE     "Lista todas las variables de configuración soportadas, a fines de completado"
 #define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarea"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index e93307f6c..0f5b5d31a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -195,14 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
-#define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
-#define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
-#define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
 #define STRING_CMD_CUSTOM_COUNT      "1 tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 9e6e08401..53a686925 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -194,14 +194,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
 
-#define STRING_CMD_CONFIG_USAGE      "Modifica le impostazioni nella configurazione dei task"
-#define STRING_CMD_CONFIG_CONFIRM    "Sei sicuro di voler cambiare il valore di '{1}' da '{2}' a '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Sei sicuro di voler aggiungere '{1}' con valore '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Sei sicuro di voler rimuovere '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "Nessuna voce '{1}' trovata."
-#define STRING_CMD_CONFIG_FILE_MOD   "File di configurazione {1} modificato."
-#define STRING_CMD_CONFIG_NO_NAME    "Specificare il nome di una variabile di configurazione da modificare."
-#define STRING_CMD_HCONFIG_USAGE     "Elenca le variabili di configurazione supportate, per autocompletamento"
 #define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index d4c36991b..28441928a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -195,14 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 
-#define STRING_CMD_CONFIG_USAGE      "Change settings in the task configuration"
-#define STRING_CMD_CONFIG_CONFIRM    "Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Are you sure you want to add '{1}' with a value of '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Are you sure you want to remove '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "No entry named '{1}' found."
-#define STRING_CMD_CONFIG_FILE_MOD   "Config file {1} modified."
-#define STRING_CMD_CONFIG_NO_NAME    "Specify the name of a config variable to modify."
-#define STRING_CMD_HCONFIG_USAGE     "Lists all supported configuration variables, for completion purposes"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 163a0fdb8..b2703ef84 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -195,14 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
 
-#define STRING_CMD_CONFIG_USAGE      "Zmienia konfigurację programu"
-#define STRING_CMD_CONFIG_CONFIRM    "Czy na pewno chcesz zmienić wartość '{1}' z '{2}' na '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Czy na pewno chcesz dodać '{1}' z wartością '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Czy na pewno chcesz usunąć '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "Nie znaleziono wpisu '{1}'."
-#define STRING_CMD_CONFIG_FILE_MOD   "Plik konfiguracyjny {1} został zmodyfikowany."
-#define STRING_CMD_CONFIG_NO_NAME    "Podaj nazwę zmiennej w konfiguracji do zmiany."
-#define STRING_CMD_HCONFIG_USAGE     "Wylistuj wszystkie zmienne konfiguracji."
 #define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
 #define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index e46adc4be..9d92030ef 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -195,14 +195,6 @@
 #define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
 #define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
 
-#define STRING_CMD_CONFIG_USAGE      "Altera parametros na configuração do 'task'"
-#define STRING_CMD_CONFIG_CONFIRM    "Tem a certeza que pretende alterar o valor de '{1}' de '{2}' para '{3}'?"
-#define STRING_CMD_CONFIG_CONFIRM2   "Tem a certeza que pretende adicionar '{1}' com o valor '{2}'?"
-#define STRING_CMD_CONFIG_CONFIRM3   "Tem a certeza que pretende remover '{1}'?"
-#define STRING_CMD_CONFIG_NO_ENTRY   "Não encontrada a entrada '{1}' ."
-#define STRING_CMD_CONFIG_FILE_MOD   "Ficheiro de configuração {1} alterado."
-#define STRING_CMD_CONFIG_NO_NAME    "Especifique o nome da configuração a modificar."
-#define STRING_CMD_HCONFIG_USAGE     "Lista todas as configurações suportadas, para fins de terminação automática"
 #define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarefa"

From 8e01baa49a30b673a95bf0396970c71eb329309b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:09:05 -0500
Subject: [PATCH 656/879] l10n: Eliminated STRING_CMD_TIMESHEET_*

---
 src/commands/CmdTimesheet.cpp | 3 +--
 src/l10n/deu-DEU.h            | 3 ---
 src/l10n/eng-USA.h            | 3 ---
 src/l10n/epo-RUS.h            | 3 ---
 src/l10n/esp-ESP.h            | 3 ---
 src/l10n/fra-FRA.h            | 3 ---
 src/l10n/ita-ITA.h            | 3 ---
 src/l10n/jpn-JPN.h            | 3 ---
 src/l10n/pol-POL.h            | 3 ---
 src/l10n/por-PRT.h            | 3 ---
 10 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 152b4ae6d..df8d45b50 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -35,7 +35,6 @@
 #include <Datetime.h>
 #include <main.h>
 #include <util.h>
-#include <i18n.h>
 #include <format.h>
 
 extern Context context;
@@ -45,7 +44,7 @@ CmdTimesheet::CmdTimesheet ()
 {
   _keyword               = "timesheet";
   _usage                 = "task [filter] timesheet";
-  _description           = STRING_CMD_TIMESHEET_USAGE;
+  _description           = "Summary of completed and started tasks";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c220511c2..6719f4baf 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -198,9 +198,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} Aufgaben"
 #define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
-#define STRING_CMD_TIMESHEET_USAGE   "Wöchentliche Zusammenfassung abgeschlossener und anfgefangener Aufgaben"
-#define STRING_CMD_TIMESHEET_STARTED "Begonnen ({1} Aufgaben)"
-#define STRING_CMD_TIMESHEET_DONE    "Abgeschlossen ({1} Aufgaben)"
 #define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 034a54006..dd257ee02 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -195,9 +195,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
-#define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
-#define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 13a146b42..d775fbc65 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -198,9 +198,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 tasko"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} taskoj"
 #define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
-#define STRING_CMD_TIMESHEET_USAGE   "Ĉiusemajna resumo de ĉia tasko finita aŭ ekita"
-#define STRING_CMD_TIMESHEET_STARTED "Ekis ({1} taskojn)"
-#define STRING_CMD_TIMESHEET_DONE    "Finis ({1} taskojn)"
 #define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5953edc80..5e2dfffb4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -205,9 +205,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 tarea"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tareas"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
-#define STRING_CMD_TIMESHEET_USAGE   "Resumen semanal de tareas completadas y comenzadas"
-#define STRING_CMD_TIMESHEET_STARTED "Comenzadas ({1} tareas)"
-#define STRING_CMD_TIMESHEET_DONE    "Completadas ({1} tareas)"
 #define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 0f5b5d31a..f47618ce8 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -200,9 +200,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 tâche"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tâches"
 #define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
-#define STRING_CMD_TIMESHEET_USAGE   "Résumé hebdomadaire des tâches terminées et démarrées"
-#define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
-#define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 53a686925..48b822c51 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -199,9 +199,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} task"
 #define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
-#define STRING_CMD_TIMESHEET_USAGE   "Sommario settimanale dei task completati e avviati"
-#define STRING_CMD_TIMESHEET_STARTED "Avviati ({1} task)"
-#define STRING_CMD_TIMESHEET_DONE    "Completati ({1} task)"
 #define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 28441928a..02b5c9571 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -200,9 +200,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_TIMESHEET_USAGE   "Summary of completed and started tasks"
-#define STRING_CMD_TIMESHEET_STARTED "Started ({1} tasks)"
-#define STRING_CMD_TIMESHEET_DONE    "Completed ({1} tasks)"
 #define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b2703ef84..e17526b5a 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -200,9 +200,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} zadań"
 #define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
-#define STRING_CMD_TIMESHEET_USAGE   "Tygodniowe podsumowanie z ukończonych i uruchomionych zadań"
-#define STRING_CMD_TIMESHEET_STARTED "Uruchomiono ({1} zadań)"
-#define STRING_CMD_TIMESHEET_DONE    "Ukończono ({1} zadań)"
 #define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9d92030ef..889c70eed 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -200,9 +200,6 @@
 #define STRING_CMD_CUSTOM_COUNT      "1 tarefa"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tarefas"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
-#define STRING_CMD_TIMESHEET_USAGE   "Sumário semanal de tarefas concluídas e iniciadas"
-#define STRING_CMD_TIMESHEET_STARTED "Iniciadas ({1} tarefas)"
-#define STRING_CMD_TIMESHEET_DONE    "Concluídas ({1} tarefas)"
 #define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."

From 92adb55c7a11bcd130ca79cdb01c97f0d8403cec Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:13:13 -0500
Subject: [PATCH 657/879] l10n: Eliminated STRING_CMD_PREPEND_*

---
 src/commands/CmdPrepend.cpp | 15 +++++++--------
 src/l10n/deu-DEU.h          |  9 ---------
 src/l10n/eng-USA.h          |  9 ---------
 src/l10n/epo-RUS.h          |  9 ---------
 src/l10n/esp-ESP.h          |  9 ---------
 src/l10n/fra-FRA.h          |  9 ---------
 src/l10n/ita-ITA.h          |  9 ---------
 src/l10n/jpn-JPN.h          |  9 ---------
 src/l10n/pol-POL.h          |  9 ---------
 src/l10n/por-PRT.h          |  9 ---------
 10 files changed, 7 insertions(+), 89 deletions(-)

diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 56abfb9b4..ec83e65b4 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -41,7 +40,7 @@ CmdPrepend::CmdPrepend ()
 {
   _keyword               = "prepend";
   _usage                 = "task <filter> prepend <mods>";
-  _description           = STRING_CMD_PREPEND_USAGE;
+  _description           = "Prepends text to an existing task description";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -78,7 +77,7 @@ int CmdPrepend::execute (std::string&)
     Task before (task);
 
     // Prepend to the specified task.
-    std::string question = format (STRING_CMD_PREPEND_CONFIRM,
+    std::string question = format ("Prepend to task {1} '{2}'?",
                                    task.identifier (true),
                                    task.get ("description"));
 
@@ -88,7 +87,7 @@ int CmdPrepend::execute (std::string&)
     {
       context.tdb2.modify (task);
       ++count;
-      feedback_affected (STRING_CMD_PREPEND_TASK, task);
+      feedback_affected ("Prepending to task {1} '{2}'.", task);
       if (context.verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
@@ -96,7 +95,7 @@ int CmdPrepend::execute (std::string&)
       if (task.has ("parent"))
       {
         if ((context.config.get ("recurrence.confirmation") == "prompt"
-             && confirm (STRING_CMD_PREPEND_CONFIRM_R)) ||
+             && confirm ("This is a recurring task.  Do you want to prepend to all pending recurrences of this same task?")) ||
             context.config.getBoolean ("recurrence.confirmation"))
         {
           std::vector <Task> siblings = context.tdb2.siblings (task);
@@ -105,7 +104,7 @@ int CmdPrepend::execute (std::string&)
             sibling.modify (Task::modPrepend, true);
             context.tdb2.modify (sibling);
             ++count;
-            feedback_affected (STRING_CMD_PREPEND_TASK_R, sibling);
+            feedback_affected ("Prepending to recurring task {1} '{2}'.", sibling);
           }
 
           // Prepend to the parent
@@ -118,7 +117,7 @@ int CmdPrepend::execute (std::string&)
     }
     else
     {
-      std::cout << STRING_CMD_PREPEND_NO << '\n';
+      std::cout << "Task not prepended.\n";
       rc = 1;
       if (_permission_quit)
         break;
@@ -130,7 +129,7 @@ int CmdPrepend::execute (std::string&)
     if (change.first != "")
       context.footnote (change.second);
 
-  feedback_affected (count == 1 ? STRING_CMD_PREPEND_1 : STRING_CMD_PREPEND_N, count);
+  feedback_affected (count == 1 ? "Prepended {1} task." : "Prepended {1} tasks.", count);
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6719f4baf..9afc5489b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Stellt einer Aufgabenbeschreibung Text voran"
-#define STRING_CMD_PREPEND_1         "Vor {1} Aufgabe vorangestellt."
-#define STRING_CMD_PREPEND_N         "Vor {1} Aufgaben vorangestellt."
-#define STRING_CMD_PREPEND_TASK      "Stelle Aufgabe {1} '{2}' voran."
-#define STRING_CMD_PREPEND_TASK_R    "Stelle wiederholender Aufgabe {1} '{2}' voran."
-#define STRING_CMD_PREPEND_CONFIRM_R "Dies ist eine wiederholende Aufgabe.  Möchten Sie vor allen offenen Wiederholungen dieser Aufgabe anfügen?"
-#define STRING_CMD_PREPEND_CONFIRM   "Vor Aufgabe {1} '{2}' anfügen?"
-#define STRING_CMD_PREPEND_NO        "Nicht vor Aufgabe angefügt."
-
 #define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
 #define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index dd257ee02..fffe84725 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -167,15 +167,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
-#define STRING_CMD_PREPEND_1         "Prepended {1} task."
-#define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
-#define STRING_CMD_PREPEND_TASK      "Prepending to task {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Prepending to recurring task {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task.  Do you want to prepend to all pending recurrences of this same task?"
-#define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Task not prepended."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d775fbc65..7bfccc09d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -170,15 +170,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Aldonas tekston antaŭ task-priskribo"
-#define STRING_CMD_PREPEND_1         "Predonis al {1} tasko."
-#define STRING_CMD_PREPEND_N         "Predonis {1} taskoj."
-#define STRING_CMD_PREPEND_TASK      "Predonanta al tasko {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Predonanta al reokazanta tasko {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "Tio estas reokazanta tasko. Ĉu vi volas predoni al ĉia pendanta okazaĵo de ĉi tiu tasko?"
-#define STRING_CMD_PREPEND_CONFIRM   "Predonis al taskon {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Ne predonis al tasko."
-
 #define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
 #define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
 #define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 5e2dfffb4..181c40e06 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -176,15 +176,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Antepone texto a la descripción de una tarea existente"
-#define STRING_CMD_PREPEND_1         "Antepuesto texto a {1} tarea."
-#define STRING_CMD_PREPEND_N         "Antepuesto texto a {1} tareas."
-#define STRING_CMD_PREPEND_TASK      "Anteponiendo texto a la tarea {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Antepuesto texto a la tarea recurrente {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "Esta es una tarea recurrente. ¿Quiere anteponer texto a todas las recurrencias pendientes de esta misma tarea?"
-#define STRING_CMD_PREPEND_CONFIRM   "¿Anteponer texto a la tarea {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Texto no antepuesto."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
 #define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f47618ce8..6cf840bbf 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
-#define STRING_CMD_PREPEND_1         "Prepended {1} task."
-#define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
-#define STRING_CMD_PREPEND_TASK      "Prepending to task {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Prepending to recurring task {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task.  Do you want to prepend to all pending recurrences of this same task?"
-#define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Tâche not prepended."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 48b822c51..3daa3602f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -171,15 +171,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Aggiunge testo all'inizio di una descrizione di un task esistente"
-#define STRING_CMD_PREPEND_1         "Aggiunta al task {1}."
-#define STRING_CMD_PREPEND_N         "Aggiunte ai task {1}."
-#define STRING_CMD_PREPEND_TASK      "Aggiunta al task {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Aggiunta al task periodico {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "Questo è un task periodico. Aggiungere il testo all'inizio della descrizione di tutti i task associati?"
-#define STRING_CMD_PREPEND_CONFIRM   "Aggiungere all'inizio della descrizione del task {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Aggiunta non effettuata."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
 #define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 02b5c9571..113af2eaa 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Prepends text to an existing task description"
-#define STRING_CMD_PREPEND_1         "Prepended {1} task."
-#define STRING_CMD_PREPEND_N         "Prepended {1} tasks."
-#define STRING_CMD_PREPEND_TASK      "Prepending to task {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Prepending to recurring task {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "This is a recurring task.  Do you want to prepend to all pending recurrences of this same task?"
-#define STRING_CMD_PREPEND_CONFIRM   "Prepend to task {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Task not prepended."
-
 #define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
 #define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e17526b5a..4d3d0941c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Dodaje ciąg na początku opisu zadania"
-#define STRING_CMD_PREPEND_1         "Dodano ciąg do opisu {1} zadania."
-#define STRING_CMD_PREPEND_N         "Dodano ciąg do opisu {1} zadań."
-#define STRING_CMD_PREPEND_TASK      "Dodawanie ciągu do opisu zadania {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Dodawanie ciągu do opisu zadania cyklicznego {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "To zadanie jest cykliczne. Czy chcesz dodać ciąg do opisu kolejnych zadań w cyklu?"
-#define STRING_CMD_PREPEND_CONFIRM   "Dodać ciąg do opisu zadania {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Nie dodano ciągu do opisu."
-
 #define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
 #define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 889c70eed..881ac2503 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -172,15 +172,6 @@
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
 
-#define STRING_CMD_PREPEND_USAGE     "Antepõe texto à descrição de uma tarefa existente"
-#define STRING_CMD_PREPEND_1         "Anteposta {1} tarefa."
-#define STRING_CMD_PREPEND_N         "Antepostas {1} tarefas."
-#define STRING_CMD_PREPEND_TASK      "Antepor à tarefa {1} '{2}'."
-#define STRING_CMD_PREPEND_TASK_R    "Antepor à tarefa recorrente {1} '{2}'."
-#define STRING_CMD_PREPEND_CONFIRM_R "Esta é uma tarefa recorrente. Deseja antepor a todas as ocorrências pendentes desta tarefa?"
-#define STRING_CMD_PREPEND_CONFIRM   "Antepor à tarefa {1} '{2}'?"
-#define STRING_CMD_PREPEND_NO        "Tarefa não anteposta."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
 #define STRING_CMD_IMPORT_FILE       "A importar '{1}'"

From e2696269822e416c30d4475218e9492109872daa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:18:43 -0500
Subject: [PATCH 658/879] CmdVersion: Uses libshared osName

---
 src/commands/CmdVersion.cpp | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index 0bc7bd6e1..d17d5dee5 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -33,6 +33,7 @@
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
+#include <shared.h>
 #include <format.h>
 #include <i18n.h>
 
@@ -78,30 +79,7 @@ int CmdVersion::execute (std::string& output)
 
   out << '\n'
       << format ("{1} {2} built for ", bold.colorize (PACKAGE), bold.colorize (VERSION))
-
-#if defined (DARWIN)
-      << "darwin"
-#elif defined (SOLARIS)
-      << "solaris"
-#elif defined (CYGWIN)
-      << "cygwin"
-#elif defined (HAIKU)
-      << "haiku"
-#elif defined (OPENBSD)
-      << "openbsd"
-#elif defined (FREEBSD)
-      << "freebsd"
-#elif defined (NETBSD)
-      << "netbsd"
-#elif defined (LINUX)
-      << "linux"
-#elif defined (KFREEBSD)
-      << "gnu-kfreebsd"
-#elif defined (GNUHURD)
-      << "gnu-hurd"
-#else
-      << STRING_CMD_VERSION_UNKNOWN
-#endif
+      << osName ()
       << '\n'
       << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
       << '\n'

From 7f23fe3f648bbdb560ec0ec265799a25798bbe5d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:19:01 -0500
Subject: [PATCH 659/879] l10n: Eliminated STRING_CMD_VERSION_*

---
 src/commands/CmdVersion.cpp | 7 +++----
 src/l10n/deu-DEU.h          | 4 ----
 src/l10n/eng-USA.h          | 4 ----
 src/l10n/epo-RUS.h          | 4 ----
 src/l10n/esp-ESP.h          | 5 -----
 src/l10n/fra-FRA.h          | 4 ----
 src/l10n/ita-ITA.h          | 4 ----
 src/l10n/jpn-JPN.h          | 4 ----
 src/l10n/pol-POL.h          | 4 ----
 src/l10n/por-PRT.h          | 4 ----
 10 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index d17d5dee5..46560ee9e 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -35,7 +35,6 @@
 #endif
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -44,7 +43,7 @@ CmdVersion::CmdVersion ()
 {
   _keyword               = "version";
   _usage                 = "task          version";
-  _description           = STRING_CMD_VERSION_USAGE;
+  _description           = "Shows the Taskwarrior version number";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -71,7 +70,7 @@ int CmdVersion::execute (std::string& output)
   Table link;
   link.width (width);
   link.add ("");
-  link.set (link.addRow (), 0, STRING_CMD_VERSION_DOCS);
+  link.set (link.addRow (), 0, "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org");
 
   Color bold;
   if (context.color ())
@@ -98,7 +97,7 @@ CmdCompletionVersion::CmdCompletionVersion ()
 {
   _keyword               = "_version";
   _usage                 = "task          _version";
-  _description           = STRING_CMD_VERSION_USAGE2;
+  _description           = "Shows only the Taskwarrior version number";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 9afc5489b..d0ad76c8e 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "Zeigt die taskwarrior-Versionsnummer"
-#define STRING_CMD_VERSION_USAGE2    "Zeigt ausschließlich die taskwarrior-Versionsnummer"
-#define STRING_CMD_VERSION_DOCS      "Dokumentation für taskwarrior finden Sie in 'man task', 'man taskrc', 'man task-color', 'man task-sync' oder auf http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "unbekannt"
 #define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
 #define STRING_CMD_URGENCY_USAGE     "Zeigt die Dringlichkeit einer Aufgabe an"
 #define STRING_CMD_URGENCY_RESULT    "Aufgabe {1}, Dringlichkeit {2}"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index fffe84725..6073a1c52 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "Shows the Taskwarrior version number"
-#define STRING_CMD_VERSION_USAGE2    "Shows only the Taskwarrior version number"
-#define STRING_CMD_VERSION_DOCS      "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "unknown"
 #define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
 #define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7bfccc09d..fad3acff0 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "Montras la versinombro de taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Montras sole la versinombro de taskwarrior"
-#define STRING_CMD_VERSION_DOCS      "Oni povas trovi la dokumentojn por Taskwarrior kun 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq', aŭ ĉe http://taskwarrior.org."
-#define STRING_CMD_VERSION_UNKNOWN   "nekonata"
 #define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
 #define STRING_CMD_URGENCY_USAGE     "Montras la urĝec-mezuro de tasko"
 #define STRING_CMD_URGENCY_RESULT    "tasko {1} urĝeco {2}"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 181c40e06..930d8b751 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -102,11 +102,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
 
 // commands/Cmd*
-#define STRING_CMD_VERSION_USAGE     "Muestra el número de versión de taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Muestra el número de versión (solamente) de taskwarrior"
-
-#define STRING_CMD_VERSION_DOCS      "La documentación de Taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-color', y 'man task-sync' o en http://taskwarrior.org."
-#define STRING_CMD_VERSION_UNKNOWN   "desconocido"
 #define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
 #define STRING_CMD_URGENCY_USAGE     "Muestra la medida de urgencia de una tarea"
 #define STRING_CMD_URGENCY_RESULT    "tarea {1} urgencia {2}"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 6cf840bbf..63825e866 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "Affiche le numéro de version de taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Affiche uniquement le numéro de version de taskwarrior"
-#define STRING_CMD_VERSION_DOCS      "On peut trouver les documents de taskwarrior en utilisant 'man task', 'man taskrc', 'man task-color', 'man task-sync', ou chez http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "inconnu"
 #define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
 #define STRING_CMD_URGENCY_USAGE     "Affiche l'indice d'urgence de la tâche"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 3daa3602f..fcea50393 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -101,10 +101,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
 
 // commands/Cmd*
-#define STRING_CMD_VERSION_USAGE     "Mostra il numero di versione di taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Mostra solo il numero di versione di taskwarrior"
-#define STRING_CMD_VERSION_DOCS      "La documentazione di taskwarrior è consultabile con 'man task', 'man taskrc', 'man task-color', 'man task-sync' o presso http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "sconosciuto"
 #define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
 #define STRING_CMD_URGENCY_USAGE     "Mostra l'urgenza di un task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgenza {2}"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 113af2eaa..96c71fc4d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "taskwarrior バージョン番号の表示"
-#define STRING_CMD_VERSION_USAGE2    "taskwarrior バージョン番号のみの表示"
-#define STRING_CMD_VERSION_DOCS      "taskwarrior のドキュメントは 'man task', 'man taskrc', 'man task-color', 'man task-sync' あるいは http://taskwarrior.org にあります。"
-#define STRING_CMD_VERSION_UNKNOWN   "unknown"
 #define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
 #define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 4d3d0941c..77d049861 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -102,10 +102,6 @@
 
 // commands/Cmd*
 // USAGE strings are visible in 'task help'
-#define STRING_CMD_VERSION_USAGE     "Pokazuje wersję programu taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Pokazuje numer wersji programu taskwarrior"
-#define STRING_CMD_VERSION_DOCS      "Dokumentację dla taskwarrior można znaleźć z pomocą 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' lub pod adresem http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "nieznana"
 #define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
 #define STRING_CMD_URGENCY_USAGE     "Wyświetla pomiar ważności zadania"
 #define STRING_CMD_URGENCY_RESULT    "zadanie {1} ważność {2}"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 881ac2503..a6a94eaf3 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -102,10 +102,6 @@
 #define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
 
 // commands/Cmd*
-#define STRING_CMD_VERSION_USAGE     "Exibe o número de versão do taskwarrior"
-#define STRING_CMD_VERSION_USAGE2    "Exibe apenas o número de versão do taskwarrior"
-#define STRING_CMD_VERSION_DOCS      "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-color', 'man task-sync' ou em http://taskwarrior.org"
-#define STRING_CMD_VERSION_UNKNOWN   "desconhecido"
 #define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
 #define STRING_CMD_URGENCY_USAGE     "Exibe o valor de urgência de uma tarefa"
 #define STRING_CMD_URGENCY_RESULT    "Tarefa {1} urgência {2}"

From 76b7dc382061d1a399ce801e12ca4b01c0dac478 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:23:02 -0500
Subject: [PATCH 660/879] Code cleanup: Removed unnecessary include

---
 src/commands/CmdCalc.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 32b540409..cc0d89316 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -28,7 +28,6 @@
 #include <CmdCalc.h>
 #include <Filter.h>
 #include <Eval.h>
-#include <main.h>
 #include <i18n.h>
 
 extern Context context;

From 489515968caf89ceaf32b0c6de3c626e0cdfb8ed Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:23:44 -0500
Subject: [PATCH 661/879] l10n: Eliminated STRING_CMD_CALC_*

---
 src/commands/CmdCalc.cpp | 3 +--
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index cc0d89316..59d8b7288 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -28,7 +28,6 @@
 #include <CmdCalc.h>
 #include <Filter.h>
 #include <Eval.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -37,7 +36,7 @@ CmdCalc::CmdCalc ()
 {
   _keyword               = "calc";
   _usage                 = "task          calc <expression>";
-  _description           = STRING_CMD_CALC_USAGE;
+  _description           = "Calculator";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d0ad76c8e..cca223129 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -191,7 +191,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Datum"
 #define STRING_CMD_CAL_LABEL_HOL     "Feiertag"
 #define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
-#define STRING_CMD_CALC_USAGE        "Rechner"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6073a1c52..be7a83caa 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -188,7 +188,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_CALC_USAGE        "Calculator"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fad3acff0..555a85439 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -191,7 +191,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Dato"
 #define STRING_CMD_CAL_LABEL_HOL     "Ferio"
 #define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
-#define STRING_CMD_CALC_USAGE        "Kalkulilo"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 930d8b751..481040395 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -197,7 +197,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Fecha"
 #define STRING_CMD_CAL_LABEL_HOL     "Festivo"
 #define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
-#define STRING_CMD_CALC_USAGE        "Calculadora"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 63825e866..82efa5f8e 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -193,7 +193,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_CALC_USAGE        "Calculator"
 
 // These four blocks can be replaced, but the number of lines must not change.
 #define STRING_EDIT_HEADER_1         "La commande 'task <id> edit' vous permet de modifier tous les aspects d'une tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index fcea50393..fa225a28a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -192,7 +192,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Festività"
 #define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
-#define STRING_CMD_CALC_USAGE        "Calculator"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 96c71fc4d..f4528528f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -193,7 +193,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
 #define STRING_CMD_CAL_LABEL_HOL     "Holiday"
 #define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
-#define STRING_CMD_CALC_USAGE        "電卓"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 77d049861..5912c7fe1 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -193,7 +193,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Wakacje"
 #define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
-#define STRING_CMD_CALC_USAGE        "Kalkulator"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a6a94eaf3..f69186b44 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -193,7 +193,6 @@
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
 #define STRING_CMD_CAL_LABEL_HOL     "Feriado"
 #define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
-#define STRING_CMD_CALC_USAGE        "Calculadora"
 
 // Feedback
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."

From 02f3ce74d7438cdc7c5ff3b531fb89e3c42fedba Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:36:29 -0500
Subject: [PATCH 662/879] l10n: Eliminated STRING_CMD_{G,}HISTORY_*

---
 src/commands/CmdHistory.cpp | 34 ++++++++++++++++++++--------------
 src/l10n/deu-DEU.h          | 22 ----------------------
 src/l10n/eng-USA.h          | 22 ----------------------
 src/l10n/epo-RUS.h          | 22 ----------------------
 src/l10n/esp-ESP.h          | 27 ---------------------------
 src/l10n/fra-FRA.h          | 24 ------------------------
 src/l10n/ita-ITA.h          | 24 ------------------------
 src/l10n/jpn-JPN.h          | 24 ------------------------
 src/l10n/pol-POL.h          | 24 ------------------------
 src/l10n/por-PRT.h          | 24 ------------------------
 10 files changed, 20 insertions(+), 227 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 2f0da9546..99c1d83ec 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -36,6 +36,13 @@
 #include <i18n.h>
 #include <Datetime.h>
 
+#define STRING_CMD_HISTORY_YEAR      "Year"
+#define STRING_CMD_HISTORY_MONTH     "Month"
+#define STRING_CMD_HISTORY_DAY       "Day"
+#define STRING_CMD_HISTORY_ADDED     "Added"
+#define STRING_CMD_HISTORY_COMP      "Completed"
+#define STRING_CMD_HISTORY_DEL       "Deleted"
+
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -69,7 +76,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
 
   HistoryStrategy::setupTableDates (view);
 
-  view.add (STRING_CMD_GHISTORY_NUMBER, true, false); // Fixed.
+  view.add ("Number Added/Completed/Deleted", true, false); // Fixed.
 
   Color color_add    (context.config.get ("color.history.add"));
   Color color_done   (context.config.get ("color.history.done"));
@@ -168,15 +175,14 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
         << '\n';
 
     if (context.color ())
-      out << format (STRING_CMD_HISTORY_LEGEND,
+      out << format ("Legend: {1}, {2}, {3}",
                      color_add.colorize (STRING_CMD_HISTORY_ADDED),
                      color_done.colorize (STRING_CMD_HISTORY_COMP),
                      color_delete.colorize (STRING_CMD_HISTORY_DEL))
           << optionalBlankLine ()
           << '\n';
     else
-      out << STRING_CMD_HISTORY_LEGEND_A
-          << '\n';
+      out << "Legend: + Added, X Completed, - Deleted\n";
   }
   else
   {
@@ -200,7 +206,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
   view.add (STRING_CMD_HISTORY_ADDED, false);
   view.add (STRING_CMD_HISTORY_COMP,  false);
   view.add (STRING_CMD_HISTORY_DEL,   false);
-  view.add (STRING_CMD_HISTORY_NET,   false);
+  view.add ("Net",                    false);
 
   auto totalAdded     = 0;
   auto totalCompleted = 0;
@@ -258,7 +264,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
     if (context.color ())
       row_color = Color (Color::nocolor, Color::nocolor, false, true, false);
 
-    view.set (row, HistoryStrategy::dateFieldCount - 1, STRING_CMD_HISTORY_AVERAGE, row_color);
+    view.set (row, HistoryStrategy::dateFieldCount - 1, "Average", row_color);
     view.set (row, HistoryStrategy::dateFieldCount + 0, totalAdded     / (view.rows () - 2), row_color);
     view.set (row, HistoryStrategy::dateFieldCount + 1, totalCompleted / (view.rows () - 2), row_color);
     view.set (row, HistoryStrategy::dateFieldCount + 2, totalDeleted   / (view.rows () - 2), row_color);
@@ -316,7 +322,7 @@ public:
 
   static constexpr const char* keyword         = "history.monthly";
   static constexpr const char* usage           = "task <filter> history.monthly";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_M;
+  static constexpr const char* description     = "Shows a report of task history, by month";
   static constexpr unsigned int dateFieldCount = 2;
   static constexpr bool graphical              = false;
   static constexpr unsigned int labelWidth     = 0;  // unused.
@@ -418,7 +424,7 @@ public:
 
   static constexpr const char* keyword         = "ghistory.monthly";
   static constexpr const char* usage           = "task <filter> ghistory.monthly";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_M;
+  static constexpr const char* description     = "Shows a graphical report of task history, by month";
   static constexpr unsigned int dateFieldCount = 2;
   static constexpr bool graphical              = true;
   static constexpr unsigned int labelWidth     = 15;  // length '2017 September ' = 15
@@ -458,7 +464,7 @@ public:
 
   static constexpr const char* keyword         = "ghistory.annual";
   static constexpr const char* usage           = "task <filter> ghistory.annual";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_A;
+  static constexpr const char* description     = "Shows a graphical report of task history, by year";
   static constexpr unsigned int dateFieldCount = 1;
   static constexpr bool graphical              = true;
   static constexpr unsigned int labelWidth     = 5;  // length '2017 ' = 5
@@ -498,7 +504,7 @@ public:
 
   static constexpr const char* keyword         = "history.annual";
   static constexpr const char* usage           = "task <filter> history.annual";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_A;
+  static constexpr const char* description     = "Shows a report of task history, by year";
   static constexpr unsigned int dateFieldCount = 1;
   static constexpr bool graphical              = false;
   static constexpr unsigned int labelWidth     = 0;  // unused.
@@ -546,7 +552,7 @@ public:
 
   static constexpr const char* keyword         = "history.daily";
   static constexpr const char* usage           = "task <filter> history.daily";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_D;
+  static constexpr const char* description     = "Shows a report of task history, by day";
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = false;
   static constexpr unsigned int labelWidth     = 0;  // unused.
@@ -593,7 +599,7 @@ public:
 
   static constexpr const char* keyword         = "ghistory.daily";
   static constexpr const char* usage           = "task <filter> ghistory.daily";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_D;
+  static constexpr const char* description     = "Shows a graphical report of task history, by day";
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = true;
   static constexpr unsigned int labelWidth     = 19;  // length '2017 September Day ' = 19
@@ -640,7 +646,7 @@ public:
 
   static constexpr const char* keyword         = "history.weekly";
   static constexpr const char* usage           = "task <filter> history.weekly";
-  static constexpr const char* description     = STRING_CMD_HISTORY_USAGE_W;
+  static constexpr const char* description     = "Shows a report of task history, by week";
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = false;
   static constexpr unsigned int labelWidth     = 0;  // unused.
@@ -687,7 +693,7 @@ public:
 
   static constexpr const char* keyword         = "ghistory.weekly";
   static constexpr const char* usage           = "task <filter> ghistory.weekly";
-  static constexpr const char* description     = STRING_CMD_GHISTORY_USAGE_W;
+  static constexpr const char* description     = "Shows a graphical report of task history, by week";
   static constexpr unsigned int dateFieldCount = 3;
   static constexpr bool graphical              = true;
   static constexpr unsigned int labelWidth     = 19;  // length '2017 September Day ' = 19
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index cca223129..be83db1b5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -140,28 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
 #define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
 #define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
-#define STRING_CMD_HISTORY_USAGE_D   "Zeigt die tägliche Aufgabenentwicklung"
-#define STRING_CMD_HISTORY_USAGE_W   "Zeigt die wöchentliche Aufgabenentwicklung"
-#define STRING_CMD_HISTORY_USAGE_M   "Zeigt die monatliche Aufgabenentwicklung"
-#define STRING_CMD_HISTORY_YEAR      "Jahr"
-#define STRING_CMD_HISTORY_MONTH     "Monat"
-#define STRING_CMD_HISTORY_DAY       "Tag"
-#define STRING_CMD_HISTORY_ADDED     "Hinzugefügt"
-#define STRING_CMD_HISTORY_COMP      "Erledigt"
-#define STRING_CMD_HISTORY_DEL       "Gelöscht"
-#define STRING_CMD_HISTORY_NET       "Änderung"
-#define STRING_CMD_HISTORY_USAGE_A   "Zeigt die jährliche Aufgabenentwicklung"
-#define STRING_CMD_HISTORY_AVERAGE   "Durchschnitt"
-#define STRING_CMD_HISTORY_LEGEND    "Legende: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legende: + hinzugefügt, X erledigt, - gelöscht"
-#define STRING_CMD_GHISTORY_USAGE_D  "Zeigt die tägliche Aufgabenentwicklung grafisch"
-#define STRING_CMD_GHISTORY_USAGE_W  "Zeigt die wöchentliche Aufgabenentwicklung grafisch"
-#define STRING_CMD_GHISTORY_USAGE_M  "Zeigt die monatliche Aufgabenentwicklung grafisch"
-#define STRING_CMD_GHISTORY_USAGE_A  "Zeigt die jährliche Aufgabenentwicklung grafisch"
-#define STRING_CMD_GHISTORY_YEAR     "Jahr"
-#define STRING_CMD_GHISTORY_MONTH    "Monat"
-#define STRING_CMD_GHISTORY_MONTH    "Tag"
-#define STRING_CMD_GHISTORY_NUMBER   "Anzahl Hinzugefügt/Erledigt/Gelöscht"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index be7a83caa..9ded01f26 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -137,28 +137,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tags"
 #define STRING_CMD_TAGS_NO_TAGS      "No tags."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
-#define STRING_CMD_HISTORY_YEAR      "Year"
-#define STRING_CMD_HISTORY_MONTH     "Month"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_HISTORY_ADDED     "Added"
-#define STRING_CMD_HISTORY_COMP      "Completed"
-#define STRING_CMD_HISTORY_DEL       "Deleted"
-#define STRING_CMD_HISTORY_NET       "Net"
-#define STRING_CMD_HISTORY_USAGE_A   "Shows a report of task history, by year"
-#define STRING_CMD_HISTORY_AVERAGE   "Average"
-#define STRING_CMD_HISTORY_LEGEND    "Legend: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legend: + Added, X Completed, - Deleted"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_M  "Shows a graphical report of task history, by month"
-#define STRING_CMD_GHISTORY_USAGE_A  "Shows a graphical report of task history, by year"
-#define STRING_CMD_GHISTORY_YEAR     "Year"
-#define STRING_CMD_GHISTORY_MONTH    "Month"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_GHISTORY_NUMBER   "Number Added/Completed/Deleted"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 555a85439..97cd8ecf0 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -140,28 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 etikedo"
 #define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
 #define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_USAGE_M   "Montras raporton de taska historio, per monato"
-#define STRING_CMD_HISTORY_YEAR      "Jaro"
-#define STRING_CMD_HISTORY_MONTH     "Monato"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_HISTORY_ADDED     "Kreitaj"
-#define STRING_CMD_HISTORY_COMP      "Finitaj"
-#define STRING_CMD_HISTORY_DEL       "Viŝitaj"
-#define STRING_CMD_HISTORY_NET       "Neto"
-#define STRING_CMD_HISTORY_USAGE_A   "Montras raporton de taska historio, per jaro"
-#define STRING_CMD_HISTORY_AVERAGE   "Meznombro"
-#define STRING_CMD_HISTORY_LEGEND    "Gamo: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Gamo: + kreita, X finita, - viŝita"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_M  "Montras grafikan raporton de taska historio, per monato"
-#define STRING_CMD_GHISTORY_USAGE_A  "Montras grafikan raporton de taska historio, per jaro"
-#define STRING_CMD_GHISTORY_YEAR     "Jaro"
-#define STRING_CMD_GHISTORY_MONTH    "Monato"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_GHISTORY_NUMBER   "Nombro Kreitaj/Finitaj/Viŝitaj"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 481040395..f026f8a12 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -140,33 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
-#define STRING_CMD_HISTORY_USAGE_M   "Muestra un informe de historia de tareas, por mes"
-
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-
-#define STRING_CMD_HISTORY_YEAR      "Año"
-#define STRING_CMD_HISTORY_MONTH     "Mes"
-#define STRING_CMD_HISTORY_ADDED     "Añadidas"
-#define STRING_CMD_HISTORY_COMP      "Completadas"
-#define STRING_CMD_HISTORY_DEL       "Suprimidas"
-#define STRING_CMD_HISTORY_NET       "Netas"
-#define STRING_CMD_HISTORY_USAGE_A   "Muestra un informe de historia de tareas, por año"
-#define STRING_CMD_HISTORY_AVERAGE   "Media"
-#define STRING_CMD_HISTORY_LEGEND    "Leyenda: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Leyenda: + añadida, X completada, - suprimida"
-
-#define STRING_CMD_GHISTORY_USAGE_M  "Muestra un informe gráfico de historia de tareas, por mes"
-#define STRING_CMD_GHISTORY_USAGE_A  "Muestra un informe gráfico de historia de tareas, por año"
-#define STRING_CMD_GHISTORY_YEAR     "Año"
-#define STRING_CMD_GHISTORY_MONTH    "Mes"
-#define STRING_CMD_GHISTORY_NUMBER   "Número Añadidas/Completadas/Suprimidas"
 #define STRING_CMD_UNIQUE_USAGE      "Genera listas de valores de atributo únicos"
 #define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 82efa5f8e..80a069dcd 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -140,30 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 étiquette"
 #define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
 #define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
-#define STRING_CMD_HISTORY_YEAR      "Année"
-#define STRING_CMD_HISTORY_MONTH     "Mois"
-#define STRING_CMD_HISTORY_ADDED     "Ajoutées"
-#define STRING_CMD_HISTORY_COMP      "Achevées"
-#define STRING_CMD_HISTORY_DEL       "Supprimées"
-#define STRING_CMD_HISTORY_NET       "Net"
-#define STRING_CMD_HISTORY_USAGE_A   "Montre un rapport de l'histoire des tâches, par an"
-#define STRING_CMD_HISTORY_AVERAGE   "Moyenne"
-#define STRING_CMD_HISTORY_LEGEND    "Légende : {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legend: + added, X completed, - deleted"
-#define STRING_CMD_GHISTORY_USAGE_M  "Shows a graphical report of task history, by month"
-#define STRING_CMD_GHISTORY_USAGE_A  "Montre un rapport graphique de l'histoire des tâches, par an"
-#define STRING_CMD_GHISTORY_YEAR     "An"
-#define STRING_CMD_GHISTORY_MONTH    "Mois"
-#define STRING_CMD_GHISTORY_NUMBER   "Number Added/Completed/Deleted"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index fa225a28a..688bdc03a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -139,30 +139,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tag"
 #define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_HISTORY_USAGE_M   "Mostra un report dello storico dei task, per mese"
-#define STRING_CMD_HISTORY_YEAR      "Anno"
-#define STRING_CMD_HISTORY_MONTH     "Mese"
-#define STRING_CMD_HISTORY_ADDED     "Aggiunto"
-#define STRING_CMD_HISTORY_COMP      "Completato"
-#define STRING_CMD_HISTORY_DEL       "Cancellato"
-#define STRING_CMD_HISTORY_NET       "Bilancio"
-#define STRING_CMD_HISTORY_USAGE_A   "Mostra un report dello storico dei task, per anno"
-#define STRING_CMD_HISTORY_AVERAGE   "Media"
-#define STRING_CMD_HISTORY_LEGEND    "Legenda: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legenda: + aggiunto, X completato, - cancellato"
-#define STRING_CMD_GHISTORY_USAGE_M  "Mostra un report grafico dello storico dei task, per mese"
-#define STRING_CMD_GHISTORY_USAGE_A  "Mostra un report grafico dello storico dei task, per anno"
-#define STRING_CMD_GHISTORY_YEAR     "Anno"
-#define STRING_CMD_GHISTORY_MONTH    "Mese"
-#define STRING_CMD_GHISTORY_NUMBER   "Aggiunti/Completati/Cancellati"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f4528528f..51dab4944 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -140,30 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
 #define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
 #define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_HISTORY_USAGE_M   "Shows a report of task history, by month"
-#define STRING_CMD_HISTORY_YEAR      "Year"
-#define STRING_CMD_HISTORY_MONTH     "Month"
-#define STRING_CMD_HISTORY_ADDED     "Added"
-#define STRING_CMD_HISTORY_COMP      "Completed"
-#define STRING_CMD_HISTORY_DEL       "Deleted"
-#define STRING_CMD_HISTORY_NET       "Net"
-#define STRING_CMD_HISTORY_USAGE_A   "Shows a report of task history, by year"
-#define STRING_CMD_HISTORY_AVERAGE   "Average"
-#define STRING_CMD_HISTORY_LEGEND    "Legend: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legend: + Added, X Completed, - Deleted"
-#define STRING_CMD_GHISTORY_USAGE_M  "Shows a graphical report of task history, by month"
-#define STRING_CMD_GHISTORY_USAGE_A  "Shows a graphical report of task history, by year"
-#define STRING_CMD_GHISTORY_YEAR     "Year"
-#define STRING_CMD_GHISTORY_MONTH    "Month"
-#define STRING_CMD_GHISTORY_NUMBER   "追加/完了/削除されたタスク数"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5912c7fe1..e7dceae57 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -140,30 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tagów"
 #define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_HISTORY_USAGE_M   "Pokazuje raport historii zadań w ujęciu miesięcznym"
-#define STRING_CMD_HISTORY_YEAR      "Rok"
-#define STRING_CMD_HISTORY_MONTH     "Miesiąc"
-#define STRING_CMD_HISTORY_ADDED     "Dodane"
-#define STRING_CMD_HISTORY_COMP      "Ukończone"
-#define STRING_CMD_HISTORY_DEL       "Usunięte"
-#define STRING_CMD_HISTORY_NET       "Net"
-#define STRING_CMD_HISTORY_USAGE_A   "Pokazuje raport historii zadań w ujęciu rocznym"
-#define STRING_CMD_HISTORY_AVERAGE   "Średnia"
-#define STRING_CMD_HISTORY_LEGEND    "Legenda: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legenda: + dodane, X ukończone, - usunięte"
-#define STRING_CMD_GHISTORY_USAGE_M  "Pokazuje graficzny raport z historii zadań, w miesięcznych podsumowaniach"
-#define STRING_CMD_GHISTORY_USAGE_A  "Pokazuje graficzny raport z historii zadań, w rocznych podsumowaniach"
-#define STRING_CMD_GHISTORY_YEAR     "Rok"
-#define STRING_CMD_GHISTORY_MONTH    "Miesiąc"
-#define STRING_CMD_GHISTORY_NUMBER   "Liczba Dodanych/Ukończonych/Usuniętych"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f69186b44..f3d630d57 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -140,30 +140,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
-#define STRING_CMD_HISTORY_USAGE_D   "Shows a report of task history, by day"
-#define STRING_CMD_HISTORY_USAGE_W   "Shows a report of task history, by week"
-#define STRING_CMD_HISTORY_DAY       "Day"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_USAGE_D  "Shows a graphical report of task history, by day"
-#define STRING_CMD_GHISTORY_USAGE_W  "Shows a graphical report of task history, by week"
-#define STRING_CMD_GHISTORY_DAY      "Day"
-#define STRING_CMD_HISTORY_USAGE_M   "Exibe um relatório mensal do histórico de tarefas"
-#define STRING_CMD_HISTORY_YEAR      "Ano"
-#define STRING_CMD_HISTORY_MONTH     "Mês"
-#define STRING_CMD_HISTORY_ADDED     "Adicionada"
-#define STRING_CMD_HISTORY_COMP      "Concluída"
-#define STRING_CMD_HISTORY_DEL       "Eliminada"
-#define STRING_CMD_HISTORY_NET       "Saldo"
-#define STRING_CMD_HISTORY_USAGE_A   "Exibe um relatório anual do histórico de tarefas"
-#define STRING_CMD_HISTORY_AVERAGE   "Média"
-#define STRING_CMD_HISTORY_LEGEND    "Legenda: {1}, {2}, {3}"
-#define STRING_CMD_HISTORY_LEGEND_A  "Legenda: + adicionada, X concluída, - eliminada"
-#define STRING_CMD_GHISTORY_USAGE_M  "Exibe um relatório gráfico mensal do histórico de tarefas"
-#define STRING_CMD_GHISTORY_USAGE_A  "Exibe um relatório gráfico anual do histórico de tarefas"
-#define STRING_CMD_GHISTORY_YEAR     "Ano"
-#define STRING_CMD_GHISTORY_MONTH    "Mês"
-#define STRING_CMD_GHISTORY_NUMBER   "Número de Adicionadas/Concluídas/Eliminadas"
 #define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
 #define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
 #define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."

From c2fad1fa90024edd086dac5403ad20afe373b01d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:36:51 -0500
Subject: [PATCH 663/879] L10N: Eliminated check_translations.sh


From c5f24f64819a064e8f5e1d141bf13154b223344b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:43:57 -0500
Subject: [PATCH 664/879] l10n: Eliminated STRING_CMD_LOG_*

---
 src/commands/CmdLog.cpp | 10 ++++------
 src/l10n/deu-DEU.h      |  7 -------
 src/l10n/eng-USA.h      |  4 ----
 src/l10n/epo-RUS.h      |  7 -------
 src/l10n/esp-ESP.h      |  5 -----
 src/l10n/fra-FRA.h      |  7 -------
 src/l10n/ita-ITA.h      |  7 -------
 src/l10n/jpn-JPN.h      |  7 -------
 src/l10n/pol-POL.h      |  7 -------
 src/l10n/por-PRT.h      |  7 -------
 10 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 2a20f7fef..eee0cd042 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -28,8 +28,6 @@
 #include <CmdLog.h>
 #include <Context.h>
 #include <format.h>
-#include <i18n.h>
-#include <util.h>
 #include <main.h>
 
 extern Context context;
@@ -39,7 +37,7 @@ CmdLog::CmdLog ()
 {
   _keyword               = "log";
   _usage                 = "task          log <mods>";
-  _description           = STRING_CMD_LOG_USAGE;
+  _description           = "Adds a new task that is already completed";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -60,11 +58,11 @@ int CmdLog::execute (std::string& output)
 
   // Cannot log recurring tasks.
   if (task.has ("recur"))
-    throw std::string (STRING_CMD_LOG_NO_RECUR);
+    throw std::string ("You cannot log recurring tasks.");
 
   // Cannot log waiting tasks.
   if (task.has ("wait"))
-    throw std::string (STRING_CMD_LOG_NO_WAITING);
+    throw std::string ("You cannot log waiting tasks.");
 
   context.tdb2.add (task);
 
@@ -72,7 +70,7 @@ int CmdLog::execute (std::string& output)
     context.footnote (onProjectChange (task));
 
   if (context.verbose ("new-uuid"))
-    output = format (STRING_CMD_LOG_LOGGED, task.get ("uuid")) + '\n';
+    output = format ("Logged task {1}.\n", task.get ("uuid"));
 
   return 0;
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index be83db1b5..1097b4375 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Fügt eine neue Aufgabe hinzu"
 #define STRING_CMD_ADD_FEEDBACK      "Aufgabe {1} hinzugefügt."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Protokolliert eine Aufgabe"
-#define STRING_CMD_LOG_NO_RECUR      "Wiederholende Aufgaben können nicht protokolliert werden."
-#define STRING_CMD_LOG_NO_WAITING    "Aufgeschobene Aufgaben können nicht protokolliert werden."
-
-//#define STRING_CMD_LOG_LOGGED        "Aufgabe protokolliert."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 9ded01f26..d74458033 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -108,10 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Adds a new task"
 #define STRING_CMD_ADD_FEEDBACK      "Created task {1}."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Adds a new task that is already completed"
-#define STRING_CMD_LOG_NO_RECUR      "You cannot log recurring tasks."
-#define STRING_CMD_LOG_NO_WAITING    "You cannot log waiting tasks."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 97cd8ecf0..33d553eb2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Kreas novan taskon"
 #define STRING_CMD_ADD_FEEDBACK      "Kreis taskon {1}."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Kreas novan jamfinitan taskon"
-#define STRING_CMD_LOG_NO_RECUR      "Oni ne povas fari taskojn reokazantajn kun 'log'."
-#define STRING_CMD_LOG_NO_WAITING    "Oni ne povas fari taskojn atendantajn kun 'log'."
-
-//#define STRING_CMD_LOG_LOGGED        "Registris taskon."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index f026f8a12..1b19b0481 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -108,11 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Añade una nueva tarea"
 #define STRING_CMD_ADD_FEEDBACK      "Creada tarea {1}."
 #define STRING_CMD_ADD_RECUR         "Creada tarea {1} (modelo de recurrencia)."
-#define STRING_CMD_LOG_USAGE         "Añade una nueva tarea que ya ha sido completada"
-#define STRING_CMD_LOG_NO_RECUR      "No puede registrar tareas recurrentes."
-#define STRING_CMD_LOG_NO_WAITING    "No puede registrar tareas en espera."
-#define STRING_CMD_LOG_LOGGED        "Tarea {1} registrada."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 80a069dcd..b4821490c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Ajoute une nouvelle tâche"
 #define STRING_CMD_ADD_FEEDBACK      "Tâche {1} crée."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Adds a new task that is already completed"
-#define STRING_CMD_LOG_NO_RECUR      "Vous ne pouvez pas journaliser une tâche récurrente."
-#define STRING_CMD_LOG_NO_WAITING    "Vous ne pouvez pas journaliser une tâche en attente."
-
-//#define STRING_CMD_LOG_LOGGED        "Tâche journalisée."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 688bdc03a..e90573cbf 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -107,13 +107,6 @@
 #define STRING_CMD_ADD_USAGE         "Aggiunge un nuovo task"
 #define STRING_CMD_ADD_FEEDBACK      "Task {1} creato."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Aggiunge un nuovo task già completato"
-#define STRING_CMD_LOG_NO_RECUR      "Task periodici non possono essere registrati."
-#define STRING_CMD_LOG_NO_WAITING    "Task in attesa non possono essere registrati."
-
-//#define STRING_CMD_LOG_LOGGED        "Task registrato."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 51dab4944..36c512d7a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "新しいタスクの追加"
 #define STRING_CMD_ADD_FEEDBACK      "タスク {1} が生成されました。"
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Adds a new task that is already completed"
-#define STRING_CMD_LOG_NO_RECUR      "You cannot log recurring tasks."
-#define STRING_CMD_LOG_NO_WAITING    "保留のタスクはログできません。"
-
-//#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e7dceae57..0fca4c15d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Dodaje nowe zadanie"
 #define STRING_CMD_ADD_FEEDBACK      "Utworzono zadanie {1}."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Dodaje nowe, ukończone zadanie"
-#define STRING_CMD_LOG_NO_RECUR      "Nie możesz logować zadania cyklicznego."
-#define STRING_CMD_LOG_NO_WAITING    "Nie możesz logować zadania czekającego."
-
-//#define STRING_CMD_LOG_LOGGED        "Zadanie w logu."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f3d630d57..a58806f4c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -108,13 +108,6 @@
 #define STRING_CMD_ADD_USAGE         "Adiciona uma nova tarefa"
 #define STRING_CMD_ADD_FEEDBACK      "Criada a tarefa {1}."
 #define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_LOG_USAGE         "Adiciona uma nova tarefa que já está concluída"
-#define STRING_CMD_LOG_NO_RECUR      "Não pode usar o comando 'log' para tarefas recorrentes."
-#define STRING_CMD_LOG_NO_WAITING    "Não pode usar o comando 'log' para tarefas adiadas."
-
-//#define STRING_CMD_LOG_LOGGED        "Tarefa registada."
-#define STRING_CMD_LOG_LOGGED        "Logged task {1}."
-
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"

From fb62263871d715923a67097ec3d2b0315fc429f6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:47:59 -0500
Subject: [PATCH 665/879] Code cleanup: Removed unnecessary include

---
 src/commands/CmdUnique.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 41366892e..c596b2d6b 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -28,10 +28,8 @@
 #include <CmdUnique.h>
 #include <string>
 #include <set>
-#include <algorithm>
 #include <Context.h>
 #include <Filter.h>
-#include <main.h>
 #include <format.h>
 #include <i18n.h>
 

From 20b9ead82a116270c8812abc9ab5fc1e2d19b05b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:48:16 -0500
Subject: [PATCH 666/879] l10n: Eliminated STRING_CMD_UNIQUE_*

---
 src/commands/CmdUnique.cpp | 7 +++----
 src/l10n/deu-DEU.h         | 4 ----
 src/l10n/eng-USA.h         | 4 ----
 src/l10n/epo-RUS.h         | 4 ----
 src/l10n/esp-ESP.h         | 4 ----
 src/l10n/fra-FRA.h         | 4 ----
 src/l10n/ita-ITA.h         | 4 ----
 src/l10n/jpn-JPN.h         | 4 ----
 src/l10n/pol-POL.h         | 4 ----
 src/l10n/por-PRT.h         | 4 ----
 10 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index c596b2d6b..b1399db09 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -31,7 +31,6 @@
 #include <Context.h>
 #include <Filter.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -40,7 +39,7 @@ CmdUnique::CmdUnique ()
 {
   _keyword               = "_unique";
   _usage                 = "task <filter> _unique <attribute>";
-  _description           = STRING_CMD_UNIQUE_USAGE;
+  _description           = "Generates lists of unique attribute values";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
@@ -66,12 +65,12 @@ int CmdUnique::execute (std::string& output)
   // Just the first arg.
   auto words = context.cli2.getWords ();
   if (words.size () == 0)
-    throw std::string (STRING_CMD_UNIQUE_MISSING);
+    throw std::string ("An attribute must be specified.  See 'task _columns'.");
   attribute = words[0];
 
   std::string canonical;
   if (! context.cli2.canonicalize (canonical, "attribute", attribute))
-    throw std::string (STRING_CMD_UNIQUE_VALID);
+    throw std::string ("You must specify an attribute or UDA.");
 
   // Find the unique set of matching tasks.
   std::set <std::string> values;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1097b4375..e0a752eea 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
 #define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
 #define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
 #define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index d74458033..a5594e61e 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tags"
 #define STRING_CMD_TAGS_NO_TAGS      "No tags."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 33d553eb2..38731488d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 etikedo"
 #define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
 #define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
 #define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
 #define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1b19b0481..35dcedef8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -135,10 +135,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
-#define STRING_CMD_UNIQUE_USAGE      "Genera listas de valores de atributo únicos"
-#define STRING_CMD_UNIQUE_MISSING    "Se debe especificar un atributo. Ver 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "Debe especificar un atributo o un UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
 #define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index b4821490c..5aa620615 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 étiquette"
 #define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
 #define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
 #define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 #define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index e90573cbf..7f105e27b 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -132,10 +132,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tag"
 #define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
 #define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 36c512d7a..eea5f79c5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
 #define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
 #define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
 #define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
 #define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0fca4c15d..0f749e2ab 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
 #define STRING_CMD_TAGS_PLURAL       "{1} tagów"
 #define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
 #define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a58806f4c..d40ec1de1 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -133,10 +133,6 @@
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
-#define STRING_CMD_UNIQUE_USAGE      "Generates lists of unique attribute values"
-#define STRING_CMD_UNIQUE_MISSING    "An attribute must be specified.  See 'task _columns'."
-#define STRING_CMD_UNIQUE_VALID      "You must specify an attribute or UDA."
-
 #define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
 #define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
 #define STRING_CMD_IMPORT_FILE       "A importar '{1}'"

From 881c38e3011a65089444cc15fce219bdfb77e62a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 11:54:11 -0500
Subject: [PATCH 667/879] L10N: Normalized files

---
 src/l10n/deu-DEU.h | 280 +++++++++++++++++++++---------------------
 src/l10n/eng-USA.h | 278 +++++++++++++++++++++---------------------
 src/l10n/epo-RUS.h | 278 +++++++++++++++++++++---------------------
 src/l10n/esp-ESP.h | 281 +++++++++++++++++++++---------------------
 src/l10n/fra-FRA.h | 298 +++++++++++++++++++++------------------------
 src/l10n/ita-ITA.h | 277 ++++++++++++++++++++---------------------
 src/l10n/jpn-JPN.h | 278 +++++++++++++++++++++---------------------
 src/l10n/pol-POL.h | 278 +++++++++++++++++++++---------------------
 src/l10n/por-PRT.h | 278 +++++++++++++++++++++---------------------
 9 files changed, 1252 insertions(+), 1274 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e0a752eea..4cbcbbdd9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,42 +27,123 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Aufgabe {1} hinzugefügt."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Fügt eine neue Aufgabe hinzu"
+#define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
+#define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
+#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
+#define STRING_CMD_CAL_LABEL_DATE    "Datum"
+#define STRING_CMD_CAL_LABEL_HOL     "Feiertag"
+#define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
+#define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
+#define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} Aufgaben"
+#define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
+#define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
+#define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
+#define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
+#define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
+#define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
+#define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
+#define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "Datei '{1}' nicht gefunden."
+#define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
+#define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "Aufgabe blockiert durch"
+#define STRING_CMD_INFO_BLOCKING     "Aufgabe blockiert"
+#define STRING_CMD_INFO_MODIFICATION "Änderung"
+#define STRING_CMD_INFO_MODIFIED     "Letzte Änderung"
+#define STRING_CMD_INFO_UNTIL        "Bis"
+#define STRING_CMD_INFO_USAGE        "Zeigt alle Daten und Metadaten"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Beschreibung"
+#define STRING_CMD_REPORTS_REPORT    "Report"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} Reports"
+#define STRING_CMD_REPORTS_USAGE     "Zeigt alle unterstützten Reports"
+#define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
+#define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
+#define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
+#define STRING_CMD_TAGS_USAGE        "Listet alle genutzten Schlagworte"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
+#define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
+#define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
+#define STRING_CMD_URGENCY_RESULT    "Aufgabe {1}, Dringlichkeit {2}"
+#define STRING_CMD_URGENCY_USAGE     "Zeigt die Dringlichkeit einer Aufgabe an"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
+#define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Erzeugt eine Liste aller Befehle zur ZSH-Auto-Verfollständigung"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Wenn Dein Haar nicht geschnitten wird"
+#define STRING_COLUMN_EXAMPLES_DESC  "Bekleidung einen Haken tiefer hängen"
+#define STRING_COLUMN_EXAMPLES_IND   "  Haus.Garten"
+#define STRING_COLUMN_EXAMPLES_PAR   "Haus"
+#define STRING_COLUMN_EXAMPLES_PROJ  "Haus.Garten"
+#define STRING_COLUMN_EXAMPLES_TAGS  "Haus @Hausarbeit next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
+#define STRING_COLUMN_LABEL_AGE      "Alter"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Spalten"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Erledigt"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Anzahl"
+#define STRING_COLUMN_LABEL_DATE     "Datum"
+#define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_DESC     "Beschreibung"
 #define STRING_COLUMN_LABEL_DUE      "Fällig"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
-#define STRING_COLUMN_LABEL_COUNT    "Anzahl"
-#define STRING_COLUMN_LABEL_COMPLETE "Erledigt"
+#define STRING_COLUMN_LABEL_EXAMPLES "Beispiele"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
-#define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
-#define STRING_COLUMN_LABEL_AGE      "Alter"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
-#define STRING_COLUMN_LABEL_UNTIL    "Bis"
-#define STRING_COLUMN_LABEL_WAIT     "Aufgeschoben"
-#define STRING_COLUMN_LABEL_WAITING  "Aufgeschoben bis"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_RECUR_L  "Wiederholung"
-#define STRING_COLUMN_LABEL_START    "Beginn"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Geplant"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_STARTED  "Begonnen"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Offen"
-#define STRING_COLUMN_LABEL_STAT_CO  "Erledigt"
-#define STRING_COLUMN_LABEL_STAT_DE  "Gelöscht"
-#define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
-#define STRING_COLUMN_LABEL_STAT_RE  "Wiederholend"
-#define STRING_COLUMN_LABEL_STAT_P   "O"
+#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
+#define STRING_COLUMN_LABEL_STAT_CO  "Erledigt"
 #define STRING_COLUMN_LABEL_STAT_D   "G"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_DE  "Gelöscht"
+#define STRING_COLUMN_LABEL_STAT_P   "O"
+#define STRING_COLUMN_LABEL_STAT_PE  "Offen"
 #define STRING_COLUMN_LABEL_STAT_R   "W"
-#define STRING_COLUMN_LABEL_TAGS     "Schlagworte"
+#define STRING_COLUMN_LABEL_STAT_RE  "Wiederholend"
+#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
+#define STRING_COLUMN_LABEL_STYLES   "Unterstützte Formate"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Schlagworte"
+#define STRING_COLUMN_LABEL_TYPE     "Typ"
+#define STRING_COLUMN_LABEL_UDA      "Name"
+#define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
+#define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
-#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wert"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_COLUMN   "Spalten"
@@ -76,137 +157,56 @@
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_VALUES   "Erlaubte Werte"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
-#define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "Haus @Hausarbeit next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "Haus.Garten"
-#define STRING_COLUMN_EXAMPLES_PAR   "Haus"
-#define STRING_COLUMN_EXAMPLES_IND   "  Haus.Garten"
-#define STRING_COLUMN_EXAMPLES_DESC  "Bekleidung einen Haken tiefer hängen"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Wenn Dein Haar nicht geschnitten wird"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
-#define STRING_CMD_URGENCY_USAGE     "Zeigt die Dringlichkeit einer Aufgabe an"
-#define STRING_CMD_URGENCY_RESULT    "Aufgabe {1}, Dringlichkeit {2}"
-#define STRING_CMD_ADD_USAGE         "Fügt eine neue Aufgabe hinzu"
-#define STRING_CMD_ADD_FEEDBACK      "Aufgabe {1} hinzugefügt."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
-#define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
-#define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_INFO_USAGE        "Zeigt alle Daten und Metadaten"
-#define STRING_CMD_INFO_BLOCKED      "Aufgabe blockiert durch"
-#define STRING_CMD_INFO_BLOCKING     "Aufgabe blockiert"
-#define STRING_CMD_INFO_UNTIL        "Bis"
-#define STRING_CMD_INFO_MODIFICATION "Änderung"
-#define STRING_CMD_INFO_MODIFIED     "Letzte Änderung"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
-#define STRING_CMD_REPORTS_USAGE     "Zeigt alle unterstützten Reports"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_DESC      "Beschreibung"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} Reports"
-#define STRING_CMD_TAGS_USAGE        "Listet alle genutzten Schlagworte"
-#define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
-#define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
-#define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
-#define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
-#define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
-#define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
-#define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "Datei '{1}' nicht gefunden."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Kommentar fehlt Beschreibung: {1}"
-#define STRING_TASK_NO_ENTRY         "Kommentar fehlt Erfassungsdatum: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Erzeugt eine Liste aller Befehle zur ZSH-Auto-Verfollständigung"
-#define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
-#define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
-#define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} Aufgaben"
-#define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
-#define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
-#define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
-#define STRING_CMD_CAL_LABEL_DATE    "Datum"
-#define STRING_CMD_CAL_LABEL_HOL     "Feiertag"
-#define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
-#define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
-#define STRING_FEEDBACK_DELETED      "{1} wird gelöscht."
-#define STRING_FEEDBACK_DEP_SET      "Abhängigkeit wird auf '{1}' gesetzt."
-#define STRING_FEEDBACK_DEP_MOD      "Abhängigkeit wird von '{1}' zu '{2}' geändert."
-#define STRING_FEEDBACK_DEP_DEL      "Abhängigkeit '{1}' wird gelöscht."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Abhängigkeit wurde auf '{1}' gesetzt."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies wurde von '{1}' zu '{2}' geändert."
-#define STRING_FEEDBACK_ATT_SET      "{1} wird auf '{2}' gesetzt."
-#define STRING_FEEDBACK_ATT_MOD      "{1} wird von '{2}' zu '{3}' geändert."
-#define STRING_FEEDBACK_ATT_DEL      "{1} wird gelöscht."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} wird gelöscht (Dauer: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} wurde auf '{2}' gesetzt."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} wurde von '{2}' zu '{3}' geändert."
+#define STRING_COLUMN_LABEL_WAIT     "Aufgeschoben"
+#define STRING_COLUMN_LABEL_WAITING  "Aufgeschoben bis"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
+#define STRING_FEEDBACK_ATT_DEL      "{1} wird gelöscht."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} wird gelöscht (Dauer: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} wird von '{2}' zu '{3}' geändert."
+#define STRING_FEEDBACK_ATT_SET      "{1} wird auf '{2}' gesetzt."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} wurde von '{2}' zu '{3}' geändert."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} wurde auf '{2}' gesetzt."
+#define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
+#define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
+#define STRING_FEEDBACK_DELETED      "{1} wird gelöscht."
+#define STRING_FEEDBACK_DEP_DEL      "Abhängigkeit '{1}' wird gelöscht."
+#define STRING_FEEDBACK_DEP_MOD      "Abhängigkeit wird von '{1}' zu '{2}' geändert."
+#define STRING_FEEDBACK_DEP_SET      "Abhängigkeit wird auf '{1}' gesetzt."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies wurde von '{1}' zu '{2}' geändert."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Abhängigkeit wurde auf '{1}' gesetzt."
+#define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
 #define STRING_FEEDBACK_NOP          "Keine Änderungen werden durchgeführt."
-#define STRING_FEEDBACK_WAS_NOP      "Keine Änderungen wurden durchgeführt."
+#define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
+#define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
+#define STRING_FEEDBACK_TAG_NEXT     "Das besondere Schlagwort 'next' erhöht die Dringlichkeit dieser Aufgabe, sodass sie im 'next'-Report erscheint."
+#define STRING_FEEDBACK_TAG_NOCAL    "Das besondere Schlagwort 'nocal' verhindert, dass diese Aufgabe im 'calendar'-Report erscheint."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "Das besondere Schlagwort 'nocolor' deaktiviert Farb-Regeln für diese Aufgabe."
 #define STRING_FEEDBACK_TAG_NONAG    "Das besondere Schlagwort 'nonag' verhindert Nachfragen, wenn diese Aufgabe geändert wird."
-#define STRING_FEEDBACK_TAG_NOCAL    "Das besondere Schlagwort 'nocal' verhindert, dass diese Aufgabe im 'calendar'-Report erscheint."
-#define STRING_FEEDBACK_TAG_NEXT     "Das besondere Schlagwort 'next' erhöht die Dringlichkeit dieser Aufgabe, sodass sie im 'next'-Report erscheint."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
 #define STRING_FEEDBACK_UNBLOCKED    "Aufgabe {1} '{2}' entsperrt."
-#define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
-#define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
-#define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "Keine Änderungen wurden durchgeführt."
+#define STRING_TASK_DEPEND_CIRCULAR  "Verbotene zyklische Abhängigkeit erkannt."
+#define STRING_TASK_DEPEND_DUP       "Aufgabe {1} hängt bereits von Aufgabe {2} ab."
+#define STRING_TASK_DEPEND_ITSELF    "Eine Aufgabe kann nicht von sich selbst abhängen."
+#define STRING_TASK_DEPEND_MISS_CREA "Konnte keine Abhängigkeit von Aufgabe {1} erstellen - Aufgabe nicht gefunden."
+#define STRING_TASK_DEPEND_MISS_DEL  "Konnte keine Abhängigkeit zu Aufgabe {1} löschen - nicht gefunden."
+#define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
+#define STRING_TASK_NO_DESC          "Kommentar fehlt Beschreibung: {1}"
+#define STRING_TASK_NO_ENTRY         "Kommentar fehlt Erfassungsdatum: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior unterstützt Datei-Format 1 nicht mehr, welches ursprünglich zwischen dem 27. November 2006 und 31. Dezember 2007 eingesetzt wurde."
 #define STRING_TASK_NO_FF2           "Taskwarrior unterstützt Datei-Format 2 nicht mehr, welches ursprünglich zwischen dem 1. Januar 2008 und 12. April 2009 eingesetzt wurde."
 #define STRING_TASK_NO_FF3           "Taskwarrior unterstützt Datei-Format 3 nicht mehr, welches ursprünglich zwischen dem 23. März 2009 und 16. Mai 2009 eingesetzt wurde."
 #define STRING_TASK_PARSE_UNREC_FF   "Nicht erkanntes taskwarrior-Dateiformat."
-#define STRING_TASK_DEPEND_ITSELF    "Eine Aufgabe kann nicht von sich selbst abhängen."
-#define STRING_TASK_DEPEND_MISS_CREA "Konnte keine Abhängigkeit von Aufgabe {1} erstellen - Aufgabe nicht gefunden."
-#define STRING_TASK_DEPEND_MISS_DEL  "Konnte keine Abhängigkeit zu Aufgabe {1} löschen - nicht gefunden."
-#define STRING_TASK_DEPEND_DUP       "Aufgabe {1} hängt bereits von Aufgabe {2} ab."
-#define STRING_TASK_DEPEND_CIRCULAR  "Verbotene zyklische Abhängigkeit erkannt."
-#define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
-#define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
-#define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
-#define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
+#define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
+#define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
+tdefine STRING_COLUMN_LABEL_START    "Beginn"
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a5594e61e..aaef8c256 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Created task {1}."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Adds a new task"
+#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
+#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
+#define STRING_CMD_CAL_LABEL_DATE    "Date"
+#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
+#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
+#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
+#define STRING_CMD_CUSTOM_COUNT      "1 task"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
+#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
+#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
+#define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
+#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
+#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
+#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
+#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
+#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
+#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
+#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
+#define STRING_CMD_INFO_MODIFICATION "Modification"
+#define STRING_CMD_INFO_MODIFIED     "Last modified"
+#define STRING_CMD_INFO_UNTIL        "Until"
+#define STRING_CMD_INFO_USAGE        "Shows all data and metadata"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Description"
+#define STRING_CMD_REPORTS_REPORT    "Report"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
+#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
+#define STRING_CMD_TAGS_NO_TAGS      "No tags."
+#define STRING_CMD_TAGS_PLURAL       "{1} tags"
+#define STRING_CMD_TAGS_SINGLE       "1 tag"
+#define STRING_CMD_TAGS_USAGE        "Shows a list of all tags used"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
+#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
+#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
+#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
+#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
+#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
+#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
+#define STRING_COLUMN_EXAMPLES_PAR   "home"
+#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
+#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Added"
+#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Columns"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Completed"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Count"
+#define STRING_COLUMN_LABEL_DATE     "Date"
+#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
-#define STRING_COLUMN_LABEL_COUNT    "Count"
-#define STRING_COLUMN_LABEL_COMPLETE "Completed"
+#define STRING_COLUMN_LABEL_EXAMPLES "Example"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Label"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ADDED    "Added"
-#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_WAIT     "Wait"
-#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STARTED  "Started"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
-#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
-#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
+#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
+#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
 #define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
+#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
+#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_TYPE     "Type"
+#define STRING_COLUMN_LABEL_UDA      "Name"
+#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
+#define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
-#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
@@ -76,137 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
-#define STRING_COLUMN_EXAMPLES_PAR   "home"
-#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
-#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_ADD_USAGE         "Adds a new task"
-#define STRING_CMD_ADD_FEEDBACK      "Created task {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
-#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
-#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_INFO_USAGE        "Shows all data and metadata"
-#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
-#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
-#define STRING_CMD_INFO_UNTIL        "Until"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Last modified"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
-#define STRING_CMD_TAGS_USAGE        "Shows a list of all tags used"
-#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_PLURAL       "{1} tags"
-#define STRING_CMD_TAGS_NO_TAGS      "No tags."
-#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
-#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
-#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
-#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_NO_MATCH     "No matches."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Wait"
+#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
+#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
+#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
 #define STRING_FEEDBACK_NOP          "No changes will be made."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_FEEDBACK_NO_MATCH     "No matches."
+#define STRING_FEEDBACK_NO_TASKS     "No tasks."
+#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
+#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
 #define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
+#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
+#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
+#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
+#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
+#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
+#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
+#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 38731488d..7ccabfef6 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Kreis taskon {1}."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Kreas novan taskon"
+#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
+#define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
+#define STRING_CMD_CAL_LABEL_DATE    "Dato"
+#define STRING_CMD_CAL_LABEL_HOL     "Ferio"
+#define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
+#define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
+#define STRING_CMD_CUSTOM_COUNT      "1 tasko"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} taskoj"
+#define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
+#define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
+#define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
+#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
+#define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
+#define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
+#define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
+#define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
+#define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "Tiu tasko blokata per"
+#define STRING_CMD_INFO_BLOCKING     "Tiu tasko blokas"
+#define STRING_CMD_INFO_MODIFICATION "Modifado"
+#define STRING_CMD_INFO_MODIFIED     "Modifado lasta"
+#define STRING_CMD_INFO_UNTIL        "Ĝis"
+#define STRING_CMD_INFO_USAGE        "Montras datumojn kaj metadatumojn"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Priskribo"
+#define STRING_CMD_REPORTS_REPORT    "Raporto"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} raportoj"
+#define STRING_CMD_REPORTS_USAGE     "Listigas ĉian raporton subtenatan"
+#define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
+#define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
+#define STRING_CMD_TAGS_SINGLE       "1 etikedo"
+#define STRING_CMD_TAGS_USAGE        "Montras listo de ĉia uzata etikedo"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
+#define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
+#define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
+#define STRING_CMD_URGENCY_RESULT    "tasko {1} urĝeco {2}"
+#define STRING_CMD_URGENCY_USAGE     "Montras la urĝec-mezuro de tasko"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Se vi ne faŝonas al si la hararon"
+#define STRING_COLUMN_EXAMPLES_DESC  "Transloki vian robon suben al la fundan kejlon"
+#define STRING_COLUMN_EXAMPLES_IND   "  domo.ĝardeno"
+#define STRING_COLUMN_EXAMPLES_PAR   "domo"
+#define STRING_COLUMN_EXAMPLES_PROJ  "domo.ĝardeno"
+#define STRING_COLUMN_EXAMPLES_TAGS  "domo @aĉo next"
+#define STRING_COLUMN_LABEL_ACTIVE   "Ak"
+#define STRING_COLUMN_LABEL_ADDED    "Kreita"
+#define STRING_COLUMN_LABEL_AGE      "Aĝo"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Finita"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Nombro"
+#define STRING_COLUMN_LABEL_DATE     "Dato"
+#define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_DESC     "Priskribo"
 #define STRING_COLUMN_LABEL_DUE      "Datlimo"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
-#define STRING_COLUMN_LABEL_COUNT    "Nombro"
-#define STRING_COLUMN_LABEL_COMPLETE "Finita"
+#define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Rubriko"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modifo"
-#define STRING_COLUMN_LABEL_ADDED    "Kreita"
-#define STRING_COLUMN_LABEL_AGE      "Aĝo"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Nomo"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "Orfa UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekto"
-#define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
-#define STRING_COLUMN_LABEL_WAIT     "Atendu"
-#define STRING_COLUMN_LABEL_WAITING  "Atendu ĝis"
 #define STRING_COLUMN_LABEL_RECUR    "Reokazas"
 #define STRING_COLUMN_LABEL_RECUR_L  "Reokazas ĉiu"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Fiksa"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Eko"
 #define STRING_COLUMN_LABEL_STARTED  "Ekita"
-#define STRING_COLUMN_LABEL_ACTIVE   "Ak"
-#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendanta"
-#define STRING_COLUMN_LABEL_STAT_CO  "Finita"
-#define STRING_COLUMN_LABEL_STAT_DE  "Viŝita"
-#define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
-#define STRING_COLUMN_LABEL_STAT_RE  "Reokazanta"
-#define STRING_COLUMN_LABEL_STAT_P   "Pd"
+#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "Fn"
+#define STRING_COLUMN_LABEL_STAT_CO  "Finita"
 #define STRING_COLUMN_LABEL_STAT_D   "Vŝ"
-#define STRING_COLUMN_LABEL_STAT_W   "At"
+#define STRING_COLUMN_LABEL_STAT_DE  "Viŝita"
+#define STRING_COLUMN_LABEL_STAT_P   "Pd"
+#define STRING_COLUMN_LABEL_STAT_PE  "Pendanta"
 #define STRING_COLUMN_LABEL_STAT_R   "Re"
-#define STRING_COLUMN_LABEL_TAGS     "Etikedoj"
+#define STRING_COLUMN_LABEL_STAT_RE  "Reokazanta"
+#define STRING_COLUMN_LABEL_STAT_W   "At"
+#define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
+#define STRING_COLUMN_LABEL_STYLES   "Formaĝoj Subtenataj"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Etikedoj"
+#define STRING_COLUMN_LABEL_TYPE     "Tipo"
+#define STRING_COLUMN_LABEL_UDA      "Nomo"
+#define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
+#define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
-#define STRING_COLUMN_LABEL_NAME     "Nomo"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
@@ -76,137 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_VALUES   "Valoroj permesataj"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orfa UDA"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "domo @aĉo next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "domo.ĝardeno"
-#define STRING_COLUMN_EXAMPLES_PAR   "domo"
-#define STRING_COLUMN_EXAMPLES_IND   "  domo.ĝardeno"
-#define STRING_COLUMN_EXAMPLES_DESC  "Transloki vian robon suben al la fundan kejlon"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se vi ne faŝonas al si la hararon"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
-#define STRING_CMD_URGENCY_USAGE     "Montras la urĝec-mezuro de tasko"
-#define STRING_CMD_URGENCY_RESULT    "tasko {1} urĝeco {2}"
-#define STRING_CMD_ADD_USAGE         "Kreas novan taskon"
-#define STRING_CMD_ADD_FEEDBACK      "Kreis taskon {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
-#define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
-#define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
-#define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
-#define STRING_CMD_INFO_USAGE        "Montras datumojn kaj metadatumojn"
-#define STRING_CMD_INFO_BLOCKED      "Tiu tasko blokata per"
-#define STRING_CMD_INFO_BLOCKING     "Tiu tasko blokas"
-#define STRING_CMD_INFO_UNTIL        "Ĝis"
-#define STRING_CMD_INFO_MODIFICATION "Modifado"
-#define STRING_CMD_INFO_MODIFIED     "Modifado lasta"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
-#define STRING_CMD_REPORTS_USAGE     "Listigas ĉian raporton subtenatan"
-#define STRING_CMD_REPORTS_REPORT    "Raporto"
-#define STRING_CMD_REPORTS_DESC      "Priskribo"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} raportoj"
-#define STRING_CMD_TAGS_USAGE        "Montras listo de ĉia uzata etikedo"
-#define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
-#define STRING_CMD_TAGS_SINGLE       "1 etikedo"
-#define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
-#define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
-#define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
-#define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
-#define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Komento havas mankon de priskribo: {1}"
-#define STRING_TASK_NO_ENTRY         "Komento havas mankon de enskrib-dato: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
-#define STRING_CMD_CUSTOM_COUNT      "1 tasko"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} taskoj"
-#define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
-#define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
-#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
-#define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Dato"
-#define STRING_CMD_CAL_LABEL_HOL     "Ferio"
-#define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
-#define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
-#define STRING_FEEDBACK_DELETED      "Viŝos {1}."
-#define STRING_FEEDBACK_DEP_SET      "Dependoj iĝos '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Dependoj ŝanĝos el '{1}' al '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Viŝis dependojn '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependoj iĝis '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependoj ŝanĝis el '{1}' al '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} iĝos '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} ŝanĝos el '{2}' al '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "Viŝis {1}."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "Viŝis {1} (duration: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} iĝis '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} ŝanĝis el '{2}' al '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Atendu"
+#define STRING_COLUMN_LABEL_WAITING  "Atendu ĝis"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "Viŝis {1}."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "Viŝis {1} (duration: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} ŝanĝos el '{2}' al '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} iĝos '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} ŝanĝis el '{2}' al '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} iĝis '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
+#define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
+#define STRING_FEEDBACK_DELETED      "Viŝos {1}."
+#define STRING_FEEDBACK_DEP_DEL      "Viŝis dependojn '{1}'."
+#define STRING_FEEDBACK_DEP_MOD      "Dependoj ŝanĝos el '{1}' al '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Dependoj iĝos '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependoj ŝanĝis el '{1}' al '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dependoj iĝis '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
 #define STRING_FEEDBACK_NOP          "Ne ŝanĝos nenion."
-#define STRING_FEEDBACK_WAS_NOP      "Ne ŝanĝis nenion."
+#define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
+#define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
+#define STRING_FEEDBACK_TAG_NEXT     "Speciala etikedo 'next' pligrandigos la urĝecon de tiu tasko por ke ĝi aperus ĉe raporto 'next'."
+#define STRING_FEEDBACK_TAG_NOCAL    "Speciala etikedo 'nocal' ekskluzivos tiun taskon ĉe raporto 'calendar'."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "Speciala etikedo 'nocolor' malebligos kolorreguloj por tiu tasko."
 #define STRING_FEEDBACK_TAG_NONAG    "Speciala etikedo 'nonag' antaŭmalebligitos molestojn, kiam oni modifus tiun taskon."
-#define STRING_FEEDBACK_TAG_NOCAL    "Speciala etikedo 'nocal' ekskluzivos tiun taskon ĉe raporto 'calendar'."
-#define STRING_FEEDBACK_TAG_NEXT     "Speciala etikedo 'next' pligrandigos la urĝecon de tiu tasko por ke ĝi aperus ĉe raporto 'next'."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
 #define STRING_FEEDBACK_UNBLOCKED    "Malblokis {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
-#define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
-#define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "Ne ŝanĝis nenion."
+#define STRING_TASK_DEPEND_CIRCULAR  "Detektis kaj malpermesis ciklan dependecon."
+#define STRING_TASK_DEPEND_DUP       "Tasko {1} jam dependas de tasko {2}."
+#define STRING_TASK_DEPEND_ITSELF    "Tasko ne povas dependi de si mem."
+#define STRING_TASK_DEPEND_MISS_CREA "Ne povis krei dependecon de tasko {1} - netrovita."
+#define STRING_TASK_DEPEND_MISS_DEL  "Ne povis viŝi dependecon de tasko {1} - netrovita."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Komento havas mankon de priskribo: {1}"
+#define STRING_TASK_NO_ENTRY         "Komento havas mankon de enskrib-dato: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior ne pli subtenas dosier-aranĝon 1, kiu estis originale uzata inter la 27-a de novembro 2006 kaj la 31-a de decembro 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior ne pli subtenas dosier-aranĝon 2, kiu estis originale uzata inter la 1-a de januaro 2008 kaj la 12-a de aprilo 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Ne povis rekoni taskan dosier-aranĝon."
-#define STRING_TASK_DEPEND_ITSELF    "Tasko ne povas dependi de si mem."
-#define STRING_TASK_DEPEND_MISS_CREA "Ne povis krei dependecon de tasko {1} - netrovita."
-#define STRING_TASK_DEPEND_MISS_DEL  "Ne povis viŝi dependecon de tasko {1} - netrovita."
-#define STRING_TASK_DEPEND_DUP       "Tasko {1} jam dependas de tasko {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Detektis kaj malpermesis ciklan dependecon."
-#define STRING_TASK_VALID_BLANK      "Ne povas krei blankan taskon."
-#define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
-#define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
+#define STRING_TASK_VALID_BLANK      "Ne povas krei blankan taskon."
+#define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 35dcedef8..7a6db4f95 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,43 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Creada tarea {1}."
+#define STRING_CMD_ADD_RECUR         "Creada tarea {1} (modelo de recurrencia)."
+#define STRING_CMD_ADD_USAGE         "Añade una nueva tarea"
+#define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
+#define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
+#define STRING_CMD_CAL_LABEL_DATE    "Fecha"
+#define STRING_CMD_CAL_LABEL_HOL     "Festivo"
+#define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
+#define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
+#define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
+#define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
+#define STRING_CMD_CUSTOM_COUNT      "1 tarea"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} tareas"
+#define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
+#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
+#define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
+#define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
+#define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
+#define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
+#define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
+#define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "Archivo '{1}' no encontrado."
+#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
+#define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
+#define STRING_CMD_IMPORT_UUID_BAD   "UUID '{1}' no válido."
+#define STRING_CMD_INFO_BLOCKED      "Esta tarea está bloqueada por"
+#define STRING_CMD_INFO_BLOCKING     "Esta tarea bloquea"
+#define STRING_CMD_INFO_MODIFICATION "Modificación"
+#define STRING_CMD_INFO_MODIFIED     "Modificada por última vez"
+#define STRING_CMD_INFO_UNTIL        "Hasta"
+#define STRING_CMD_INFO_USAGE        "Muestra todos los datos y metadatos"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Marcas virtuales"
+#define STRING_CMD_REPORTS_DESC      "Descripción"
+#define STRING_CMD_REPORTS_REPORT    "Informe"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} informes"
+#define STRING_CMD_REPORTS_USAGE     "Lista todos los informes soportados"
+#define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
+#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
+#define STRING_CMD_TAGS_SINGLE       "1 marca"
+#define STRING_CMD_TAGS_USAGE        "Muestra una lista de todas las marcas en uso"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
+#define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
+#define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
+#define STRING_CMD_URGENCY_RESULT    "tarea {1} urgencia {2}"
+#define STRING_CMD_URGENCY_USAGE     "Muestra la medida de urgencia de una tarea"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
+#define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado zsh"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
+#define STRING_COLUMN_EXAMPLES_DESC  "Mueve tu ropa a la percha de abajo"
+#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardín"
+#define STRING_COLUMN_EXAMPLES_PAR   "casa"
+#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardín"
+#define STRING_COLUMN_EXAMPLES_TAGS  "casa @tarea"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_ADDED    "Añadida"
+#define STRING_COLUMN_LABEL_AGE      "Edad"
+#define STRING_COLUMN_LABEL_CATEGORY "Categoría"
+#define STRING_COLUMN_LABEL_COLUMN   "Columnas"
+#define STRING_COLUMN_LABEL_COMMAND  "Comando"
+#define STRING_COLUMN_LABEL_COMPLETE "Completada"
+#define STRING_COLUMN_LABEL_CONTEXT  "Contexto"
+#define STRING_COLUMN_LABEL_COUNT    "Recuento"
+#define STRING_COLUMN_LABEL_DATE     "Fecha"
+#define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_DESC     "Descripción"
 #define STRING_COLUMN_LABEL_DUE      "Vencimiento"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
-#define STRING_COLUMN_LABEL_COUNT    "Recuento"
-#define STRING_COLUMN_LABEL_COMPLETE "Completada"
+#define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo"
+#define STRING_COLUMN_LABEL_FILTER   "Filtro"
+#define STRING_COLUMN_LABEL_GC       "GC"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ADDED    "Añadida"
-#define STRING_COLUMN_LABEL_AGE      "Edad"
+#define STRING_COLUMN_LABEL_MODIFY   "Modificable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_NAME     "Nombre"
+#define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura"
+#define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Proyecto"
-#define STRING_COLUMN_LABEL_UNTIL    "Hasta"
-#define STRING_COLUMN_LABEL_WAIT     "Espera"
-#define STRING_COLUMN_LABEL_WAITING  "Esperando hasta"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrencia"
+#define STRING_COLUMN_LABEL_RO       "R/W"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Programada"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_START    "Comienzo"
 #define STRING_COLUMN_LABEL_STARTED  "Comenzada"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_STATUS   "Estatus"
 #define STRING_COLUMN_LABEL_STAT     "Est"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendientes"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completadas"
-#define STRING_COLUMN_LABEL_STAT_DE  "Suprimidas"
-#define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
-// Mejor Periódica, pero STRING_COLUMN_LABEL_STAT_P es Pendiente
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurrentes"
-#define STRING_COLUMN_LABEL_STAT_P   "P"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_STATUS   "Estatus"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_STAT_CO  "Completadas"
 #define STRING_COLUMN_LABEL_STAT_D   "S"
-#define STRING_COLUMN_LABEL_STAT_W   "E"
+#define STRING_COLUMN_LABEL_STAT_DE  "Suprimidas"
+#define STRING_COLUMN_LABEL_STAT_P   "P"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_STAT_PE  "Pendientes"
 #define STRING_COLUMN_LABEL_STAT_R   "R"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_TAGS     "Marcas"
+#define STRING_COLUMN_LABEL_STAT_RE  "Recurrentes"
+#define STRING_COLUMN_LABEL_STAT_W   "E"
+#define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
+#define STRING_COLUMN_LABEL_STYLES   "Formatos soportados"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
+#define STRING_COLUMN_LABEL_TAGS     "Marcas"
+#define STRING_COLUMN_LABEL_TYPE     "Tipo"
+#define STRING_COLUMN_LABEL_UDA      "Nombre"
+#define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
+#define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
-#define STRING_COLUMN_LABEL_NAME     "Nombre"
+#define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_COLUMN   "Columnas"
@@ -77,139 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_VALUES   "Valores permitidos"
-#define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Comando"
-#define STRING_COLUMN_LABEL_CATEGORY "Categoría"
-#define STRING_COLUMN_LABEL_RO       "R/W"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_GC       "GC"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_CONTEXT  "Contexto"
-#define STRING_COLUMN_LABEL_FILTER   "Filtro"
-#define STRING_COLUMN_LABEL_MODS     "Mods"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_MISC     "Misc"  // |esp-ESP|==|eng-USA|
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @tarea"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardín"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardín"
-#define STRING_COLUMN_EXAMPLES_DESC  "Mueve tu ropa a la percha de abajo"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
-
-// commands/Cmd*
-#define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
-#define STRING_CMD_URGENCY_USAGE     "Muestra la medida de urgencia de una tarea"
-#define STRING_CMD_URGENCY_RESULT    "tarea {1} urgencia {2}"
-#define STRING_CMD_ADD_USAGE         "Añade una nueva tarea"
-#define STRING_CMD_ADD_FEEDBACK      "Creada tarea {1}."
-#define STRING_CMD_ADD_RECUR         "Creada tarea {1} (modelo de recurrencia)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
-#define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
-#define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
-// metadatos: RAE 3ªed
-#define STRING_CMD_INFO_USAGE        "Muestra todos los datos y metadatos"
-#define STRING_CMD_INFO_BLOCKED      "Esta tarea está bloqueada por"
-#define STRING_CMD_INFO_BLOCKING     "Esta tarea bloquea"
-#define STRING_CMD_INFO_UNTIL        "Hasta"
-#define STRING_CMD_INFO_MODIFICATION "Modificación"
-#define STRING_CMD_INFO_MODIFIED     "Modificada por última vez"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Marcas virtuales"
-#define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
-#define STRING_CMD_REPORTS_USAGE     "Lista todos los informes soportados"
-#define STRING_CMD_REPORTS_REPORT    "Informe"
-#define STRING_CMD_REPORTS_DESC      "Descripción"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} informes"
-//#define STRING_CMD_REPORTS_SUMMARY   "{1} informa"
-#define STRING_CMD_TAGS_USAGE        "Muestra una lista de todas las marcas en uso"
-#define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
-#define STRING_CMD_TAGS_SINGLE       "1 marca"
-#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
-#define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
-#define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
-#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
-#define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "Archivo '{1}' no encontrado."
-#define STRING_CMD_IMPORT_UUID_BAD   "UUID '{1}' no válido."
-#define STRING_TASK_NO_DESC          "La anotación carece de descripción: {1}"
-#define STRING_TASK_NO_ENTRY         "La anotación carece de fecha de entrada: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
-#define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado zsh"
-
-#define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
-#define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
-#define STRING_CMD_CUSTOM_COUNT      "1 tarea"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tareas"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
-#define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
-#define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
-#define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Fecha"
-#define STRING_CMD_CAL_LABEL_HOL     "Festivo"
-#define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
-#define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
-#define STRING_FEEDBACK_DELETED      "Se eliminará {1}."
-#define STRING_FEEDBACK_DEP_SET      "Las dependencias se ajustarán a '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Las dependencias se cambiarán de '{1}' a '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencias '{1}' eliminadas."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencias ajustadas a '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencias cambiadas de '{1}' a '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} se establecerá como '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} se cambiará de '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duración: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} establecido como '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} cambiado de '{2}' a '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Espera"
+#define STRING_COLUMN_LABEL_WAITING  "Esperando hasta"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duración: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} se cambiará de '{2}' a '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} se establecerá como '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} cambiado de '{2}' a '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} establecido como '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
+#define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
+#define STRING_FEEDBACK_DELETED      "Se eliminará {1}."
+#define STRING_FEEDBACK_DEP_DEL      "Dependencias '{1}' eliminadas."
+#define STRING_FEEDBACK_DEP_MOD      "Las dependencias se cambiarán de '{1}' a '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Las dependencias se ajustarán a '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencias cambiadas de '{1}' a '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencias ajustadas a '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
 #define STRING_FEEDBACK_NOP          "No se harán cambios."
-#define STRING_FEEDBACK_WAS_NOP      "No se hicieron cambios."
+#define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
+#define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
+#define STRING_FEEDBACK_TAG_NEXT     "La etiqueta especial 'next' aumentará la urgencia de esta tarea para que aparezca en el informe 'next'."
+#define STRING_FEEDBACK_TAG_NOCAL    "La marca especial 'nocal' mantendrá esta tarea fuera del informe 'calendar'."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "La marca especial 'nocolor' deshabilitará las reglas de color para esta tarea."
 #define STRING_FEEDBACK_TAG_NONAG    "La marca especial 'nonag' evitará el recuerdo fastidioso cuando la tarea sea modificada."
-#define STRING_FEEDBACK_TAG_NOCAL    "La marca especial 'nocal' mantendrá esta tarea fuera del informe 'calendar'."
-#define STRING_FEEDBACK_TAG_NEXT     "La etiqueta especial 'next' aumentará la urgencia de esta tarea para que aparezca en el informe 'next'."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
-#define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
-#define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "No se hicieron cambios."
+#define STRING_TASK_DEPEND_CIRCULAR  "Dependencia circular detectada y anulada."
+#define STRING_TASK_DEPEND_DUP       "La tarea {1} ya depende de la tarea {2}."
+#define STRING_TASK_DEPEND_ITSELF    "Una tarea no puede depender de sí misma."
+#define STRING_TASK_DEPEND_MISS_CREA "No se pudo crear una dependencia de la tarea {1} - no encontrada."
+#define STRING_TASK_DEPEND_MISS_DEL  "No se pudo eliminar una dependencia de la tarea {1} - no encontrada."
+#define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
+#define STRING_TASK_NO_DESC          "La anotación carece de descripción: {1}"
+#define STRING_TASK_NO_ENTRY         "La anotación carece de fecha de entrada: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior ya no admite el formato de archivo 1, usado originalmente entre el 27 de noviembre de 2006 y el 31 de diciembre de 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior ya no admite el formato de archivo 2, usado originalmente entre el 1 de enero de 2008 y el 12 de abril de 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior ya no admite el formato de archivo 3, usado originalmente entre el 23 de marzo de 2009 y el  16 de mayo de 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Formato de archivo taskwarrior no reconocido."
-#define STRING_TASK_DEPEND_ITSELF    "Una tarea no puede depender de sí misma."
-#define STRING_TASK_DEPEND_MISS_CREA "No se pudo crear una dependencia de la tarea {1} - no encontrada."
-#define STRING_TASK_DEPEND_MISS_DEL  "No se pudo eliminar una dependencia de la tarea {1} - no encontrada."
-#define STRING_TASK_DEPEND_DUP       "La tarea {1} ya depende de la tarea {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Dependencia circular detectada y anulada."
-#define STRING_TASK_VALID_BLANK      "No se puede añadir una tarea que está en blanco."
-#define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
-#define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
-#define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
+#define STRING_TASK_VALID_BLANK      "No se puede añadir una tarea que está en blanco."
+#define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5aa620615..829089024 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Tâche {1} crée."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Ajoute une nouvelle tâche"
+#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
+#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
+#define STRING_CMD_CAL_LABEL_DATE    "Date"
+#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
+#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
+#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
+#define STRING_CMD_CUSTOM_COUNT      "1 tâche"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} tâches"
+#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
+#define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
+#define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
+#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
+#define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
+#define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
+#define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
+#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
+#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "Cette tâche est bloquée par"
+#define STRING_CMD_INFO_BLOCKING     "Cette tâche bloque"
+#define STRING_CMD_INFO_MODIFICATION "Modification"
+#define STRING_CMD_INFO_MODIFIED     "Dernier modifié"
+#define STRING_CMD_INFO_UNTIL        "Jusqu'au"
+#define STRING_CMD_INFO_USAGE        "Affiche toutes les données et méta-données"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Description"
+#define STRING_CMD_REPORTS_REPORT    "Rapport"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} rapports"
+#define STRING_CMD_REPORTS_USAGE     "Liste tous les rapports supportés"
+#define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
+#define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
+#define STRING_CMD_TAGS_SINGLE       "1 étiquette"
+#define STRING_CMD_TAGS_USAGE        "Affiche une liste de toutes les étiquettes utilisées"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
+#define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
+#define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
+#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
+#define STRING_CMD_URGENCY_USAGE     "Affiche l'indice d'urgence de la tâche"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
+#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
+#define STRING_COLUMN_EXAMPLES_IND   "  maison.jardin"
+#define STRING_COLUMN_EXAMPLES_PAR   "maison"
+#define STRING_COLUMN_EXAMPLES_PROJ  "maison.jardin"
+#define STRING_COLUMN_EXAMPLES_TAGS  "maison @routine next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
+#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Complétée"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Temps restant"
+#define STRING_COLUMN_LABEL_DATE     "Date"
+#define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Échéance"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
-#define STRING_COLUMN_LABEL_COUNT    "Temps restant"
-#define STRING_COLUMN_LABEL_COMPLETE "Complétée"
+#define STRING_COLUMN_LABEL_EXAMPLES "Exemple"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Étiq"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
-#define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
-#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Nom"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
 #define STRING_COLUMN_LABEL_PROJECT  "Projet"
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_WAIT     "Attente"
-#define STRING_COLUMN_LABEL_WAITING  "En attente jusqu’au"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Récurrence"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Planifiée"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Début"
 #define STRING_COLUMN_LABEL_STARTED  "Débutée"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Statut"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Prévue"
-#define STRING_COLUMN_LABEL_STAT_CO  "Complétée"
-#define STRING_COLUMN_LABEL_STAT_DE  "Supprimée"
-#define STRING_COLUMN_LABEL_STAT_WA  "En attente"
-#define STRING_COLUMN_LABEL_STAT_RE  "Récurrente"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STATUS   "Statut"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
+#define STRING_COLUMN_LABEL_STAT_CO  "Complétée"
 #define STRING_COLUMN_LABEL_STAT_D   "S"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_DE  "Supprimée"
+#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STAT_PE  "Prévue"
 #define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_TAGS     "Étiquettes"
+#define STRING_COLUMN_LABEL_STAT_RE  "Récurrente"
+#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_WA  "En attente"
+#define STRING_COLUMN_LABEL_STYLES   "Formats supportés"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Étiquettes"
+#define STRING_COLUMN_LABEL_TYPE     "Type"
+#define STRING_COLUMN_LABEL_UDA      "Nom"
+#define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
+#define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
-#define STRING_COLUMN_LABEL_NAME     "Nom"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
@@ -76,157 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_VALUES   "Valeurs autorisées"
-#define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
-#define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "maison @routine next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "maison.jardin"
-#define STRING_COLUMN_EXAMPLES_PAR   "maison"
-#define STRING_COLUMN_EXAMPLES_IND   "  maison.jardin"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
-#define STRING_CMD_URGENCY_USAGE     "Affiche l'indice d'urgence de la tâche"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_ADD_USAGE         "Ajoute une nouvelle tâche"
-#define STRING_CMD_ADD_FEEDBACK      "Tâche {1} crée."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
-#define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
-#define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
-#define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
-#define STRING_CMD_INFO_USAGE        "Affiche toutes les données et méta-données"
-#define STRING_CMD_INFO_BLOCKED      "Cette tâche est bloquée par"
-#define STRING_CMD_INFO_BLOCKING     "Cette tâche bloque"
-#define STRING_CMD_INFO_UNTIL        "Jusqu'au"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Dernier modifié"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
-#define STRING_CMD_REPORTS_USAGE     "Liste tous les rapports supportés"
-#define STRING_CMD_REPORTS_REPORT    "Rapport"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} rapports"
-#define STRING_CMD_TAGS_USAGE        "Affiche une liste de toutes les étiquettes utilisées"
-#define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
-#define STRING_CMD_TAGS_SINGLE       "1 étiquette"
-#define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
-#define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
-#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
-#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
-#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
-#define STRING_CMD_CUSTOM_COUNT      "1 tâche"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tâches"
-#define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
-#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-
-// These four blocks can be replaced, but the number of lines must not change.
-#define STRING_EDIT_HEADER_1         "La commande 'task <id> edit' vous permet de modifier tous les aspects d'une tâche"
-#define STRING_EDIT_HEADER_2         "en utilisant un éditeur de texte. Ci-dessous sont listés toutes les caractéristiques de la tâche."
-#define STRING_EDIT_HEADER_3         "Modifiez à votre gré, et quand vous enregistrerez et quitterez votre éditeur de text,"
-#define STRING_EDIT_HEADER_4         "Taskwarrior lira ce fichier, déterminera ce qui a changé et appliquera"
-#define STRING_EDIT_HEADER_5         "ces changements. Si vous quittez votre édteur sans enregistrer"
-#define STRING_EDIT_HEADER_6         " ou modifier, Taskwarrior ne fera rien."
-
-#define STRING_EDIT_HEADER_7         "Les lignes commençant par # représentent les données que vous ne puvez changer, comme les ID."
-#define STRING_EDIT_HEADER_8         "Si vous devenez trop prolifique en éditant, Taskwarrior vous renverra"
-#define STRING_EDIT_HEADER_9         "dans l'éditeur pour réessayer."
-
-#define STRING_EDIT_HEADER_10        "Si vous vous trouvez dans une boucle infinie, à rééditer le même fichier,"
-#define STRING_EDIT_HEADER_11        "quitter simplement l'éditeur sans faire aucun changements.  Taskwarrior le détectera"
-#define STRING_EDIT_HEADER_12        "et arrêtera l'édition."
-
-#define STRING_EDIT_HEADER_13        "Les annotations sont de cette forme : <date> -- <text> et il peut y en avoir n'importe quel nombre."
-#define STRING_EDIT_HEADER_14        "Le séparateur ' -- ' entre les champs de date et de texte ne devrai pas être supprimé."
-#define STRING_EDIT_HEADER_15        "Il y a un champs vide ci-dessous pour ajouter une annotation facilement."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_NO_MATCH     "No matches."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Attente"
+#define STRING_COLUMN_LABEL_WAITING  "En attente jusqu’au"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
+#define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
+#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
+#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
+#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
 #define STRING_FEEDBACK_NOP          "No changes will be made."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_FEEDBACK_NO_MATCH     "No matches."
+#define STRING_FEEDBACK_NO_TASKS     "No tasks."
+#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
+#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
 #define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
-#define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
-#define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
+#define STRING_TASK_DEPEND_DUP       "La tâche {1} dépend déjà de la tâche {2}."
+#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
+#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
+#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
+#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_DUP       "La tâche {1} dépend déjà de la tâche {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
+#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
+#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7f105e27b..8de2f2487 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Task {1} creato."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Aggiunge un nuovo task"
+#define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
+#define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
+#define STRING_CMD_CAL_LABEL_DATE    "Data"
+#define STRING_CMD_CAL_LABEL_HOL     "Festività"
+#define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
+#define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
+#define STRING_CMD_CUSTOM_COUNT      "1 task"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} task"
+#define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
+#define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
+#define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
+#define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
+#define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
+#define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
+#define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
+#define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
+#define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "Questo task è bloccato da"
+#define STRING_CMD_INFO_BLOCKING     "Questo task sta bloccando"
+#define STRING_CMD_INFO_MODIFICATION "Modifica"
+#define STRING_CMD_INFO_MODIFIED     "Ultima modifica"
+#define STRING_CMD_INFO_UNTIL        "Fino a"
+#define STRING_CMD_INFO_USAGE        "Mostra tutti i dati e i metadati"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Descrizione"
+#define STRING_CMD_REPORTS_REPORT    "Report"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} report"
+#define STRING_CMD_REPORTS_USAGE     "Lista dei report supportati"
+#define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
+#define STRING_CMD_TAGS_PLURAL       "{1} tag"
+#define STRING_CMD_TAGS_SINGLE       "1 tag"
+#define STRING_CMD_TAGS_USAGE        "Mostra la lista di tutti i tag utilizzati"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
+#define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
+#define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
+#define STRING_CMD_URGENCY_RESULT    "task {1} urgenza {2}"
+#define STRING_CMD_URGENCY_USAGE     "Mostra l'urgenza di un task"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera la lista di tutti i comandi, per autocompletamento in zsh"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
+#define STRING_COLUMN_EXAMPLES_DESC  "Spostare i vestiti sul gancio più basso"
+#define STRING_COLUMN_EXAMPLES_IND   "  casa.giardino"
+#define STRING_COLUMN_EXAMPLES_PAR   "casa"
+#define STRING_COLUMN_EXAMPLES_PROJ  "casa.giardino"
+#define STRING_COLUMN_EXAMPLES_TAGS  "casa @faccende next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
+#define STRING_COLUMN_LABEL_AGE      "Età"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Colonna"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Completato"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Conteggio"
+#define STRING_COLUMN_LABEL_DATE     "Data"
+#define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_DESC     "Descrizione"
 #define STRING_COLUMN_LABEL_DUE      "Scadenza"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
-#define STRING_COLUMN_LABEL_COUNT    "Conteggio"
-#define STRING_COLUMN_LABEL_COMPLETE "Completato"
+#define STRING_COLUMN_LABEL_EXAMPLES "Esempio"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Etichetta"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
-#define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
-#define STRING_COLUMN_LABEL_AGE      "Età"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Nome"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Progetto"
-#define STRING_COLUMN_LABEL_UNTIL    "Fino a"
-#define STRING_COLUMN_LABEL_WAIT     "Attesa"
-#define STRING_COLUMN_LABEL_WAITING  "Attesa fino"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodico"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Fissato"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Inizio"
 #define STRING_COLUMN_LABEL_STARTED  "Iniziati"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Da fare"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completati"
-#define STRING_COLUMN_LABEL_STAT_DE  "Cancellati"
-#define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
-#define STRING_COLUMN_LABEL_STAT_RE  "Periodicamente"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
+#define STRING_COLUMN_LABEL_STAT_CO  "Completati"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_DE  "Cancellati"
+#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STAT_PE  "Da fare"
 #define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_STAT_RE  "Periodicamente"
+#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
+#define STRING_COLUMN_LABEL_STYLES   "Formati Supportati"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_TYPE     "Tipo"
+#define STRING_COLUMN_LABEL_UDA      "Nome"
+#define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
+#define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
-#define STRING_COLUMN_LABEL_NAME     "Nome"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonna"
@@ -76,136 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_VALUES   "Valori consentiti"
-#define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @faccende next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.giardino"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.giardino"
-#define STRING_COLUMN_EXAMPLES_DESC  "Spostare i vestiti sul gancio più basso"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
-
-// commands/Cmd*
-#define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
-#define STRING_CMD_URGENCY_USAGE     "Mostra l'urgenza di un task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgenza {2}"
-#define STRING_CMD_ADD_USAGE         "Aggiunge un nuovo task"
-#define STRING_CMD_ADD_FEEDBACK      "Task {1} creato."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
-#define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
-#define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_INFO_USAGE        "Mostra tutti i dati e i metadati"
-#define STRING_CMD_INFO_BLOCKED      "Questo task è bloccato da"
-#define STRING_CMD_INFO_BLOCKING     "Questo task sta bloccando"
-#define STRING_CMD_INFO_UNTIL        "Fino a"
-#define STRING_CMD_INFO_MODIFICATION "Modifica"
-#define STRING_CMD_INFO_MODIFIED     "Ultima modifica"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
-#define STRING_CMD_REPORTS_USAGE     "Lista dei report supportati"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_DESC      "Descrizione"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} report"
-#define STRING_CMD_TAGS_USAGE        "Mostra la lista di tutti i tag utilizzati"
-#define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_PLURAL       "{1} tag"
-#define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
-#define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
-#define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
-#define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Annotazione senza descrizione: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotazione senza data di immissione: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera la lista di tutti i comandi, per autocompletamento in zsh"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} task"
-#define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
-#define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
-#define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
-#define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Festività"
-#define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Nessun task."
-#define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
-#define STRING_FEEDBACK_DELETED      "{1} sarà cancellato."
-#define STRING_FEEDBACK_DEP_SET      "Le dipendenze saranno impostate a '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Le dipendenze saranno modificate da '{1}' in '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Dipendenze '{1}' cancellate."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dipendenze impostate a '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dipendenze cambiate da '{1}' a '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} sarà impostata a '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} sarà modificata da '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} cancellato."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} cancellato (durata: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} impostata a '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} modificata da '{2}' a '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Attesa"
+#define STRING_COLUMN_LABEL_WAITING  "Attesa fino"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} cancellato."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} cancellato (durata: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} sarà modificata da '{2}' a '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} sarà impostata a '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} modificata da '{2}' a '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} impostata a '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_DELETED      "{1} sarà cancellato."
+#define STRING_FEEDBACK_DEP_DEL      "Dipendenze '{1}' cancellate."
+#define STRING_FEEDBACK_DEP_MOD      "Le dipendenze saranno modificate da '{1}' in '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Le dipendenze saranno impostate a '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dipendenze cambiate da '{1}' a '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dipendenze impostate a '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
 #define STRING_FEEDBACK_NOP          "Nessuna modifica sarà apportata."
-#define STRING_FEEDBACK_WAS_NOP      "Nessuna modifica apportata."
+#define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
+#define STRING_FEEDBACK_NO_TASKS     "Nessun task."
+#define STRING_FEEDBACK_TAG_NEXT     "Il tag speciale 'next' aumenterà l'urgenza di questo task in modo che appaia nel report 'next'."
+#define STRING_FEEDBACK_TAG_NOCAL    "Il tag speciale 'nocal' manterrà il task fuori dal report 'calendar'."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "Il tag speciale 'nocolor' disabilita le regole dei colori per questo task."
 #define STRING_FEEDBACK_TAG_NONAG    "Il tag speciale 'nonag' eviterà problemi quando il task è modificato."
-#define STRING_FEEDBACK_TAG_NOCAL    "Il tag speciale 'nocal' manterrà il task fuori dal report 'calendar'."
-#define STRING_FEEDBACK_TAG_NEXT     "Il tag speciale 'next' aumenterà l'urgenza di questo task in modo che appaia nel report 'next'."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 #define STRING_FEEDBACK_UNBLOCKED    "Sbloccato {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "Nessuna modifica apportata."
+#define STRING_TASK_DEPEND_CIRCULAR  "Dipendenza circolare riscontrata ed evitata."
+#define STRING_TASK_DEPEND_DUP       "Task {1} già dipende da {2}."
+#define STRING_TASK_DEPEND_ITSELF    "Un task non può dipendere da sè stesso."
+#define STRING_TASK_DEPEND_MISS_CREA "Impossibile creare la dipendenza dal task {1} - non trovato."
+#define STRING_TASK_DEPEND_MISS_DEL  "Impossibile cancellare la dipendenza dal task {1} - non trovato."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Annotazione senza descrizione: {1}"
+#define STRING_TASK_NO_ENTRY         "Annotazione senza data di immissione: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior non supporta più il formato di file 1, usato tra il 27 Novembre 2006 e il 31 Dicembre 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Formato di file non riconosciuto."
-#define STRING_TASK_DEPEND_ITSELF    "Un task non può dipendere da sè stesso."
-#define STRING_TASK_DEPEND_MISS_CREA "Impossibile creare la dipendenza dal task {1} - non trovato."
-#define STRING_TASK_DEPEND_MISS_DEL  "Impossibile cancellare la dipendenza dal task {1} - non trovato."
-#define STRING_TASK_DEPEND_DUP       "Task {1} già dipende da {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Dipendenza circolare riscontrata ed evitata."
-#define STRING_TASK_VALID_BLANK      "Impossibile aggiungere un task vuoto."
-#define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
-#define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
+#define STRING_TASK_VALID_BLANK      "Impossibile aggiungere un task vuoto."
+#define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index eea5f79c5..38df78ff5 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "タスク {1} が生成されました。"
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "新しいタスクの追加"
+#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
+#define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
+#define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
+#define STRING_CMD_CAL_LABEL_DATE    "Date"
+#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
+#define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
+#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
+#define STRING_CMD_CUSTOM_COUNT      "1 task"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
+#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
+#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
+#define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
+#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
+#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
+#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
+#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
+#define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
+#define STRING_CMD_IMPORT_MISSING    "ファイル '{1}' が見つかりません。"
+#define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
+#define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
+#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
+#define STRING_CMD_INFO_MODIFICATION "Modification"
+#define STRING_CMD_INFO_MODIFIED     "Last modified"
+#define STRING_CMD_INFO_UNTIL        "Until"
+#define STRING_CMD_INFO_USAGE        "すべてのデータとメタデータを表示"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Description"
+#define STRING_CMD_REPORTS_REPORT    "Report"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
+#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
+#define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
+#define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
+#define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
+#define STRING_CMD_TAGS_USAGE        "使用されているすべてのタグを表示"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
+#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
+#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
+#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
+#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
+#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
+#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
+#define STRING_COLUMN_EXAMPLES_PAR   "home"
+#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
+#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Added"
+#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Columns"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Completed"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Count"
+#define STRING_COLUMN_LABEL_DATE     "Date"
+#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
-#define STRING_COLUMN_LABEL_COUNT    "Count"
-#define STRING_COLUMN_LABEL_COMPLETE "Completed"
+#define STRING_COLUMN_LABEL_EXAMPLES "Example"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Label"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ADDED    "Added"
-#define STRING_COLUMN_LABEL_AGE      "Age"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_WAIT     "Wait"
-#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STARTED  "Started"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
-#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
-#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
+#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
+#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
 #define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
+#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
+#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Tags"
+#define STRING_COLUMN_LABEL_TYPE     "Type"
+#define STRING_COLUMN_LABEL_UDA      "Name"
+#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
+#define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
-#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
@@ -76,137 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
-#define STRING_COLUMN_EXAMPLES_PAR   "home"
-#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
-#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_ADD_USAGE         "新しいタスクの追加"
-#define STRING_CMD_ADD_FEEDBACK      "タスク {1} が生成されました。"
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
-#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
-#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_INFO_USAGE        "すべてのデータとメタデータを表示"
-#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
-#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
-#define STRING_CMD_INFO_UNTIL        "Until"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Last modified"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
-#define STRING_CMD_TAGS_USAGE        "使用されているすべてのタグを表示"
-#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
-#define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
-#define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
-#define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
-#define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
-#define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
-#define STRING_CMD_IMPORT_MISSING    "ファイル '{1}' が見つかりません。"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
-#define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
-#define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
-#define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Wait"
+#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
+#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
+#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
+#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
+#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
 #define STRING_FEEDBACK_NOP          "No changes will be made."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
+#define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
+#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
+#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
 #define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
 #define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "No changes made."
+#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
+#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
+#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
+#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
+#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
+#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
+#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
+#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0f749e2ab..24e590880 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,42 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Utworzono zadanie {1}."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Dodaje nowe zadanie"
+#define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
+#define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
+#define STRING_CMD_CAL_LABEL_DATE    "Data"
+#define STRING_CMD_CAL_LABEL_HOL     "Wakacje"
+#define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
+#define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
+#define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} zadań"
+#define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
+#define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
+#define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
+#define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
+#define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
+#define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
+#define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
+#define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
+#define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "To zadanie jest blokowane przez"
+#define STRING_CMD_INFO_BLOCKING     "To zadanie blokuje"
+#define STRING_CMD_INFO_MODIFICATION "Modyfikacja"
+#define STRING_CMD_INFO_MODIFIED     "Ostatnio zmodyfikowane"
+#define STRING_CMD_INFO_UNTIL        "Do"
+#define STRING_CMD_INFO_USAGE        "Pokazuje wszystkie dane i metadane"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Opis"
+#define STRING_CMD_REPORTS_REPORT    "Raport"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} raportów"
+#define STRING_CMD_REPORTS_USAGE     "Lista wszystkich wspieranych raportów"
+#define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
+#define STRING_CMD_TAGS_PLURAL       "{1} tagów"
+#define STRING_CMD_TAGS_SINGLE       "1 tag"
+#define STRING_CMD_TAGS_USAGE        "Pokazuje listę użytych tagów"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
+#define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
+#define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
+#define STRING_CMD_URGENCY_RESULT    "zadanie {1} ważność {2}"
+#define STRING_CMD_URGENCY_USAGE     "Wyświetla pomiar ważności zadania"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
+#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Generuje listę wszystkich poleceń dla funkcji autouzupełniania w powłoce zsh"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Jeśli nie udajesz się do fryzjera"
+#define STRING_COLUMN_EXAMPLES_DESC  "Przewieś swoje ubrania na dolny wieszak"
+#define STRING_COLUMN_EXAMPLES_IND   "  dom.ogród"
+#define STRING_COLUMN_EXAMPLES_PAR   "dom"
+#define STRING_COLUMN_EXAMPLES_PROJ  "dom.ogród"
+#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"
+#define STRING_COLUMN_LABEL_ADDED    "Dodane"
+#define STRING_COLUMN_LABEL_AGE      "Wiek"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Ukończone"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Ile"
+#define STRING_COLUMN_LABEL_DATE     "Data"
+#define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_DESC     "Opis"
 #define STRING_COLUMN_LABEL_DUE      "Do"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
-#define STRING_COLUMN_LABEL_COUNT    "Ile"
-#define STRING_COLUMN_LABEL_COMPLETE "Ukończone"
+#define STRING_COLUMN_LABEL_EXAMPLES "Przykłady"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Etykieta"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
-#define STRING_COLUMN_LABEL_ADDED    "Dodane"
-#define STRING_COLUMN_LABEL_AGE      "Wiek"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Nazwa"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
-#define STRING_COLUMN_LABEL_UNTIL    "Do"
-#define STRING_COLUMN_LABEL_WAIT     "Czeka"
-#define STRING_COLUMN_LABEL_WAITING  "Czeka dopóki"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodyczny"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Zaplanowane"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STARTED  "Rozpoczęte"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_PE  "W toku"
-#define STRING_COLUMN_LABEL_STAT_CO  "Ukończone"
-#define STRING_COLUMN_LABEL_STAT_DE  "Usnięte"
-#define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
-#define STRING_COLUMN_LABEL_STAT_RE  "Zależne"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
+#define STRING_COLUMN_LABEL_STAT_CO  "Ukończone"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_DE  "Usnięte"
+#define STRING_COLUMN_LABEL_STAT_P   "P"
+#define STRING_COLUMN_LABEL_STAT_PE  "W toku"
 #define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_TAGS     "Tagi"
+#define STRING_COLUMN_LABEL_STAT_RE  "Zależne"
+#define STRING_COLUMN_LABEL_STAT_W   "W"
+#define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
+#define STRING_COLUMN_LABEL_STYLES   "Formaty"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
+#define STRING_COLUMN_LABEL_TAGS     "Tagi"
+#define STRING_COLUMN_LABEL_TYPE     "Typ"
+#define STRING_COLUMN_LABEL_UDA      "Nazwa"
+#define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
+#define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
-#define STRING_COLUMN_LABEL_NAME     "Nazwa"
+#define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
@@ -76,137 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_VALUES   "Dozwolone Wartości"
-#define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
-#define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
-#define STRING_COLUMN_EXAMPLES_PROJ  "dom.ogród"
-#define STRING_COLUMN_EXAMPLES_PAR   "dom"
-#define STRING_COLUMN_EXAMPLES_IND   "  dom.ogród"
-#define STRING_COLUMN_EXAMPLES_DESC  "Przewieś swoje ubrania na dolny wieszak"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Jeśli nie udajesz się do fryzjera"
-
-// commands/Cmd*
-// USAGE strings are visible in 'task help'
-#define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
-#define STRING_CMD_URGENCY_USAGE     "Wyświetla pomiar ważności zadania"
-#define STRING_CMD_URGENCY_RESULT    "zadanie {1} ważność {2}"
-#define STRING_CMD_ADD_USAGE         "Dodaje nowe zadanie"
-#define STRING_CMD_ADD_FEEDBACK      "Utworzono zadanie {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
-#define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
-#define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
-#define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
-#define STRING_CMD_INFO_USAGE        "Pokazuje wszystkie dane i metadane"
-#define STRING_CMD_INFO_BLOCKED      "To zadanie jest blokowane przez"
-#define STRING_CMD_INFO_BLOCKING     "To zadanie blokuje"
-#define STRING_CMD_INFO_UNTIL        "Do"
-#define STRING_CMD_INFO_MODIFICATION "Modyfikacja"
-#define STRING_CMD_INFO_MODIFIED     "Ostatnio zmodyfikowane"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
-#define STRING_CMD_REPORTS_USAGE     "Lista wszystkich wspieranych raportów"
-#define STRING_CMD_REPORTS_REPORT    "Raport"
-#define STRING_CMD_REPORTS_DESC      "Opis"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} raportów"
-#define STRING_CMD_TAGS_USAGE        "Pokazuje listę użytych tagów"
-#define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_PLURAL       "{1} tagów"
-#define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
-#define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
-#define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
-#define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Komentarz nie posiada treści: {1}"
-#define STRING_TASK_NO_ENTRY         "Komentarz nie posiada daty utworzenia: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generuje listę wszystkich poleceń dla funkcji autouzupełniania w powłoce zsh"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
-#define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} zadań"
-#define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
-#define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
-#define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Wakacje"
-#define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
-#define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
-#define STRING_FEEDBACK_DELETED      "{1} będzie usunięte."
-#define STRING_FEEDBACK_DEP_SET      "Zależności będą ustawione na '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Zależności będą zmienione z '{1}' na '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Zależności '{1}' usunięte."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Zależności ustawione na '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Zależności zmienione z '{1}' na '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} będzie ustawione na '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} będzie ustawione z '{2}' na '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} usunięte."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} usunięte (czas trwania: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} ustawiono na '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} zmieniono z '{2}' na '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Czeka"
+#define STRING_COLUMN_LABEL_WAITING  "Czeka dopóki"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} usunięte."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} usunięte (czas trwania: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} będzie ustawione z '{2}' na '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} będzie ustawione na '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} zmieniono z '{2}' na '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} ustawiono na '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
+#define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
+#define STRING_FEEDBACK_DELETED      "{1} będzie usunięte."
+#define STRING_FEEDBACK_DEP_DEL      "Zależności '{1}' usunięte."
+#define STRING_FEEDBACK_DEP_MOD      "Zależności będą zmienione z '{1}' na '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "Zależności będą ustawione na '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Zależności zmienione z '{1}' na '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Zależności ustawione na '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
 #define STRING_FEEDBACK_NOP          "Nie będą wprowadzone żadne zmiany."
-#define STRING_FEEDBACK_WAS_NOP      "Nie wprowadzono żadnych zmian."
+#define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
+#define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
+#define STRING_FEEDBACK_TAG_NEXT     "Specjalny tag 'next' podniesie pilność tego zadania co spowoduje wyświetlenie go w raporcie 'next'."
+#define STRING_FEEDBACK_TAG_NOCAL    "Specjalny tag 'nocal' spowoduje nie dodawanie zadania do kalendarza."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "Specjalny tag 'nocolor' wyłączy reguły kolorowania dla tego zadania."
 #define STRING_FEEDBACK_TAG_NONAG    "Specjalny tag 'nonag' uchroni przed upierdliwością kiedy zadanie jest modyfikowane."
-#define STRING_FEEDBACK_TAG_NOCAL    "Specjalny tag 'nocal' spowoduje nie dodawanie zadania do kalendarza."
-#define STRING_FEEDBACK_TAG_NEXT     "Specjalny tag 'next' podniesie pilność tego zadania co spowoduje wyświetlenie go w raporcie 'next'."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
 #define STRING_FEEDBACK_UNBLOCKED    "Odblokowane {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
-#define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
-#define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "Nie wprowadzono żadnych zmian."
+#define STRING_TASK_DEPEND_CIRCULAR  "Wykryto i nie dopuszczono do zależności cyklicznej."
+#define STRING_TASK_DEPEND_DUP       "Zadanie {1} już jest zależne od zadania {2}."
+#define STRING_TASK_DEPEND_ITSELF    "Zadanie nie może zależeć od samego siebie."
+#define STRING_TASK_DEPEND_MISS_CREA "Nie można dodać zależności dla zadania {1} - nie znaleziono."
+#define STRING_TASK_DEPEND_MISS_DEL  "Nie można usunąć zależności dla zadania {1} - nie znaleziono."
+#define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
+#define STRING_TASK_NO_DESC          "Komentarz nie posiada treści: {1}"
+#define STRING_TASK_NO_ENTRY         "Komentarz nie posiada daty utworzenia: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior nie wspiera więcej formatu plików 1, wcześniej używanego pomiędzy 27 Listopada 2006 i 31 Grudnia 2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior nie wspiera więcej formatu plików 2, wcześniej używanego pomiędzy 1 Stycznia 2008 i 12 Kwietnia 2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior nie wspiera więcej formatu plików 3, wcześniej używanego pomiędzy 23 Marca 2009 i 16 Maja 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Nierozpoznany format pliku programu taskwarrior."
-#define STRING_TASK_DEPEND_ITSELF    "Zadanie nie może zależeć od samego siebie."
-#define STRING_TASK_DEPEND_MISS_CREA "Nie można dodać zależności dla zadania {1} - nie znaleziono."
-#define STRING_TASK_DEPEND_MISS_DEL  "Nie można usunąć zależności dla zadania {1} - nie znaleziono."
-#define STRING_TASK_DEPEND_DUP       "Zadanie {1} już jest zależne od zadania {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Wykryto i nie dopuszczono do zależności cyklicznej."
-#define STRING_TASK_VALID_BLANK      "Nie można dodać pustego zadania."
-#define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
-#define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
-#define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
+#define STRING_TASK_VALID_BLANK      "Nie można dodać pustego zadania."
+#define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d40ec1de1..a0de2d16b 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,43 +27,124 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-// columns/Col*
+#define STRING_CMD_ADD_FEEDBACK      "Criada a tarefa {1}."
+#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
+#define STRING_CMD_ADD_USAGE         "Adiciona uma nova tarefa"
+#define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
+#define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."
+#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
+#define STRING_CMD_CAL_LABEL_DATE    "Data"
+#define STRING_CMD_CAL_LABEL_HOL     "Feriado"
+#define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
+#define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
+#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
+#define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
+#define STRING_CMD_CUSTOM_COUNT      "1 tarefa"
+#define STRING_CMD_CUSTOM_COUNTN     "{1} tarefas"
+#define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
+#define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
+#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
+#define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
+#define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"
+#define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
+#define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
+#define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
+#define STRING_CMD_IMPORT_FILE       "A importar '{1}'"
+#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
+#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
+#define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
+#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
+#define STRING_CMD_INFO_BLOCKED      "Esta tarefa está bloqueada por"
+#define STRING_CMD_INFO_BLOCKING     "Esta tarefa bloqueia"
+#define STRING_CMD_INFO_MODIFICATION "Modificação"
+#define STRING_CMD_INFO_MODIFIED     "Última modificação"
+#define STRING_CMD_INFO_UNTIL        "Até"
+#define STRING_CMD_INFO_USAGE        "Exibe todos os dados e meta-dados"
+#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
+#define STRING_CMD_REPORTS_DESC      "Descrição"
+#define STRING_CMD_REPORTS_REPORT    "Relatório"
+#define STRING_CMD_REPORTS_SUMMARY   "{1} relatórios"
+#define STRING_CMD_REPORTS_USAGE     "Lista todos os relatórios suportados"
+#define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
+#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
+#define STRING_CMD_TAGS_SINGLE       "1 marca"
+#define STRING_CMD_TAGS_USAGE        "Exibe uma lista de todas as marcas em uso"
+#define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
+#define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
+#define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
+#define STRING_CMD_URGENCY_RESULT    "Tarefa {1} urgência {2}"
+#define STRING_CMD_URGENCY_USAGE     "Exibe o valor de urgência de uma tarefa"
+#define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
+#define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
+#define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
+#define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
+#define STRING_CMD_ZSHCOMMANDS_USAGE "Gera uma lista com todos os comandos, para terminação automática em zsh"
+#define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
+#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
+#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"
+#define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
+#define STRING_COLUMN_EXAMPLES_DESC  "Mover as roupas para a prateleira mais baixa"
+#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardim"
+#define STRING_COLUMN_EXAMPLES_PAR   "casa"
+#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardim"
+#define STRING_COLUMN_EXAMPLES_TAGS  "casa @contas próxima"
+#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |por-PRT|==|eng-USA|
+#define STRING_COLUMN_LABEL_ADDED    "Adicionada"
+#define STRING_COLUMN_LABEL_AGE      "Idade"
+#define STRING_COLUMN_LABEL_CATEGORY "Category"
+#define STRING_COLUMN_LABEL_COLUMN   "Colunas"
+#define STRING_COLUMN_LABEL_COMMAND  "Command"
+#define STRING_COLUMN_LABEL_COMPLETE "Concluída"
+#define STRING_COLUMN_LABEL_CONTEXT  "Context"
+#define STRING_COLUMN_LABEL_COUNT    "Contagem"
+#define STRING_COLUMN_LABEL_DATE     "Data"
+#define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_DESC     "Descrição"
 #define STRING_COLUMN_LABEL_DUE      "Vence"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
-#define STRING_COLUMN_LABEL_COUNT    "Contagem"
-#define STRING_COLUMN_LABEL_COMPLETE "Concluída"
+#define STRING_COLUMN_LABEL_EXAMPLES "Exemplo"
+#define STRING_COLUMN_LABEL_FILTER   "Filter"
+#define STRING_COLUMN_LABEL_GC       "GC"
+#define STRING_COLUMN_LABEL_LABEL    "Rótulo"
+#define STRING_COLUMN_LABEL_LAST     "Last instance"
+#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ADDED    "Adicionada"
-#define STRING_COLUMN_LABEL_AGE      "Idade"
+#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
+#define STRING_COLUMN_LABEL_MODS     "Mods"
+#define STRING_COLUMN_LABEL_NAME     "Nome"
+#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
+#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
 #define STRING_COLUMN_LABEL_PROJECT  "Projeto"
-#define STRING_COLUMN_LABEL_UNTIL    "Até"
-#define STRING_COLUMN_LABEL_WAIT     "Adiada"
-#define STRING_COLUMN_LABEL_WAITING  "Adiada até"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodicidade"
+#define STRING_COLUMN_LABEL_RO       "R/W"
+#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
+#define STRING_COLUMN_LABEL_SCHED    "Agendado"
+#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Início"
 #define STRING_COLUMN_LABEL_STARTED  "Iniciada"
-#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_STATUS   "Estado"
 #define STRING_COLUMN_LABEL_STAT     "Es"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendentes"
-#define STRING_COLUMN_LABEL_STAT_CO  "Concluídas"
-#define STRING_COLUMN_LABEL_STAT_DE  "Eliminadas"
-#define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
-// Seria preferivel "Periódicas" mas faz conflito na primeira letra com "Pendentes"
-#define STRING_COLUMN_LABEL_STAT_RE  "Recorrentes"
-#define STRING_COLUMN_LABEL_STAT_P   "P"  // |por-PRT|==|eng-USA|
+#define STRING_COLUMN_LABEL_STATUS   "Estado"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|
+#define STRING_COLUMN_LABEL_STAT_CO  "Concluídas"
 #define STRING_COLUMN_LABEL_STAT_D   "E"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_DE  "Eliminadas"
+#define STRING_COLUMN_LABEL_STAT_P   "P"  // |por-PRT|==|eng-USA|
+#define STRING_COLUMN_LABEL_STAT_PE  "Pendentes"
 #define STRING_COLUMN_LABEL_STAT_R   "R"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_TAGS     "Marcas"
+#define STRING_COLUMN_LABEL_STAT_RE  "Recorrentes"
+#define STRING_COLUMN_LABEL_STAT_W   "A"
+#define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
+#define STRING_COLUMN_LABEL_STYLES   "Formatos Suportados"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
+#define STRING_COLUMN_LABEL_TAGS     "Marcas"
+#define STRING_COLUMN_LABEL_TYPE     "Tipo"
+#define STRING_COLUMN_LABEL_UDA      "Nome"
+#define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
+#define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
-#define STRING_COLUMN_LABEL_NAME     "Nome"
+#define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_COLUMN   "Colunas"
@@ -77,136 +158,55 @@
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_VALUES   "Valores Permitidos"
-#define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
-
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
-#define STRING_COLUMN_LABEL_RO       "R/W"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_GC       "GC"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
-
-// Column Examples
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @contas próxima"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardim"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardim"
-#define STRING_COLUMN_EXAMPLES_DESC  "Mover as roupas para a prateleira mais baixa"
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
-
-// commands/Cmd*
-#define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
-#define STRING_CMD_URGENCY_USAGE     "Exibe o valor de urgência de uma tarefa"
-#define STRING_CMD_URGENCY_RESULT    "Tarefa {1} urgência {2}"
-#define STRING_CMD_ADD_USAGE         "Adiciona uma nova tarefa"
-#define STRING_CMD_ADD_FEEDBACK      "Criada a tarefa {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
-#define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
-#define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
-#define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
-#define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
-#define STRING_CMD_INFO_USAGE        "Exibe todos os dados e meta-dados"
-#define STRING_CMD_INFO_BLOCKED      "Esta tarefa está bloqueada por"
-#define STRING_CMD_INFO_BLOCKING     "Esta tarefa bloqueia"
-#define STRING_CMD_INFO_UNTIL        "Até"
-#define STRING_CMD_INFO_MODIFICATION "Modificação"
-#define STRING_CMD_INFO_MODIFIED     "Última modificação"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
-#define STRING_CMD_REPORTS_USAGE     "Lista todos os relatórios suportados"
-#define STRING_CMD_REPORTS_REPORT    "Relatório"
-#define STRING_CMD_REPORTS_DESC      "Descrição"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} relatórios"
-#define STRING_CMD_TAGS_USAGE        "Exibe uma lista de todas as marcas em uso"
-#define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
-#define STRING_CMD_TAGS_SINGLE       "1 marca"
-#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
-#define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
-#define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
-#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
-#define STRING_CMD_IMPORT_FILE       "A importar '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
-#define STRING_TASK_NO_DESC          "Descrição da anotação em falta: {1}"
-#define STRING_TASK_NO_ENTRY         "Data de entrada da anotação em falta: {1}"
-
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
-#define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Gera uma lista com todos os comandos, para terminação automática em zsh"
-#define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
-#define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
-
-#define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
-#define STRING_CMD_CUSTOM_COUNT      "1 tarefa"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tarefas"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
-#define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
-#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
-#define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Feriado"
-#define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
-
-// Feedback
-#define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
-#define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
-#define STRING_FEEDBACK_DELETED      "{1} será eliminada."
-#define STRING_FEEDBACK_DEP_SET      "As dependências serão alteradas para '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "As dependências serão alteradas de '{1}' para '{2}'."
-#define STRING_FEEDBACK_DEP_DEL      "Eliminadas as dependências '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Alteradas as dependências para '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Alteradas as dependências de '{1}' para '{2}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} será definido como '{2}'."
-#define STRING_FEEDBACK_ATT_MOD      "{1} será alterado de '{2}' para '{3}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duração: {2})."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} definido como '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} alterado de '{2}' para '{3}'."
+#define STRING_COLUMN_LABEL_WAIT     "Adiada"
+#define STRING_COLUMN_LABEL_WAITING  "Adiada até"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."
+#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
+#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duração: {2})."
+#define STRING_FEEDBACK_ATT_MOD      "{1} será alterado de '{2}' para '{3}'."
+#define STRING_FEEDBACK_ATT_SET      "{1} será definido como '{2}'."
+#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} alterado de '{2}' para '{3}'."
+#define STRING_FEEDBACK_ATT_WAS_SET  "{1} definido como '{2}'."
+#define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
+#define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
+#define STRING_FEEDBACK_DELETED      "{1} será eliminada."
+#define STRING_FEEDBACK_DEP_DEL      "Eliminadas as dependências '{1}'."
+#define STRING_FEEDBACK_DEP_MOD      "As dependências serão alteradas de '{1}' para '{2}'."
+#define STRING_FEEDBACK_DEP_SET      "As dependências serão alteradas para '{1}'."
+#define STRING_FEEDBACK_DEP_WAS_MOD  "Alteradas as dependências de '{1}' para '{2}'."
+#define STRING_FEEDBACK_DEP_WAS_SET  "Alteradas as dependências para '{1}'."
+#define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
 #define STRING_FEEDBACK_NOP          "Não serão efetuadas alterações."
-#define STRING_FEEDBACK_WAS_NOP      "Nenhuma alteração efetuada."
+#define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
+#define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
+#define STRING_FEEDBACK_TAG_NEXT     "A marca especial 'next' irá aumentar a urgência desta tarefa de modo a que apareça no relatório 'next'."
+#define STRING_FEEDBACK_TAG_NOCAL    "A marca especial 'nocal' irá manter esta tarefa ausente do relatório de 'calendário'."
 #define STRING_FEEDBACK_TAG_NOCOLOR  "A marca especial 'nocolor' irá desactivar as regras de cor nesta tarefa."
 #define STRING_FEEDBACK_TAG_NONAG    "A marca especial 'nonag' irá prevenir avisos quando a tarefa é modificada."
-#define STRING_FEEDBACK_TAG_NOCAL    "A marca especial 'nocal' irá manter esta tarefa ausente do relatório de 'calendário'."
-#define STRING_FEEDBACK_TAG_NEXT     "A marca especial 'next' irá aumentar a urgência desta tarefa de modo a que apareça no relatório 'next'."
 #define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
+#define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
+#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
 #define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
-#define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
-#define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
-#define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
-
-// Task
+#define STRING_FEEDBACK_WAS_NOP      "Nenhuma alteração efetuada."
+#define STRING_TASK_DEPEND_CIRCULAR  "Dependência circular detetada e não permitida."
+#define STRING_TASK_DEPEND_DUP       "Tarefa {1} já depende da tarefa {2}."
+#define STRING_TASK_DEPEND_ITSELF    "Uma tarefa não pode depender dela própria."
+#define STRING_TASK_DEPEND_MISS_CREA "Não foi possível criar a dependência da tarefa {1} - esta não existe."
+#define STRING_TASK_DEPEND_MISS_DEL  "Não foi possível eliminar a dependência da tarefa {1} - esta não existe."
+#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_NO_DESC          "Descrição da anotação em falta: {1}"
+#define STRING_TASK_NO_ENTRY         "Data de entrada da anotação em falta: {1}"
 #define STRING_TASK_NO_FF1           "Taskwarrior já não suporta o formato 1, originalmente usado entre 27-Novembro-2006 e 31-Dezembro-2007."
 #define STRING_TASK_NO_FF2           "Taskwarrior já não suporta o formato 2, originalmente usado entre 1-Janeiro-2008 e 12-April-2009."
 #define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
 #define STRING_TASK_PARSE_UNREC_FF   "Formato taskwarrior não reconhecido."
-#define STRING_TASK_DEPEND_ITSELF    "Uma tarefa não pode depender dela própria."
-#define STRING_TASK_DEPEND_MISS_CREA "Não foi possível criar a dependência da tarefa {1} - esta não existe."
-#define STRING_TASK_DEPEND_MISS_DEL  "Não foi possível eliminar a dependência da tarefa {1} - esta não existe."
-#define STRING_TASK_DEPEND_DUP       "Tarefa {1} já depende da tarefa {2}."
-#define STRING_TASK_DEPEND_CIRCULAR  "Dependência circular detetada e não permitida."
-#define STRING_TASK_VALID_BLANK      "Não é possível adicionar uma tarefa em branco."
-#define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
-#define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
+#define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
+#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
+#define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
+#define STRING_TASK_VALID_BLANK      "Não é possível adicionar uma tarefa em branco."
+#define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."
 
 #endif

From 9640f5a02b8e71c152539721555cd2713b716883 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:01:20 -0500
Subject: [PATCH 668/879] Code cleanup: Removed unnecessary include

---
 src/commands/CmdAdd.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index a7ba6a478..45f250f7f 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -27,7 +27,6 @@
 #include <cmake.h>
 #include <CmdAdd.h>
 #include <Context.h>
-#include <shared.h>
 #include <format.h>
 #include <i18n.h>
 #include <main.h>

From 4b75865e47e0751e4df63b1ccd083ab758ba9436 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:01:54 -0500
Subject: [PATCH 669/879] l10n: Eliminated STRING_CMD_ADD_*

---
 src/commands/CmdAdd.cpp       | 11 +++++------
 src/commands/CmdDuplicate.cpp |  5 ++---
 src/l10n/deu-DEU.h            |  3 ---
 src/l10n/eng-USA.h            |  3 ---
 src/l10n/epo-RUS.h            |  3 ---
 src/l10n/esp-ESP.h            |  3 ---
 src/l10n/fra-FRA.h            |  3 ---
 src/l10n/ita-ITA.h            |  3 ---
 src/l10n/jpn-JPN.h            |  3 ---
 src/l10n/pol-POL.h            |  3 ---
 src/l10n/por-PRT.h            |  3 ---
 11 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 45f250f7f..394f0cfbb 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -28,7 +28,6 @@
 #include <CmdAdd.h>
 #include <Context.h>
 #include <format.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -38,7 +37,7 @@ CmdAdd::CmdAdd ()
 {
   _keyword               = "add";
   _usage                 = "task          add <mods>";
-  _description           = STRING_CMD_ADD_USAGE;
+  _description           = "Adds a new task";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -67,20 +66,20 @@ int CmdAdd::execute (std::string& output)
 
   if (context.verbose ("new-uuid") &&
            status != Task::recurring)
-    output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + '\n';
+    output += format ("Created task {1}.\n", task.get ("uuid"));
 
   else if (context.verbose ("new-uuid") &&
            status == Task::recurring)
-    output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + '\n';
+    output += format ("Created task {1} (recurrence template).\n", task.get ("uuid"));
 
   else if (context.verbose ("new-id") &&
       (status == Task::pending ||
        status == Task::waiting))
-    output += format (STRING_CMD_ADD_FEEDBACK, task.id) + '\n';
+    output += format ("Created task {1}.\n", task.id);
 
   else if (context.verbose ("new-id") &&
            status == Task::recurring)
-    output += format (STRING_CMD_ADD_RECUR, task.id) + '\n';
+    output += format ("Created task {1} (recurrence template).\n", task.id);
 
   if (context.verbose ("project"))
     context.footnote (onProjectChange (task));
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index eea1a6f7c..80ab5db47 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -31,7 +31,6 @@
 #include <Filter.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -118,11 +117,11 @@ int CmdDuplicate::execute (std::string&)
       if (context.verbose ("new-id") &&
           (status == Task::pending ||
            status == Task::waiting))
-        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.id) + '\n';
+        std::cout << format ("Created task {1}.\n", dup.id);
 
       else if (context.verbose ("new-uuid") &&
                status != Task::recurring)
-        std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.get ("uuid")) + '\n';
+        std::cout << format ("Created task {1}.\n", dup.get ("uuid"));
 
       if (context.verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4cbcbbdd9..22276136d 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Aufgabe {1} hinzugefügt."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Fügt eine neue Aufgabe hinzu"
 #define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index aaef8c256..be137f82a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Created task {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Adds a new task"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 7ccabfef6..dbd5adb35 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Kreis taskon {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Kreas novan taskon"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7a6db4f95..44f9b22bc 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Creada tarea {1}."
-#define STRING_CMD_ADD_RECUR         "Creada tarea {1} (modelo de recurrencia)."
-#define STRING_CMD_ADD_USAGE         "Añade una nueva tarea"
 #define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 829089024..159d3273c 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Tâche {1} crée."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Ajoute une nouvelle tâche"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8de2f2487..60bdfabe9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Task {1} creato."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Aggiunge un nuovo task"
 #define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 38df78ff5..c7126b05c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "タスク {1} が生成されました。"
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "新しいタスクの追加"
 #define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 24e590880..57f629a3e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Utworzono zadanie {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Dodaje nowe zadanie"
 #define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a0de2d16b..27790af8d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,9 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ADD_FEEDBACK      "Criada a tarefa {1}."
-#define STRING_CMD_ADD_RECUR         "Created task {1} (recurrence template)."
-#define STRING_CMD_ADD_USAGE         "Adiciona uma nova tarefa"
 #define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."

From b5388cb3a4febed88e9b328971998338b3482ca4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:09:00 -0500
Subject: [PATCH 670/879] Code cleanup: Removed unnecessary include

---
 src/commands/CmdImport.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index bacec9dd3..100f5e354 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -28,14 +28,11 @@
 #include <CmdImport.h>
 #include <CmdModify.h>
 #include <iostream>
-#include <sstream>
 #include <Context.h>
-#include <Filter.h>
 #include <format.h>
 #include <shared.h>
 #include <util.h>
 #include <i18n.h>
-#include <main.h>
 
 extern Context context;
 

From 8badebca2619462d08aa2877bddb44e3871f6bae Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:09:51 -0500
Subject: [PATCH 671/879] l10n: Eliminated STRING_CMD_IMPORT_*

---
 src/Task.cpp               |  2 +-
 src/commands/CmdImport.cpp | 11 +++++------
 src/l10n/deu-DEU.h         |  5 -----
 src/l10n/eng-USA.h         |  5 -----
 src/l10n/epo-RUS.h         |  5 -----
 src/l10n/esp-ESP.h         |  5 -----
 src/l10n/fra-FRA.h         |  5 -----
 src/l10n/ita-ITA.h         |  5 -----
 src/l10n/jpn-JPN.h         |  5 -----
 src/l10n/pol-POL.h         |  5 -----
 src/l10n/por-PRT.h         |  5 -----
 11 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 0ac65d278..0401c3ef0 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1504,7 +1504,7 @@ void Task::validate (bool applyDefault /* = true */)
     std::string token;
     Lexer::Type type;
     if (! lex.isUUID (token, type, true))
-      throw format (STRING_CMD_IMPORT_UUID_BAD, uid);
+      throw format ("Not a valid UUID '{1}'.", uid);
   }
   else
     set ("uuid", uuid ());
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 100f5e354..7ca2f2a82 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -32,7 +32,6 @@
 #include <format.h>
 #include <shared.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -41,7 +40,7 @@ CmdImport::CmdImport ()
 {
   _keyword               = "import";
   _usage                 = "task          import [<file> ...]";
-  _description           = STRING_CMD_IMPORT_USAGE;
+  _description           = "Imports JSON files";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
@@ -63,7 +62,7 @@ int CmdImport::execute (std::string&)
   if (! words.size () ||
       (words.size () == 1 && words[0] == "-"))
   {
-    std::cout << format (STRING_CMD_IMPORT_FILE, "STDIN") << '\n';
+    std::cout << format ("Importing '{1}'\n", "STDIN");
 
     std::string json;
     std::string line;
@@ -80,9 +79,9 @@ int CmdImport::execute (std::string&)
     {
       File incoming (word);
       if (! incoming.exists ())
-        throw format (STRING_CMD_IMPORT_MISSING, word);
+        throw format ("File '{1}' not found.", word);
 
-      std::cout << format (STRING_CMD_IMPORT_FILE, word) << '\n';
+      std::cout << format ("Importing '{1}'\n", word);
 
       // Load the file.
       std::string json;
@@ -92,7 +91,7 @@ int CmdImport::execute (std::string&)
     }
   }
 
-  context.footnote (format (STRING_CMD_IMPORT_SUMMARY, count));
+  context.footnote (format ("Imported {1} tasks.", count));
   return rc;
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 22276136d..7db24ab10 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_IMPORT_FILE       "Importiere '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "Datei '{1}' nicht gefunden."
-#define STRING_CMD_IMPORT_SUMMARY    "{1} Aufgabe importiert."
-#define STRING_CMD_IMPORT_USAGE      "Importiert eine JSON-Datei"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "Aufgabe blockiert durch"
 #define STRING_CMD_INFO_BLOCKING     "Aufgabe blockiert"
 #define STRING_CMD_INFO_MODIFICATION "Änderung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index be137f82a..e6b49b2dc 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
-#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "This task blocked by"
 #define STRING_CMD_INFO_BLOCKING     "This task is blocking"
 #define STRING_CMD_INFO_MODIFICATION "Modification"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index dbd5adb35..4a240265b 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
-#define STRING_CMD_IMPORT_FILE       "Importanta '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Importis {1} taskojn."
-#define STRING_CMD_IMPORT_USAGE      "Importas JSON-dosierojn"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "Tiu tasko blokata per"
 #define STRING_CMD_INFO_BLOCKING     "Tiu tasko blokas"
 #define STRING_CMD_INFO_MODIFICATION "Modifado"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 44f9b22bc..ea87d741c 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_IMPORT_FILE       "Importando '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "Archivo '{1}' no encontrado."
-#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tareas."
-#define STRING_CMD_IMPORT_USAGE      "Importa archivos JSON"
-#define STRING_CMD_IMPORT_UUID_BAD   "UUID '{1}' no válido."
 #define STRING_CMD_INFO_BLOCKED      "Esta tarea está bloqueada por"
 #define STRING_CMD_INFO_BLOCKING     "Esta tarea bloquea"
 #define STRING_CMD_INFO_MODIFICATION "Modificación"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 159d3273c..d5bbe18c4 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
-#define STRING_CMD_IMPORT_FILE       "Importing '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
-#define STRING_CMD_IMPORT_USAGE      "Imports JSON files"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "Cette tâche est bloquée par"
 #define STRING_CMD_INFO_BLOCKING     "Cette tâche bloque"
 #define STRING_CMD_INFO_MODIFICATION "Modification"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 60bdfabe9..b15d279b9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_IMPORT_FILE       "Importazione di '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Importati {1} task."
-#define STRING_CMD_IMPORT_USAGE      "Importa file JSON"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "Questo task è bloccato da"
 #define STRING_CMD_INFO_BLOCKING     "Questo task sta bloccando"
 #define STRING_CMD_INFO_MODIFICATION "Modifica"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index c7126b05c..3263ec01f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_IMPORT_FILE       "'{1}' をインポート中"
-#define STRING_CMD_IMPORT_MISSING    "ファイル '{1}' が見つかりません。"
-#define STRING_CMD_IMPORT_SUMMARY    "{1} task をインポートしました。"
-#define STRING_CMD_IMPORT_USAGE      "JSON ファイルをインポート"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "This task blocked by"
 #define STRING_CMD_INFO_BLOCKING     "This task is blocking"
 #define STRING_CMD_INFO_MODIFICATION "Modification"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 57f629a3e..5b611e0c6 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
-#define STRING_CMD_IMPORT_FILE       "Importowanie '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Zaimportowano {1} zadań."
-#define STRING_CMD_IMPORT_USAGE      "Importuje pliki JSON"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "To zadanie jest blokowane przez"
 #define STRING_CMD_INFO_BLOCKING     "To zadanie blokuje"
 #define STRING_CMD_INFO_MODIFICATION "Modyfikacja"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 27790af8d..da8567b21 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -46,11 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
-#define STRING_CMD_IMPORT_FILE       "A importar '{1}'"
-#define STRING_CMD_IMPORT_MISSING    "File '{1}' not found."
-#define STRING_CMD_IMPORT_SUMMARY    "Importadas {1} tarefas."
-#define STRING_CMD_IMPORT_USAGE      "Importa ficheiros JSON"
-#define STRING_CMD_IMPORT_UUID_BAD   "Not a valid UUID '{1}'."
 #define STRING_CMD_INFO_BLOCKED      "Esta tarefa está bloqueada por"
 #define STRING_CMD_INFO_BLOCKING     "Esta tarefa bloqueia"
 #define STRING_CMD_INFO_MODIFICATION "Modificação"

From 4b77ee5c25c3962ca702334ebbf60e366415d809 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:14:25 -0500
Subject: [PATCH 672/879] Code cleanup: Removed unnecessary include

---
 src/commands/CmdReports.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 3b3dff41e..1141f67d2 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -27,7 +27,6 @@
 #include <cmake.h>
 #include <CmdReports.h>
 #include <sstream>
-#include <algorithm>
 #include <Context.h>
 #include <Table.h>
 #include <format.h>

From a21a523896a8e70930cb3034116edaa9d3154ae8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:14:45 -0500
Subject: [PATCH 673/879] l10n: Eliminated STRING_CMD_REPORTS_*

---
 src/commands/CmdReports.cpp | 10 ++++------
 src/l10n/deu-DEU.h          |  4 ----
 src/l10n/eng-USA.h          |  4 ----
 src/l10n/epo-RUS.h          |  4 ----
 src/l10n/esp-ESP.h          |  4 ----
 src/l10n/fra-FRA.h          |  4 ----
 src/l10n/ita-ITA.h          |  4 ----
 src/l10n/jpn-JPN.h          |  4 ----
 src/l10n/pol-POL.h          |  4 ----
 src/l10n/por-PRT.h          |  4 ----
 10 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 1141f67d2..3ac2be602 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -31,7 +31,6 @@
 #include <Table.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -40,7 +39,7 @@ CmdReports::CmdReports ()
 {
   _keyword               = "reports";
   _usage                 = "task          reports";
-  _description           = STRING_CMD_REPORTS_USAGE;
+  _description           = "Lists all supported reports";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -87,8 +86,8 @@ int CmdReports::execute (std::string& output)
   std::stringstream out;
   Table view;
   view.width (context.getWidth ());
-  view.add (STRING_CMD_REPORTS_REPORT);
-  view.add (STRING_CMD_REPORTS_DESC);
+  view.add ("Report");
+  view.add ("Description");
   setHeaderUnderline (view);
 
   for (auto& report : reports)
@@ -101,8 +100,7 @@ int CmdReports::execute (std::string& output)
   out << optionalBlankLine ()
       << view.render ()
       << optionalBlankLine ()
-      << format (STRING_CMD_REPORTS_SUMMARY, reports.size ())
-      << '\n';
+      << format ("{1} reports\n", reports.size ());
 
   output = out.str ();
   return 0;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7db24ab10..076761c87 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Bis"
 #define STRING_CMD_INFO_USAGE        "Zeigt alle Daten und Metadaten"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Beschreibung"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} Reports"
-#define STRING_CMD_REPORTS_USAGE     "Zeigt alle unterstützten Reports"
 #define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
 #define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
 #define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e6b49b2dc..273ac6002 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Until"
 #define STRING_CMD_INFO_USAGE        "Shows all data and metadata"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
-#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
 #define STRING_CMD_TAGS_NO_TAGS      "No tags."
 #define STRING_CMD_TAGS_PLURAL       "{1} tags"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4a240265b..f9149e4c6 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Ĝis"
 #define STRING_CMD_INFO_USAGE        "Montras datumojn kaj metadatumojn"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Priskribo"
-#define STRING_CMD_REPORTS_REPORT    "Raporto"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} raportoj"
-#define STRING_CMD_REPORTS_USAGE     "Listigas ĉian raporton subtenatan"
 #define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
 #define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
 #define STRING_CMD_TAGS_SINGLE       "1 etikedo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ea87d741c..ad2b03149 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Hasta"
 #define STRING_CMD_INFO_USAGE        "Muestra todos los datos y metadatos"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Marcas virtuales"
-#define STRING_CMD_REPORTS_DESC      "Descripción"
-#define STRING_CMD_REPORTS_REPORT    "Informe"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} informes"
-#define STRING_CMD_REPORTS_USAGE     "Lista todos los informes soportados"
 #define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index d5bbe18c4..e3114aa18 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Jusqu'au"
 #define STRING_CMD_INFO_USAGE        "Affiche toutes les données et méta-données"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_REPORT    "Rapport"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} rapports"
-#define STRING_CMD_REPORTS_USAGE     "Liste tous les rapports supportés"
 #define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
 #define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
 #define STRING_CMD_TAGS_SINGLE       "1 étiquette"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b15d279b9..1db300abe 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Fino a"
 #define STRING_CMD_INFO_USAGE        "Mostra tutti i dati e i metadati"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Descrizione"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} report"
-#define STRING_CMD_REPORTS_USAGE     "Lista dei report supportati"
 #define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
 #define STRING_CMD_TAGS_PLURAL       "{1} tag"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 3263ec01f..eff09c3b7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Until"
 #define STRING_CMD_INFO_USAGE        "すべてのデータとメタデータを表示"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Description"
-#define STRING_CMD_REPORTS_REPORT    "Report"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} reports"
-#define STRING_CMD_REPORTS_USAGE     "Lists all supported reports"
 #define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
 #define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
 #define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5b611e0c6..1068e2e97 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Do"
 #define STRING_CMD_INFO_USAGE        "Pokazuje wszystkie dane i metadane"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Opis"
-#define STRING_CMD_REPORTS_REPORT    "Raport"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} raportów"
-#define STRING_CMD_REPORTS_USAGE     "Lista wszystkich wspieranych raportów"
 #define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
 #define STRING_CMD_TAGS_PLURAL       "{1} tagów"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index da8567b21..87e6ab433 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -53,10 +53,6 @@
 #define STRING_CMD_INFO_UNTIL        "Até"
 #define STRING_CMD_INFO_USAGE        "Exibe todos os dados e meta-dados"
 #define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
-#define STRING_CMD_REPORTS_DESC      "Descrição"
-#define STRING_CMD_REPORTS_REPORT    "Relatório"
-#define STRING_CMD_REPORTS_SUMMARY   "{1} relatórios"
-#define STRING_CMD_REPORTS_USAGE     "Lista todos os relatórios suportados"
 #define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_SINGLE       "1 marca"

From 6c4e861eac7ff857c59b17a1859ef78b90f65d16 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:21:42 -0500
Subject: [PATCH 674/879] l10n: Eliminated STRING_CMD_INFO_*

---
 src/commands/CmdInfo.cpp | 14 +++++++-------
 src/l10n/deu-DEU.h       |  7 -------
 src/l10n/eng-USA.h       |  7 -------
 src/l10n/epo-RUS.h       |  7 -------
 src/l10n/esp-ESP.h       |  7 -------
 src/l10n/fra-FRA.h       |  7 -------
 src/l10n/ita-ITA.h       |  7 -------
 src/l10n/jpn-JPN.h       |  7 -------
 src/l10n/pol-POL.h       |  7 -------
 src/l10n/por-PRT.h       |  7 -------
 10 files changed, 7 insertions(+), 70 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 1afc68177..a91b3eac8 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -46,7 +46,7 @@ CmdInfo::CmdInfo ()
 {
   _keyword               = "information";
   _usage                 = "task <filter> information";
-  _description           = STRING_CMD_INFO_USAGE;
+  _description           = "Shows all data and metadata";
   _read_only             = true;
 
   // This is inaccurate, but it does prevent a GC.  While this doesn't make a
@@ -158,7 +158,7 @@ int CmdInfo::execute (std::string& output)
           message << block.id << ' ' << block.get ("description") << '\n';
 
         row = view.addRow ();
-        view.set (row, 0, STRING_CMD_INFO_BLOCKED);
+        view.set (row, 0, "This task blocked by");
         view.set (row, 1, message.str ());
       }
     }
@@ -173,7 +173,7 @@ int CmdInfo::execute (std::string& output)
           message << block.id << ' ' << block.get ("description") << '\n';
 
         row = view.addRow ();
-        view.set (row, 0, STRING_CMD_INFO_BLOCKING);
+        view.set (row, 0, "This task is blocking");
         view.set (row, 1, message.str ());
       }
     }
@@ -270,7 +270,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("until"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_CMD_INFO_UNTIL);
+      view.set (row, 0, "Until");
       view.set (row, 1, Datetime (task.get_date ("until")).toString (dateformat));
     }
 
@@ -278,7 +278,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("modified"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_CMD_INFO_MODIFIED);
+      view.set (row, 0, "Last modified");
 
       Datetime mod (task.get_date ("modified"));
       std::string age = Duration (now - mod).formatVague ();
@@ -333,7 +333,7 @@ int CmdInfo::execute (std::string& output)
       // If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well.
 
       row = view.addRow ();
-      view.set (row, 0, STRING_CMD_INFO_VIRTUAL_TAGS);
+      view.set (row, 0, "Virtual tags");
       view.set (row, 1, virtualTags);
     }
 
@@ -508,7 +508,7 @@ int CmdInfo::execute (std::string& output)
 
     journal.width (context.getWidth ());
     journal.add (STRING_COLUMN_LABEL_DATE);
-    journal.add (STRING_CMD_INFO_MODIFICATION);
+    journal.add ("Modification");
 
     if (context.config.getBoolean ("journal.info") &&
         undo.size () > 3)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 076761c87..1ff434686 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_INFO_BLOCKED      "Aufgabe blockiert durch"
-#define STRING_CMD_INFO_BLOCKING     "Aufgabe blockiert"
-#define STRING_CMD_INFO_MODIFICATION "Änderung"
-#define STRING_CMD_INFO_MODIFIED     "Letzte Änderung"
-#define STRING_CMD_INFO_UNTIL        "Bis"
-#define STRING_CMD_INFO_USAGE        "Zeigt alle Daten und Metadaten"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
 #define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
 #define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 273ac6002..0c3fed818 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
-#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Last modified"
-#define STRING_CMD_INFO_UNTIL        "Until"
-#define STRING_CMD_INFO_USAGE        "Shows all data and metadata"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "No tags."
 #define STRING_CMD_TAGS_PLURAL       "{1} tags"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f9149e4c6..fe8ccb8d2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
-#define STRING_CMD_INFO_BLOCKED      "Tiu tasko blokata per"
-#define STRING_CMD_INFO_BLOCKING     "Tiu tasko blokas"
-#define STRING_CMD_INFO_MODIFICATION "Modifado"
-#define STRING_CMD_INFO_MODIFIED     "Modifado lasta"
-#define STRING_CMD_INFO_UNTIL        "Ĝis"
-#define STRING_CMD_INFO_USAGE        "Montras datumojn kaj metadatumojn"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
 #define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
 #define STRING_CMD_TAGS_SINGLE       "1 etikedo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index ad2b03149..33629c251 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_INFO_BLOCKED      "Esta tarea está bloqueada por"
-#define STRING_CMD_INFO_BLOCKING     "Esta tarea bloquea"
-#define STRING_CMD_INFO_MODIFICATION "Modificación"
-#define STRING_CMD_INFO_MODIFIED     "Modificada por última vez"
-#define STRING_CMD_INFO_UNTIL        "Hasta"
-#define STRING_CMD_INFO_USAGE        "Muestra todos los datos y metadatos"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Marcas virtuales"
 #define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_SINGLE       "1 marca"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index e3114aa18..1d475f724 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
-#define STRING_CMD_INFO_BLOCKED      "Cette tâche est bloquée par"
-#define STRING_CMD_INFO_BLOCKING     "Cette tâche bloque"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Dernier modifié"
-#define STRING_CMD_INFO_UNTIL        "Jusqu'au"
-#define STRING_CMD_INFO_USAGE        "Affiche toutes les données et méta-données"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
 #define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
 #define STRING_CMD_TAGS_SINGLE       "1 étiquette"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 1db300abe..9a8ae536b 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_INFO_BLOCKED      "Questo task è bloccato da"
-#define STRING_CMD_INFO_BLOCKING     "Questo task sta bloccando"
-#define STRING_CMD_INFO_MODIFICATION "Modifica"
-#define STRING_CMD_INFO_MODIFIED     "Ultima modifica"
-#define STRING_CMD_INFO_UNTIL        "Fino a"
-#define STRING_CMD_INFO_USAGE        "Mostra tutti i dati e i metadati"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
 #define STRING_CMD_TAGS_PLURAL       "{1} tag"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index eff09c3b7..077a194b0 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_INFO_BLOCKED      "This task blocked by"
-#define STRING_CMD_INFO_BLOCKING     "This task is blocking"
-#define STRING_CMD_INFO_MODIFICATION "Modification"
-#define STRING_CMD_INFO_MODIFIED     "Last modified"
-#define STRING_CMD_INFO_UNTIL        "Until"
-#define STRING_CMD_INFO_USAGE        "すべてのデータとメタデータを表示"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
 #define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
 #define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 1068e2e97..87fc7b84f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
-#define STRING_CMD_INFO_BLOCKED      "To zadanie jest blokowane przez"
-#define STRING_CMD_INFO_BLOCKING     "To zadanie blokuje"
-#define STRING_CMD_INFO_MODIFICATION "Modyfikacja"
-#define STRING_CMD_INFO_MODIFIED     "Ostatnio zmodyfikowane"
-#define STRING_CMD_INFO_UNTIL        "Do"
-#define STRING_CMD_INFO_USAGE        "Pokazuje wszystkie dane i metadane"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
 #define STRING_CMD_TAGS_PLURAL       "{1} tagów"
 #define STRING_CMD_TAGS_SINGLE       "1 tag"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 87e6ab433..9bdba2c4a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -46,13 +46,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
-#define STRING_CMD_INFO_BLOCKED      "Esta tarefa está bloqueada por"
-#define STRING_CMD_INFO_BLOCKING     "Esta tarefa bloqueia"
-#define STRING_CMD_INFO_MODIFICATION "Modificação"
-#define STRING_CMD_INFO_MODIFIED     "Última modificação"
-#define STRING_CMD_INFO_UNTIL        "Até"
-#define STRING_CMD_INFO_USAGE        "Exibe todos os dados e meta-dados"
-#define STRING_CMD_INFO_VIRTUAL_TAGS "Virtual tags"
 #define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
 #define STRING_CMD_TAGS_PLURAL       "{1} marcas"
 #define STRING_CMD_TAGS_SINGLE       "1 marca"

From 3a2b5df05d6da02cb1bc0c895c14bec785e4b8e3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:24:22 -0500
Subject: [PATCH 675/879] l10n: Eliminated STRING_CMD_ALIASES_*

---
 src/commands/CmdAliases.cpp | 3 +--
 src/l10n/deu-DEU.h          | 1 -
 src/l10n/eng-USA.h          | 1 -
 src/l10n/epo-RUS.h          | 1 -
 src/l10n/esp-ESP.h          | 1 -
 src/l10n/fra-FRA.h          | 1 -
 src/l10n/ita-ITA.h          | 1 -
 src/l10n/jpn-JPN.h          | 1 -
 src/l10n/pol-POL.h          | 1 -
 src/l10n/por-PRT.h          | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 9a5effbb7..32985fa06 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -28,7 +28,6 @@
 #include <CmdAliases.h>
 #include <Context.h>
 #include <Command.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -37,7 +36,7 @@ CmdCompletionAliases::CmdCompletionAliases ()
 {
   _keyword               = "_aliases";
   _usage                 = "task          _aliases";
-  _description           = STRING_CMD_ALIASES_USAGE;
+  _description           = "Generates a list of all aliases, for autocompletion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1ff434686..ba9e6339f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung"
 #define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
 #define STRING_CMD_CAL_LABEL_DATE    "Datum"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 0c3fed818..6ab0b25d3 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fe8ccb8d2..ce95f95dd 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
 #define STRING_CMD_CAL_LABEL_DATE    "Dato"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 33629c251..401218fb6 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Genera una lista de todos los alias, con fines de auto-completado"
 #define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
 #define STRING_CMD_CAL_LABEL_DATE    "Fecha"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 1d475f724..8846a5f36 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 9a8ae536b..8f0d99470 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Genera la lista di tutti gli alias, per autocompletamento"
 #define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 077a194b0..c8462f707 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
 #define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
 #define STRING_CMD_CAL_LABEL_DATE    "Date"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 87fc7b84f..90b75e986 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Generuje listę wszystkich aliasów dla funkcji autouzupełniania"
 #define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
 #define STRING_CMD_CAL_LABEL_DATE    "Data"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9bdba2c4a..c35156a49 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_ALIASES_USAGE     "Gera uma lista com todos os 'alias', para fins de terminação automática"
 #define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."
 #define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
 #define STRING_CMD_CAL_LABEL_DATE    "Data"

From faf6ecceda255eb26ae5b5960b2e25098529fda4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:27:29 -0500
Subject: [PATCH 676/879] l10n: Eliminated STRING_CMD_CAL_*

---
 src/commands/CmdCalendar.cpp | 15 +++++++--------
 src/l10n/deu-DEU.h           |  6 ------
 src/l10n/eng-USA.h           |  6 ------
 src/l10n/epo-RUS.h           |  6 ------
 src/l10n/esp-ESP.h           |  6 ------
 src/l10n/fra-FRA.h           |  6 ------
 src/l10n/ita-ITA.h           |  6 ------
 src/l10n/jpn-JPN.h           |  6 ------
 src/l10n/pol-POL.h           |  6 ------
 src/l10n/por-PRT.h           |  6 ------
 10 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 4de4c6655..2898e510f 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -32,7 +32,6 @@
 #include <Context.h>
 #include <Table.h>
 #include <Lexer.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 #include <util.h>
@@ -46,7 +45,7 @@ CmdCalendar::CmdCalendar ()
 {
   _keyword               = "calendar";
   _usage                 = "task          calendar [due|<month> <year>|<year>] [y]";
-  _description           = STRING_CMD_CAL_USAGE;
+  _description           = "Shows a calendar, with due tasks marked";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
@@ -131,7 +130,7 @@ int CmdCalendar::execute (std::string& output)
     {
       argMonth = strtol (arg.c_str (), NULL, 10);
       if (argMonth < 1 || argMonth > 12)
-        throw format (STRING_CMD_CAL_BAD_MONTH, arg);
+        throw format ("Argument '{1}' is not a valid month.", arg);
     }
 
     // "January" etc.
@@ -139,11 +138,11 @@ int CmdCalendar::execute (std::string& output)
     {
       argMonth = Datetime::monthOfYear (matches[0]);
       if (argMonth == -1)
-        throw format (STRING_CMD_CAL_BAD_MONTH, arg);
+        throw format ("Argument '{1}' is not a valid month.", arg);
     }
 
     else
-      throw format (STRING_CMD_CAL_BAD_ARG, arg);
+      throw format ("Could not recognize argument '{1}'.", arg);
   }
 
   // Supported combinations:
@@ -365,8 +364,8 @@ int CmdCalendar::execute (std::string& output)
     {
       Table holTable;
       holTable.width (context.getWidth ());
-      holTable.add (STRING_CMD_CAL_LABEL_DATE);
-      holTable.add (STRING_CMD_CAL_LABEL_HOL);
+      holTable.add ("Date");
+      holTable.add ("Holiday");
       setHeaderUnderline (holTable);
 
       std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
@@ -424,7 +423,7 @@ std::string CmdCalendar::renderMonths (
   // What day of the week does the user consider the first?
   auto weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
   if (weekStart != 0 && weekStart != 1)
-    throw std::string (STRING_CMD_CAL_SUN_MON);
+    throw std::string ("The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'.");
 
   // Build table for the number of months to be displayed.
   Table view;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index ba9e6339f..7845b2cf3 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Konnte Argument '{1}' nicht erkennen."
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' ist kein zulässiger Monat."
-#define STRING_CMD_CAL_LABEL_DATE    "Datum"
-#define STRING_CMD_CAL_LABEL_HOL     "Feiertag"
-#define STRING_CMD_CAL_SUN_MON       "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten."
-#define STRING_CMD_CAL_USAGE         "Zeigt einen Kalender mit hervorgehobenen fälligen Aufgaben"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
 #define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6ab0b25d3..93800e137 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index ce95f95dd..ab351da1f 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Ne povis rekoni argumenton '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' ne estas valida monato."
-#define STRING_CMD_CAL_LABEL_DATE    "Dato"
-#define STRING_CMD_CAL_LABEL_HOL     "Ferio"
-#define STRING_CMD_CAL_SUN_MON       "agordvariablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'."
-#define STRING_CMD_CAL_USAGE         "Montras kalendaron, kun markoj por datlimitaj taskoj"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
 #define STRING_CMD_CUSTOM_COUNT      "1 tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 401218fb6..7f6b21341 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "No se pudo reconocer el argumento '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "El argumento '{1}' no es un mes válido."
-#define STRING_CMD_CAL_LABEL_DATE    "Fecha"
-#define STRING_CMD_CAL_LABEL_HOL     "Festivo"
-#define STRING_CMD_CAL_SUN_MON       "La variable de configuración 'weekstart' solamente puede contener 'domingo' o 'lunes'."
-#define STRING_CMD_CAL_USAGE         "Muestra un calendario con las tareas fechadas resaltadas"
 #define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
 #define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarea"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8846a5f36..c7edb7650 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Could not recognize argument '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' is not a valid month."
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'."
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
 #define STRING_CMD_CUSTOM_COUNT      "1 tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 8f0d99470..99a522b51 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Impossibile riconosce l'argomento '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "L'argomento '{1}' non è un mese valido."
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Festività"
-#define STRING_CMD_CAL_SUN_MON       "La variabile di configurazione 'weekstart' può solo contenere i valori 'Domenica' or 'Lunedì'."
-#define STRING_CMD_CAL_USAGE         "Mostra un calendario, con i task da svolgere marcati"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index c8462f707..1eae62d3d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "引数'{1}' を認識できません。"
-#define STRING_CMD_CAL_BAD_MONTH     "引数 '{1}' は正しい月ではありません。"
-#define STRING_CMD_CAL_LABEL_DATE    "Date"
-#define STRING_CMD_CAL_LABEL_HOL     "Holiday"
-#define STRING_CMD_CAL_SUN_MON       "'weekstart' 設定変数は 'Sunday' または 'Monday' のみが使えます。"
-#define STRING_CMD_CAL_USAGE         "Shows a calendar, with due tasks marked"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 90b75e986..a6286c51c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Nie rozpoznany argument '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "Argument '{1}' nie jest poprawnym miesiącem"
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Wakacje"
-#define STRING_CMD_CAL_SUN_MON       "Początek tygodnia może mieć wartość 'Niedziela' lub 'Poniedziałek'."
-#define STRING_CMD_CAL_USAGE         "Wyświetla kalendarz z zadaniami z terminem"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
 #define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c35156a49..15c7db5f2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,12 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_CAL_BAD_ARG       "Não foi possível reconhecer o argumento '{1}'."
-#define STRING_CMD_CAL_BAD_MONTH     "Argumento '{1}' não é um mês válido."
-#define STRING_CMD_CAL_LABEL_DATE    "Data"
-#define STRING_CMD_CAL_LABEL_HOL     "Feriado"
-#define STRING_CMD_CAL_SUN_MON       "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'."
-#define STRING_CMD_CAL_USAGE         "Mostra um calendário, com datas de vencimento assinaladas"
 #define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarefa"

From fdc045a230a593f8a37c01b6c3f9c97df06c0568 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:36:02 -0500
Subject: [PATCH 677/879] l10n: Eliminated STRING_CMD_TAGS_*

---
 src/commands/CmdTags.cpp | 8 ++++----
 src/l10n/deu-DEU.h       | 4 ----
 src/l10n/eng-USA.h       | 4 ----
 src/l10n/epo-RUS.h       | 4 ----
 src/l10n/esp-ESP.h       | 4 ----
 src/l10n/fra-FRA.h       | 4 ----
 src/l10n/ita-ITA.h       | 4 ----
 src/l10n/jpn-JPN.h       | 4 ----
 src/l10n/pol-POL.h       | 4 ----
 src/l10n/por-PRT.h       | 4 ----
 10 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 0dd0302fb..a6bfed11b 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -43,7 +43,7 @@ CmdTags::CmdTags ()
 {
   _keyword               = "tags";
   _usage                 = "task <filter> tags";
-  _description           = STRING_CMD_TAGS_USAGE;
+  _description           = "Shows a list of all tags used";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -119,9 +119,9 @@ int CmdTags::execute (std::string& output)
         << optionalBlankLine ();
 
     if (unique.size () == 1)
-      context.footnote (STRING_CMD_TAGS_SINGLE);
+      context.footnote ("1 tag");
     else
-      context.footnote (format (STRING_CMD_TAGS_PLURAL, unique.size ()));
+      context.footnote (format ("{1} tags", unique.size ()));
 
     if (quantity == 1)
       context.footnote (STRING_FEEDBACK_TASKS_SINGLE);
@@ -132,7 +132,7 @@ int CmdTags::execute (std::string& output)
   }
   else
   {
-    context.footnote (STRING_CMD_TAGS_NO_TAGS);
+    context.footnote ("No tags.");
     rc = 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7845b2cf3..d070d3adf 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_TAGS_NO_TAGS      "Keine Schlagworte."
-#define STRING_CMD_TAGS_PLURAL       "{1} Schlagworte"
-#define STRING_CMD_TAGS_SINGLE       "1 Schlagwort"
-#define STRING_CMD_TAGS_USAGE        "Listet alle genutzten Schlagworte"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
 #define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 93800e137..975ac044c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_TAGS_NO_TAGS      "No tags."
-#define STRING_CMD_TAGS_PLURAL       "{1} tags"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_USAGE        "Shows a list of all tags used"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index ab351da1f..f07476dbe 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
-#define STRING_CMD_TAGS_NO_TAGS      "Nenia etikedo."
-#define STRING_CMD_TAGS_PLURAL       "{1} etikedoj"
-#define STRING_CMD_TAGS_SINGLE       "1 etikedo"
-#define STRING_CMD_TAGS_USAGE        "Montras listo de ĉia uzata etikedo"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
 #define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7f6b21341..34df93a25 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_TAGS_NO_TAGS      "No hay marcas."
-#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
-#define STRING_CMD_TAGS_SINGLE       "1 marca"
-#define STRING_CMD_TAGS_USAGE        "Muestra una lista de todas las marcas en uso"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
 #define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index c7edb7650..19e1301ef 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
-#define STRING_CMD_TAGS_NO_TAGS      "Pas d'étiquettes."
-#define STRING_CMD_TAGS_PLURAL       "{1} étiquettes"
-#define STRING_CMD_TAGS_SINGLE       "1 étiquette"
-#define STRING_CMD_TAGS_USAGE        "Affiche une liste de toutes les étiquettes utilisées"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
 #define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 99a522b51..0822d6afb 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_TAGS_NO_TAGS      "Nessun tag."
-#define STRING_CMD_TAGS_PLURAL       "{1} tag"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_USAGE        "Mostra la lista di tutti i tag utilizzati"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
 #define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 1eae62d3d..a6baa12a7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
-#define STRING_CMD_TAGS_NO_TAGS      "タグがない。"
-#define STRING_CMD_TAGS_PLURAL       "{1} 個のタグ"
-#define STRING_CMD_TAGS_SINGLE       "1 つのタグ"
-#define STRING_CMD_TAGS_USAGE        "使用されているすべてのタグを表示"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index a6286c51c..268c8529f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
-#define STRING_CMD_TAGS_NO_TAGS      "Brak tagów."
-#define STRING_CMD_TAGS_PLURAL       "{1} tagów"
-#define STRING_CMD_TAGS_SINGLE       "1 tag"
-#define STRING_CMD_TAGS_USAGE        "Pokazuje listę użytych tagów"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
 #define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 15c7db5f2..71558dd87 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -39,10 +39,6 @@
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
-#define STRING_CMD_TAGS_NO_TAGS      "Sem marcas."
-#define STRING_CMD_TAGS_PLURAL       "{1} marcas"
-#define STRING_CMD_TAGS_SINGLE       "1 marca"
-#define STRING_CMD_TAGS_USAGE        "Exibe uma lista de todas as marcas em uso"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
 #define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"

From a7d75c907141aed816b0968d7d367358295e2fe3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:38:47 -0500
Subject: [PATCH 678/879] l10n: Eliminated STRING_CMD_URGENCY_*

---
 src/commands/CmdUrgency.cpp | 5 ++---
 src/l10n/deu-DEU.h          | 2 --
 src/l10n/eng-USA.h          | 2 --
 src/l10n/epo-RUS.h          | 2 --
 src/l10n/esp-ESP.h          | 2 --
 src/l10n/fra-FRA.h          | 2 --
 src/l10n/ita-ITA.h          | 2 --
 src/l10n/jpn-JPN.h          | 2 --
 src/l10n/pol-POL.h          | 2 --
 src/l10n/por-PRT.h          | 2 --
 10 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 857d07d3a..aa83e16e1 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -33,7 +33,6 @@
 #include <Lexer.h>
 #include <main.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -42,7 +41,7 @@ CmdUrgency::CmdUrgency ()
 {
   _keyword               = "_urgency";
   _usage                 = "task <filter> _urgency";
-  _description           = STRING_CMD_URGENCY_USAGE;
+  _description           = "Displays the urgency measure of a task";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -71,7 +70,7 @@ int CmdUrgency::execute (std::string& output)
   std::stringstream out;
   for (auto& task : filtered)
   {
-    out << format (STRING_CMD_URGENCY_RESULT,
+    out << format ("task {1} urgency {2}",
                    task.identifier (),
                    Lexer::trim (format (task.urgency (), 6, 3)))
         << '\n';
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d070d3adf..4b698e033 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
 #define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
-#define STRING_CMD_URGENCY_RESULT    "Aufgabe {1}, Dringlichkeit {2}"
-#define STRING_CMD_URGENCY_USAGE     "Zeigt die Dringlichkeit einer Aufgabe an"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 975ac044c..e94bd7f5e 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f07476dbe..d05da23c8 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
 #define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
-#define STRING_CMD_URGENCY_RESULT    "tasko {1} urĝeco {2}"
-#define STRING_CMD_URGENCY_USAGE     "Montras la urĝec-mezuro de tasko"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 34df93a25..f88ecdf69 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
 #define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
-#define STRING_CMD_URGENCY_RESULT    "tarea {1} urgencia {2}"
-#define STRING_CMD_URGENCY_USAGE     "Muestra la medida de urgencia de una tarea"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 19e1301ef..01102d543 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
 #define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_URGENCY_USAGE     "Affiche l'indice d'urgence de la tâche"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0822d6afb..16becd04f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
 #define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgenza {2}"
-#define STRING_CMD_URGENCY_USAGE     "Mostra l'urgenza di un task"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a6baa12a7..a8b9c482e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_URGENCY_RESULT    "task {1} urgency {2}"
-#define STRING_CMD_URGENCY_USAGE     "Displays the urgency measure of a task"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 268c8529f..7fe6a4123 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
 #define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
-#define STRING_CMD_URGENCY_RESULT    "zadanie {1} ważność {2}"
-#define STRING_CMD_URGENCY_USAGE     "Wyświetla pomiar ważności zadania"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 71558dd87..ac4f63a09 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -42,8 +42,6 @@
 #define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
 #define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
-#define STRING_CMD_URGENCY_RESULT    "Tarefa {1} urgência {2}"
-#define STRING_CMD_URGENCY_USAGE     "Exibe o valor de urgência de uma tarefa"
 #define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"

From bd836d763c58a26d6887e6be08134936914af6ce Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:42:28 -0500
Subject: [PATCH 679/879] l10n: Eliminated STRING_CMD_EXEC_*

---
 src/commands/CmdExec.cpp | 3 +--
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 9925b50c1..4435d2297 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -28,7 +28,6 @@
 #include <CmdExec.h>
 #include <stdlib.h>
 #include <Context.h>
-#include <i18n.h>
 #include <shared.h>
 
 extern Context context;
@@ -38,7 +37,7 @@ CmdExec::CmdExec ()
 {
   _keyword               = "execute";
   _usage                 = "task          execute <external command>";
-  _description           = STRING_CMD_EXEC_USAGE;
+  _description           = "Executes external commands and scripts";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4b698e033..27861714b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
 #define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
-#define STRING_CMD_EXEC_USAGE        "Führt externe Befehle und Skripte aus"
 #define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e94bd7f5e..5640fad06 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_EXEC_USAGE        "Executes external commands and scripts"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d05da23c8..55143073c 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
 #define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
-#define STRING_CMD_EXEC_USAGE        "Lanĉas komandojn kaj skribojn eksternajn"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index f88ecdf69..4c7314d8d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
-#define STRING_CMD_EXEC_USAGE        "Ejecuta comandos y scripts externos"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 01102d543..2b387d09b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
 #define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
-#define STRING_CMD_EXEC_USAGE        "Lance les commandes et les scripts externes."
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 16becd04f..5532b2daf 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
 #define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
-#define STRING_CMD_EXEC_USAGE        "Esegue comandi e script esterni"
 #define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a8b9c482e..a5c53a165 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_EXEC_USAGE        "外部コマンドまたはスクリプトの実行"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 7fe6a4123..bcb5ea90f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
 #define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
-#define STRING_CMD_EXEC_USAGE        "Wykonuje zewnętrzne polecenia i skrypty"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ac4f63a09..f71372e3a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -34,7 +34,6 @@
 #define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
-#define STRING_CMD_EXEC_USAGE        "Executa comandos e scripts externos"
 #define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"

From a730a482c31a4b6127647c73f330a23edecac71c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:46:18 -0500
Subject: [PATCH 680/879] l10n: Eliminated STRING_CMD_*COMMANDS_*

---
 src/commands/CmdCommands.cpp | 6 +++---
 src/l10n/deu-DEU.h           | 3 ---
 src/l10n/eng-USA.h           | 3 ---
 src/l10n/epo-RUS.h           | 3 ---
 src/l10n/esp-ESP.h           | 3 ---
 src/l10n/fra-FRA.h           | 3 ---
 src/l10n/ita-ITA.h           | 3 ---
 src/l10n/jpn-JPN.h           | 3 ---
 src/l10n/pol-POL.h           | 3 ---
 src/l10n/por-PRT.h           | 3 ---
 10 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 3ad08e13e..87c7f41d4 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -42,7 +42,7 @@ CmdCommands::CmdCommands ()
 {
   _keyword               = "commands";
   _usage                 = "task          commands";
-  _description           = STRING_CMD_COMMANDS_USAGE;
+  _description           = "Generates a list of all commands, with behavior details";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -118,7 +118,7 @@ CmdCompletionCommands::CmdCompletionCommands ()
 {
   _keyword               = "_commands";
   _usage                 = "task          _commands";
-  _description           = STRING_CMD_HCOMMANDS_USAGE;
+  _description           = "Generates a list of all commands, for autocompletion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -153,7 +153,7 @@ CmdZshCommands::CmdZshCommands ()
 {
   _keyword               = "_zshcommands";
   _usage                 = "task          _zshcommands";
-  _description           = STRING_CMD_ZSHCOMMANDS_USAGE;
+  _description           = "Generates a list of all commands, for zsh autocompletion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 27861714b..5fd9fcc6a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
 #define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} Aufgaben"
 #define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
 #define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
-#define STRING_CMD_HCOMMANDS_USAGE   "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung"
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
 #define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Erzeugt eine Liste aller Befehle zur ZSH-Auto-Verfollständigung"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 5640fad06..c65ea4570 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 55143073c..3a4976576 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
 #define STRING_CMD_CUSTOM_COUNT      "1 tasko"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} taskoj"
 #define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
 #define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 4c7314d8d..7c93579d6 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Genera una lista de todos los comandos, con detalles de comportamiento"
 #define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarea"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tareas"
 #define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
-#define STRING_CMD_HCOMMANDS_USAGE   "Genera una lista de todos los comandos, con fines de auto-completado"
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
 #define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2b387d09b..f310f1f47 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
 #define STRING_CMD_CUSTOM_COUNT      "1 tâche"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tâches"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
 #define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5532b2daf..02ec6bdf9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} task"
 #define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
 #define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
-#define STRING_CMD_HCOMMANDS_USAGE   "Genera la lista di tutti i comandi, per autocompletamento"
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Genera la lista di tutti i comandi, per autocompletamento in zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a5c53a165..89ea6620f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_CUSTOM_COUNT      "1 task"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
 #define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bcb5ea90f..1da58b852 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
 #define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} zadań"
 #define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
 #define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
-#define STRING_CMD_HCOMMANDS_USAGE   "Generuje listę wszystkich poleceń dla funkcji autouzupełniania"
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
 #define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Generuje listę wszystkich poleceń dla funkcji autouzupełniania w powłoce zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f71372e3a..d00086a99 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,14 +27,12 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMMANDS_USAGE    "Generates a list of all commands, with behavior details"
 #define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
 #define STRING_CMD_CUSTOM_COUNT      "1 tarefa"
 #define STRING_CMD_CUSTOM_COUNTN     "{1} tarefas"
 #define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
 #define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
 #define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
-#define STRING_CMD_HCOMMANDS_USAGE   "Gera uma lista com todos os comandos, para fins de terminação automática"
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
@@ -45,7 +43,6 @@
 #define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
 #define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
-#define STRING_CMD_ZSHCOMMANDS_USAGE "Gera uma lista com todos os comandos, para terminação automática em zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"

From 28d60d8b10bbdc524956088b15d384b457928b84 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:51:10 -0500
Subject: [PATCH 681/879] l10n: Eliminated STRING_CMD_ZSHATTS_USAGE

---
 src/commands/CmdAttributes.cpp | 4 +---
 src/l10n/deu-DEU.h             | 1 -
 src/l10n/eng-USA.h             | 1 -
 src/l10n/epo-RUS.h             | 1 -
 src/l10n/esp-ESP.h             | 1 -
 src/l10n/fra-FRA.h             | 1 -
 src/l10n/ita-ITA.h             | 1 -
 src/l10n/jpn-JPN.h             | 1 -
 src/l10n/pol-POL.h             | 1 -
 src/l10n/por-PRT.h             | 1 -
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 489112f60..4abc53a9d 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -28,10 +28,8 @@
 #include <CmdAttributes.h>
 #include <sstream>
 #include <algorithm>
-#include <stdlib.h>
 #include <Context.h>
 #include <Command.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -40,7 +38,7 @@ CmdZshAttributes::CmdZshAttributes ()
 {
   _keyword               = "_zshattributes";
   _usage                 = "task          _zshattributes";
-  _description           = STRING_CMD_ZSHATTS_USAGE;
+  _description           = "Generates a list of all attributes, for zsh autocompletion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 5fd9fcc6a..df02f6066 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
-#define STRING_CMD_ZSHATTS_USAGE     "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index c65ea4570..29cc07a3a 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 3a4976576..636d51c87 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 7c93579d6..e5d76719e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
-#define STRING_CMD_ZSHATTS_USAGE     "Genera una lista de todos los atributos, con fines de auto-completado zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f310f1f47..7e3d3f259 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 02ec6bdf9..99cf50fee 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 89ea6620f..416d7ae12 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 1da58b852..dfbfffe1c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
-#define STRING_CMD_ZSHATTS_USAGE     "Generates a list of all attributes, for zsh autocompletion purposes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d00086a99..24ade6d88 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -42,7 +42,6 @@
 #define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
 #define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
-#define STRING_CMD_ZSHATTS_USAGE     "Gera uma lista de todos os atributos, para terminação automática em zsh"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"

From 2098b0166f08fcc1cbca27abf7a56d813cb48e17 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:55:07 -0500
Subject: [PATCH 682/879] l10n: Eliminated STRING_CMD_CUSTOM_*

---
 src/commands/CmdCustom.cpp | 10 +++++-----
 src/l10n/deu-DEU.h         |  5 -----
 src/l10n/eng-USA.h         |  5 -----
 src/l10n/epo-RUS.h         |  5 -----
 src/l10n/esp-ESP.h         |  5 -----
 src/l10n/fra-FRA.h         |  5 -----
 src/l10n/ita-ITA.h         |  5 -----
 src/l10n/jpn-JPN.h         |  5 -----
 src/l10n/pol-POL.h         |  5 -----
 src/l10n/por-PRT.h         |  5 -----
 10 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index ba53b3dd2..ce173ef22 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -79,7 +79,7 @@ int CmdCustom::execute (std::string& output)
   auto labels = split (reportLabels, ',');
 
   if (columns.size () != labels.size () && labels.size () != 0)
-    throw format (STRING_CMD_CUSTOM_MISMATCH, _keyword);
+    throw format ("There are different numbers of columns and labels for report '{1}'.", _keyword);
 
   auto sortOrder = split (reportSort, ',');
   if (sortOrder.size () != 0 &&
@@ -214,15 +214,15 @@ int CmdCustom::execute (std::string& output)
     if (context.verbose ("affected"))
     {
       out << (filtered.size () == 1
-                ? STRING_CMD_CUSTOM_COUNT
-                : format (STRING_CMD_CUSTOM_COUNTN, filtered.size ()));
+                ?  "1 task"
+                : format ("{1} tasks", filtered.size ()));
 
       if (maxrows && maxrows < (int)filtered.size ())
-        out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows);
+        out << ", " << format ("{1} shown", maxrows);
 
       if (maxlines && maxlines < (int)filtered.size ())
         out << ", "
-            << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header);
+            << format ("truncated to {1} lines", maxlines - table_header);
 
       out << '\n';
     }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index df02f6066..7dc93ee78 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
-#define STRING_CMD_CUSTOM_COUNT      "1 Aufgabe"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} Aufgaben"
-#define STRING_CMD_CUSTOM_MISMATCH   "Die Anzahl von Spalten und Beschriftungen für Report '{1}' unterscheidet sich."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} gezeigt"
-#define STRING_CMD_CUSTOM_TRUNCATED  "auf {1} Zeilen gekürzt"
 #define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
 #define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 29cc07a3a..02c17db26 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 636d51c87..d70e48b97 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
-#define STRING_CMD_CUSTOM_COUNT      "1 tasko"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} taskoj"
-#define STRING_CMD_CUSTOM_MISMATCH   "La nombroj de kolumnoj kaj de siaj titoloj ne kongruas por raporto '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} montritaj"
-#define STRING_CMD_CUSTOM_TRUNCATED  "stumpigis al {1} vicojn"
 #define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
 #define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e5d76719e..a7a0c4c3f 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
-#define STRING_CMD_CUSTOM_COUNT      "1 tarea"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tareas"
-#define STRING_CMD_CUSTOM_MISMATCH   "Hay diferente número de columnas y etiquetas para el informe '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrada(s)"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} líneas"
 #define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
 #define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7e3d3f259..bba2dd975 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
-#define STRING_CMD_CUSTOM_COUNT      "1 tâche"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tâches"
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} affichées"
-#define STRING_CMD_CUSTOM_TRUNCATED  "tronquées sur {1} lignes"
 #define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
 #define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
 #define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 99cf50fee..81172967a 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} task"
-#define STRING_CMD_CUSTOM_MISMATCH   "Differente numero di colonne ed etichette per il report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} mostrato"
-#define STRING_CMD_CUSTOM_TRUNCATED  "troncato alla linea {1}"
 #define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
 #define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
 #define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 416d7ae12..290693ccb 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_CUSTOM_COUNT      "1 task"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tasks"
-#define STRING_CMD_CUSTOM_MISMATCH   "There are different numbers of columns and labels for report '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} shown"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncated to {1} lines"
 #define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
 #define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
 #define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index dfbfffe1c..bb838e32e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
-#define STRING_CMD_CUSTOM_COUNT      "1 zadanie"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} zadań"
-#define STRING_CMD_CUSTOM_MISMATCH   "Liczba kolumn i nagłówków nie zgadza się dla raportu '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} pokazanych"
-#define STRING_CMD_CUSTOM_TRUNCATED  "przycięte do {1} linii"
 #define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
 #define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
 #define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 24ade6d88..2a8b91f84 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,11 +28,6 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
-#define STRING_CMD_CUSTOM_COUNT      "1 tarefa"
-#define STRING_CMD_CUSTOM_COUNTN     "{1} tarefas"
-#define STRING_CMD_CUSTOM_MISMATCH   "O número de colunas e de rótulos não é o mesmo no relatório '{1}'."
-#define STRING_CMD_CUSTOM_SHOWN      "{1} visiveis"
-#define STRING_CMD_CUSTOM_TRUNCATED  "truncado a {1} linhas"
 #define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
 #define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"

From 0339feecda055b6c57fb07764d0b4cb6ffbe0221 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 12:59:43 -0500
Subject: [PATCH 683/879] l10n: Eliminated STRING_CMD_*IDS_*

---
 src/commands/CmdIDs.cpp | 13 ++++++-------
 src/l10n/deu-DEU.h      |  6 ------
 src/l10n/eng-USA.h      |  6 ------
 src/l10n/epo-RUS.h      |  6 ------
 src/l10n/esp-ESP.h      |  6 ------
 src/l10n/fra-FRA.h      |  6 ------
 src/l10n/ita-ITA.h      |  6 ------
 src/l10n/jpn-JPN.h      |  6 ------
 src/l10n/pol-POL.h      |  6 ------
 src/l10n/por-PRT.h      |  6 ------
 10 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index aab231093..bf0d608d7 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -32,7 +32,6 @@
 #include <Filter.h>
 #include <main.h>
 #include <shared.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -43,7 +42,7 @@ CmdIDs::CmdIDs ()
 {
   _keyword               = "ids";
   _usage                 = "task <filter> ids";
-  _description           = STRING_CMD_IDS_USAGE_RANGE;
+  _description           = "Shows the IDs of matching tasks, as a range";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
@@ -136,7 +135,7 @@ CmdCompletionIds::CmdCompletionIds ()
 {
   _keyword               = "_ids";
   _usage                 = "task <filter> _ids";
-  _description           = STRING_CMD_IDS_USAGE_LIST;
+  _description           = "Shows the IDs of matching tasks, in the form of a list";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
@@ -174,7 +173,7 @@ CmdZshCompletionIds::CmdZshCompletionIds ()
 {
   _keyword               = "_zshids";
   _usage                 = "task <filter> _zshids";
-  _description           = STRING_CMD_IDS_USAGE_ZSH;
+  _description           = "Shows the IDs and descriptions of matching tasks";
   _read_only             = true;
   _displays_id           = true;
   _needs_gc              = true;
@@ -214,7 +213,7 @@ CmdUUIDs::CmdUUIDs ()
 {
   _keyword               = "uuids";
   _usage                 = "task <filter> uuids";
-  _description           = STRING_CMD_UUIDS_USAGE_RANGE;
+  _description           = "Shows the UUIDs of matching tasks, as a comma-separated list";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -250,7 +249,7 @@ CmdCompletionUuids::CmdCompletionUuids ()
 {
   _keyword               = "_uuids";
   _usage                 = "task <filter> _uuids";
-  _description           = STRING_CMD_UUIDS_USAGE_LIST;
+  _description           = "Shows the UUIDs of matching tasks, as a list";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
@@ -286,7 +285,7 @@ CmdZshCompletionUuids::CmdZshCompletionUuids ()
 {
   _keyword               = "_zshuuids";
   _usage                 = "task <filter> _zshuuids";
-  _description           = STRING_CMD_UUIDS_USAGE_ZSH;
+  _description           = "Shows the UUIDs and descriptions of matching tasks";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7dc93ee78..c36aaf1ed 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
-#define STRING_CMD_IDS_USAGE_LIST    "Zeigt die IDs passender Aufgaben als Liste"
-#define STRING_CMD_IDS_USAGE_RANGE   "Zeigt die IDs passender Aufgaben als Folge"
-#define STRING_CMD_IDS_USAGE_ZSH     "Zeigt die IDs und Beschreibungen passender Aufgaben"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
 #define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Zeigt die UUIDs passender Aufgaben als Liste"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Zeigt die UUIDs passender Aufgaben als kommaseparierte Liste"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Zeigt die UUIDs und Beschreibungen passender Aufgaben"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 02c17db26..4ff3388c2 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
-#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
-#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d70e48b97..32ee896ab 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
-#define STRING_CMD_IDS_USAGE_LIST    "Montras la identigilon de ĉia kongruanta tasko, kiel listo"
-#define STRING_CMD_IDS_USAGE_RANGE   "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo"
-#define STRING_CMD_IDS_USAGE_ZSH     "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
 #define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Montras la UUID-identigilon de ĉia kongruanta tasko, en forma de listo perkome disigita"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Montras la UUID-identigilon kaj la priskribojn de ĉia kongruanta tasko"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a7a0c4c3f..2c62a00fe 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
-#define STRING_CMD_IDS_USAGE_LIST    "Muestra los IDs de las tareas coincidentes, en forma de lista"
-#define STRING_CMD_IDS_USAGE_RANGE   "Muestra los IDs de las tareas coincidentes, como un rango"
-#define STRING_CMD_IDS_USAGE_ZSH     "Muestra los IDs y descripciones de las tareas coincidentes"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
 #define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Muestra los UUIDs de las tareas coincidentes, como una lista"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Muestra los UUIDs de las tareas coincidentes, como una lista separada por comas"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Muestra los UUIDs y descripciones de las tareas coincidentes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index bba2dd975..7612193be 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
-#define STRING_CMD_IDS_USAGE_LIST    "Affiche les IDs des tâches correspondantes, sous forme de liste"
-#define STRING_CMD_IDS_USAGE_RANGE   "Affiche les IDs des tâches correspondantes, comme une plage"
-#define STRING_CMD_IDS_USAGE_ZSH     "Affiche les IDs  et les descriptions des tâches correspondantes"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
 #define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Affiche le UUIDs des tâches correspondantes, comme une liste"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Affiche le UUIDs des tâches correspondantes, comme une liste séparée par des virgules"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Affiche le UUIDs et les descriptions des tâches correspondantes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 81172967a..d919aa87f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
-#define STRING_CMD_IDS_USAGE_LIST    "Mostra gli ID dei task corrispondenti, in forma di lista"
-#define STRING_CMD_IDS_USAGE_RANGE   "Mostra gli ID dei task corrispondenti, come intervallo"
-#define STRING_CMD_IDS_USAGE_ZSH     "Mostra gli ID e le descrizioni dei task corrispondenti"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
 #define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Mostra gli UUID dei task corrispondenti, come lista"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Mostra gli UUID dei task corrispondenti, come lista separata da virgole"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Mostra gli UUID e le descrizioni dei task corrispondenti"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 290693ccb..4c74ddd74 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
-#define STRING_CMD_IDS_USAGE_LIST    "Shows the IDs of matching tasks, in the form of a list"
-#define STRING_CMD_IDS_USAGE_RANGE   "Shows the IDs of matching tasks, as a range"
-#define STRING_CMD_IDS_USAGE_ZSH     "Shows the IDs and descriptions of matching tasks"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Shows the UUIDs of matching tasks, as a list"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Shows the UUIDs of matching tasks, as a comma-separated list"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Shows the UUIDs and descriptions of matching tasks"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index bb838e32e..e3ae24789 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
-#define STRING_CMD_IDS_USAGE_LIST    "Pokazuje IDki pasujących zadań, w formie listy"
-#define STRING_CMD_IDS_USAGE_RANGE   "Pokazuje IDki pasujących zadań, w formie zakresu"
-#define STRING_CMD_IDS_USAGE_ZSH     "Pokazuje IDki i opisy pasujących zadań"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
 #define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Pokazuje UUID pasujących zadań, w formie listy"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Pokazuje UUID pasujących zadań, w formie listy rozdzilonej przecinkami"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Pokazuje UUID i opis pasujących zadań"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 2a8b91f84..a3dd6d191 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,15 +28,9 @@
 #define INCLUDED_STRINGS
 
 #define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
-#define STRING_CMD_IDS_USAGE_LIST    "Exibe em formato de lista, os IDs das tarefas correspondentes"
-#define STRING_CMD_IDS_USAGE_RANGE   "Exibe como intervalo, os IDs das tarefas correspondentes"
-#define STRING_CMD_IDS_USAGE_ZSH     "Exibe os IDs e descrições das tarefas correspondentes"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
 #define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
-#define STRING_CMD_UUIDS_USAGE_LIST  "Exibe como lista, os UUIDs das tarefas correspondentes"
-#define STRING_CMD_UUIDS_USAGE_RANGE "Exibe como lista separada por vírgulas, os UUIDs das tarefas correspondentes"
-#define STRING_CMD_UUIDS_USAGE_ZSH   "Exibe os UUIDs e descrições das tarefas correspondentes"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"

From 5dd5de0d76a454e2e0a7062428bc4e6d1664ac64 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 13:01:39 -0500
Subject: [PATCH 684/879] l10n: Eliminated STRING_CMD_COMTAGS_USAGE

---
 src/commands/CmdTags.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index a6bfed11b..db787b9d9 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -145,7 +145,7 @@ CmdCompletionTags::CmdCompletionTags ()
 {
   _keyword               = "_tags";
   _usage                 = "task <filter> _tags";
-  _description           = STRING_CMD_COMTAGS_USAGE;
+  _description           = "Shows only a list of all tags used, for autocompletion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = true;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index c36aaf1ed..b7f46f615 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Listet ausschließlich alle genutzten Schlagwörter zur Auto-Vervollständigung"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
 #define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 4ff3388c2..b73eae640 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 32ee896ab..e6e424371 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Montras sole listo de ĉia uzata etikedo, por motivo memkompletada"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
 #define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 2c62a00fe..aa140a3b2 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Muestra una lista de todas las marcas (solo nombres) en uso, con fines de auto-completado"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
 #define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7612193be..8c4760138 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Affiche uniquement une liste des étiquettes utilisées, pour la complétion"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
 #define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d919aa87f..5ebe594b9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Mostra solo una lista dei tag utilizzati, per autocompletamento"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
 #define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4c74ddd74..25d52210f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Shows only a list of all tags used, for autocompletion purposes"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
 #define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e3ae24789..0672f6931 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Pokazuje listę użytych tagów dla celów autouzupełniania"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
 #define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a3dd6d191..c4b39c93d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_COMTAGS_USAGE     "Exibe apenas a lista de todas as marcas em uso, para fins de terminação automática"
 #define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
 #define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"

From 5112479372afbee41e80a2556fe05fe1d03292d8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 13:03:57 -0500
Subject: [PATCH 685/879] l10n: Eliminated STRING_CMD_UDAS_*

---
 src/commands/CmdUDAs.cpp | 4 ++--
 src/l10n/deu-DEU.h       | 2 --
 src/l10n/eng-USA.h       | 2 --
 src/l10n/epo-RUS.h       | 2 --
 src/l10n/esp-ESP.h       | 2 --
 src/l10n/fra-FRA.h       | 2 --
 src/l10n/ita-ITA.h       | 2 --
 src/l10n/jpn-JPN.h       | 2 --
 src/l10n/pol-POL.h       | 2 --
 src/l10n/por-PRT.h       | 2 --
 10 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index c2add026e..2b2fb70f1 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -44,7 +44,7 @@ CmdUDAs::CmdUDAs ()
 {
   _keyword               = "udas";
   _usage                 = "task          udas";
-  _description           = STRING_CMD_UDAS_USAGE;
+  _description           = "Shows all the defined UDA details";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -176,7 +176,7 @@ CmdCompletionUDAs::CmdCompletionUDAs ()
 {
   _keyword               = "_udas";
   _usage                 = "task          _udas";
-  _description           = STRING_CMD_UDAS_COMPL_USAGE;
+  _description           = "Shows the defined UDAs for completion purposes";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b7f46f615..1134937dd 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Zeigt festgelegte UDAs zur Autovervollständigung"
-#define STRING_CMD_UDAS_USAGE        "Zeigt alle festgelegten Eigenschaften von UDAs"
 #define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index b73eae640..e78c9cec1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
-#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e6e424371..f78e8b2ea 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Montras ĉian definitan UDA, por motivo memkompletada"
-#define STRING_CMD_UDAS_USAGE        "Montras la detalojn de ĉia definita UDA"
 #define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index aa140a3b2..27a63dc66 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Muestra los UDAs definidos con fines de terminación"
-#define STRING_CMD_UDAS_USAGE        "Muestra detalles de todos los UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8c4760138..f9567692f 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Affiche les ADUs définis, pour la complétion"
-#define STRING_CMD_UDAS_USAGE        "Affiche les détails de tous les ADUs définis"
 #define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 5ebe594b9..64140dc85 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Mostra gli UDA definiti per il completamento"
-#define STRING_CMD_UDAS_USAGE        "Mostra tutti i dettagli degli UDA definiti"
 #define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 25d52210f..74663409c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Shows the defined UDAs for completion purposes"
-#define STRING_CMD_UDAS_USAGE        "Shows all the defined UDA details"
 #define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0672f6931..0efe7b6ad 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Pokazuje zdefiniowane UDA w celach autouzupełniania"
-#define STRING_CMD_UDAS_USAGE        "Pokazuje zdefiniowane UDA"
 #define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c4b39c93d..75126c42d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UDAS_COMPL_USAGE  "Exibe os UDAs definidos para fins de terminação automática"
-#define STRING_CMD_UDAS_USAGE        "Exibe os detalhes de todas os UDA definidos"
 #define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"

From 247355f15b11614537e3c8fa5b46b2845862d155 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 13:06:07 -0500
Subject: [PATCH 686/879] l10n: Eliminated STRING_CMD_UNDO_*

---
 src/commands/CmdUndo.cpp | 4 +---
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index c2bd3122a..0018da368 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -27,8 +27,6 @@
 #include <cmake.h>
 #include <CmdUndo.h>
 #include <Context.h>
-#include <Filter.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -37,7 +35,7 @@ CmdUndo::CmdUndo ()
 {
   _keyword               = "undo";
   _usage                 = "task          undo";
-  _description           = STRING_CMD_UNDO_USAGE;
+  _description           = "Reverts the most recent change to a task";
   _read_only             = false;
   _displays_id           = false;
   _needs_gc              = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1134937dd..f29748faa 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Macht die letzte Änderung an einer Aufgabe Rückgängig"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e78c9cec1..6fc294c6e 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index f78e8b2ea..cd95d576d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Malfaras la plej malfrua modifado al tasko"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 27a63dc66..3a68fbfe2 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Revierte el cambio más reciente a una tarea"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f9567692f..a3449dbed 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Annule les changements les plus récents sur une tâche"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 64140dc85..2124279e1 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Ritorna alla più recente modifica di un task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 74663409c..6ad155cba 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Reverts the most recent change to a task"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0efe7b6ad..d3a9e7b9f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Odwraca ostatnią zmianę w zadaniu"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 75126c42d..1b646404c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_CMD_UNDO_USAGE        "Reverte a mais recente modificação a uma tarefa"
 #define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
 #define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
 #define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"

From c66e8917c8256b8deda55cb49518ac460116e1a3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 13:12:09 -0500
Subject: [PATCH 687/879] l10n: Eliminated some STRING_COLUMN_EXAMPLES_*

---
 src/columns/ColDescription.cpp | 13 ++++++-------
 src/l10n/deu-DEU.h             |  5 -----
 src/l10n/eng-USA.h             |  5 -----
 src/l10n/epo-RUS.h             |  5 -----
 src/l10n/esp-ESP.h             |  5 -----
 src/l10n/fra-FRA.h             |  5 -----
 src/l10n/ita-ITA.h             |  5 -----
 src/l10n/jpn-JPN.h             |  5 -----
 src/l10n/pol-POL.h             |  5 -----
 src/l10n/por-PRT.h             |  5 -----
 10 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 116dc78fb..98187b798 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -33,7 +33,6 @@
 #include <format.h>
 #include <utf8.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -42,7 +41,7 @@ ColumnDescription::ColumnDescription ()
 {
   _name       = "description";
   _style      = "combined";
-  _label      = STRING_COLUMN_LABEL_DESC;
+  _label      = "Description";
   _modifiable = true;
 
   _styles     = {"combined",
@@ -57,11 +56,11 @@ ColumnDescription::ColumnDescription ()
     _dateformat = context.config.get ("dateformat");
 
   std::string t  = Datetime ().toString (_dateformat);
-  std::string d  = STRING_COLUMN_EXAMPLES_DESC;
-  std::string a1 = STRING_COLUMN_EXAMPLES_ANNO1;
-  std::string a2 = STRING_COLUMN_EXAMPLES_ANNO2;
-  std::string a3 = STRING_COLUMN_EXAMPLES_ANNO3;
-  std::string a4 = STRING_COLUMN_EXAMPLES_ANNO4;
+  std::string d  = "Move your clothes down on to the lower peg";
+  std::string a1 = "Immediately before your lunch";
+  std::string a2 = "If you are playing in the match this afternoon";
+  std::string a3 = "Before you write your letter home";
+  std::string a4 = "If you're not getting your hair cut";
 
   _examples = {d + "\n  " + t + ' ' + a1
                  + "\n  " + t + ' ' + a2
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index f29748faa..4a28b5255 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Direkt vor dem Mittagessen"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Wenn Du heute Nachmittag in der Partie mitspielst"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Bevor Du den Brief nach Hause schreibst"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Wenn Dein Haar nicht geschnitten wird"
-#define STRING_COLUMN_EXAMPLES_DESC  "Bekleidung einen Haken tiefer hängen"
 #define STRING_COLUMN_EXAMPLES_IND   "  Haus.Garten"
 #define STRING_COLUMN_EXAMPLES_PAR   "Haus"
 #define STRING_COLUMN_EXAMPLES_PROJ  "Haus.Garten"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 6fc294c6e..994126458 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
 #define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
 #define STRING_COLUMN_EXAMPLES_PAR   "home"
 #define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index cd95d576d..87d0e0a03 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste antaŭ tagmanĝi"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vi ludos en la maĉo hodiaŭ posttagmeze"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antaŭ skribi poŝtaĵon hejmen"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se vi ne faŝonas al si la hararon"
-#define STRING_COLUMN_EXAMPLES_DESC  "Transloki vian robon suben al la fundan kejlon"
 #define STRING_COLUMN_EXAMPLES_IND   "  domo.ĝardeno"
 #define STRING_COLUMN_EXAMPLES_PAR   "domo"
 #define STRING_COLUMN_EXAMPLES_PROJ  "domo.ĝardeno"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 3a68fbfe2..77a5a6ae0 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Inmediatamente antes de comer"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Si juegas en el partido de esta tarde"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de que escribas a casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Si no te estás cortando el pelo"
-#define STRING_COLUMN_EXAMPLES_DESC  "Mueve tu ropa a la percha de abajo"
 #define STRING_COLUMN_EXAMPLES_IND   "  casa.jardín"
 #define STRING_COLUMN_EXAMPLES_PAR   "casa"
 #define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardín"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index a3449dbed..59b47de62 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Juste avant votre repas"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
 #define STRING_COLUMN_EXAMPLES_IND   "  maison.jardin"
 #define STRING_COLUMN_EXAMPLES_PAR   "maison"
 #define STRING_COLUMN_EXAMPLES_PROJ  "maison.jardin"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 2124279e1..457116a38 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediatamente prima di pranzo"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se si sta giocando la partita questo pomeriggio"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Prima di scrivere la lettera a casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se non si va a tagliare i capelli"
-#define STRING_COLUMN_EXAMPLES_DESC  "Spostare i vestiti sul gancio più basso"
 #define STRING_COLUMN_EXAMPLES_IND   "  casa.giardino"
 #define STRING_COLUMN_EXAMPLES_PAR   "casa"
 #define STRING_COLUMN_EXAMPLES_PROJ  "casa.giardino"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6ad155cba..460f1893b 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Immediately before your lunch"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "If you are playing in the match this afternoon"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Before you write your letter home"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "If you're not getting your hair cut"
-#define STRING_COLUMN_EXAMPLES_DESC  "Move your clothes down on to the lower peg"
 #define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
 #define STRING_COLUMN_EXAMPLES_PAR   "home"
 #define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index d3a9e7b9f..e3415cdaa 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Odrazu przed obiadem"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Jesli grasz mecz tego popołudnia"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Przed napisaniem listu do domu"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Jeśli nie udajesz się do fryzjera"
-#define STRING_COLUMN_EXAMPLES_DESC  "Przewieś swoje ubrania na dolny wieszak"
 #define STRING_COLUMN_EXAMPLES_IND   "  dom.ogród"
 #define STRING_COLUMN_EXAMPLES_PAR   "dom"
 #define STRING_COLUMN_EXAMPLES_PROJ  "dom.ogród"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1b646404c..4094aec8f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,11 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_ANNO1 "Imediatamente antes do almoço"
-#define STRING_COLUMN_EXAMPLES_ANNO2 "Se vais jogar no torneio esta tarde"
-#define STRING_COLUMN_EXAMPLES_ANNO3 "Antes de escrever para casa"
-#define STRING_COLUMN_EXAMPLES_ANNO4 "Se não vais cortar o cabelo"
-#define STRING_COLUMN_EXAMPLES_DESC  "Mover as roupas para a prateleira mais baixa"
 #define STRING_COLUMN_EXAMPLES_IND   "  casa.jardim"
 #define STRING_COLUMN_EXAMPLES_PAR   "casa"
 #define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardim"

From 1f833dcae2dd22f081b90b16e802bb458c2d0fad Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 13:15:20 -0500
Subject: [PATCH 688/879] l10n: Eliminated STRING_COLUMN_LABEL_DESC

---
 src/commands/CmdCommands.cpp | 2 +-
 src/commands/CmdInfo.cpp     | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 1 -
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 11 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 87c7f41d4..4fe07ab4c 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -67,7 +67,7 @@ int CmdCommands::execute (std::string& output)
   view.add (STRING_COLUMN_LABEL_FILTER,   false);
   view.add (STRING_COLUMN_LABEL_MODS,     false);
   view.add (STRING_COLUMN_LABEL_MISC,     false);
-  view.add (STRING_COLUMN_LABEL_DESC);
+  view.add ("Description");
   view.leftMargin (context.config.getInteger ("indent.report"));
   view.extraPadding (context.config.getInteger ("row.padding"));
   view.intraPadding (context.config.getInteger ("column.padding"));
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index a91b3eac8..e2120e9fd 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -132,7 +132,7 @@ int CmdInfo::execute (std::string& output)
                    + anno.second;
 
     row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_DESC);
+    view.set (row, 0, "Description");
     view.set (row, 1, description, c);
 
     // status
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4a28b5255..600517b3d 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Anzahl"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
-#define STRING_COLUMN_LABEL_DESC     "Beschreibung"
 #define STRING_COLUMN_LABEL_DUE      "Fällig"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 994126458..360053693 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
-#define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 87d0e0a03..a16c4b077 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Nombro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
-#define STRING_COLUMN_LABEL_DESC     "Priskribo"
 #define STRING_COLUMN_LABEL_DUE      "Datlimo"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 77a5a6ae0..74772f6e6 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Recuento"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
-#define STRING_COLUMN_LABEL_DESC     "Descripción"
 #define STRING_COLUMN_LABEL_DUE      "Vencimiento"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 59b47de62..d73166d18 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Temps restant"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
-#define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Échéance"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 457116a38..90d0e3610 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Conteggio"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
-#define STRING_COLUMN_LABEL_DESC     "Descrizione"
 #define STRING_COLUMN_LABEL_DUE      "Scadenza"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 460f1893b..9e9a0671e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
-#define STRING_COLUMN_LABEL_DESC     "Description"
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e3415cdaa..f98f3a9ae 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Ile"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
-#define STRING_COLUMN_LABEL_DESC     "Opis"
 #define STRING_COLUMN_LABEL_DUE      "Do"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 4094aec8f..a5cbe861c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -42,7 +42,6 @@
 #define STRING_COLUMN_LABEL_COUNT    "Contagem"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
-#define STRING_COLUMN_LABEL_DESC     "Descrição"
 #define STRING_COLUMN_LABEL_DUE      "Vence"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"

From d58184efa1ee1370add5176fa6b9c05b696987ee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 19:17:10 -0500
Subject: [PATCH 689/879] l10n: Eliminated STRING_COLUMN_EXAMPLES_*

---
 src/columns/ColProject.cpp | 6 +++---
 src/columns/ColTags.cpp    | 2 +-
 src/l10n/deu-DEU.h         | 4 ----
 src/l10n/eng-USA.h         | 4 ----
 src/l10n/epo-RUS.h         | 4 ----
 src/l10n/esp-ESP.h         | 4 ----
 src/l10n/fra-FRA.h         | 4 ----
 src/l10n/ita-ITA.h         | 4 ----
 src/l10n/jpn-JPN.h         | 4 ----
 src/l10n/pol-POL.h         | 4 ----
 src/l10n/por-PRT.h         | 4 ----
 11 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 1c6afc4a7..a68c22fe4 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -47,9 +47,9 @@ ColumnProject::ColumnProject ()
   _style     = "full";
   _label     = STRING_COLUMN_LABEL_PROJECT;
   _styles    = {"full", "parent", "indented"};
-  _examples  = {STRING_COLUMN_EXAMPLES_PROJ,
-                STRING_COLUMN_EXAMPLES_PAR,
-                STRING_COLUMN_EXAMPLES_IND};
+  _examples  = {"home.garden",
+                "home",
+                "  home.garden"};
   _hyphenate = context.config.getBoolean ("hyphenate");
 }
 
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 749c17075..91806a2a0 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -47,7 +47,7 @@ ColumnTags::ColumnTags ()
   _style     = "list";
   _label     = STRING_COLUMN_LABEL_TAGS;
   _styles    = {"list", "indicator", "count"};
-  _examples  = {STRING_COLUMN_EXAMPLES_TAGS,
+  _examples  = {"home @chore next",
                 context.config.get ("tag.indicator"),
                 "[2]"};
   _hyphenate = false;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 600517b3d..6442733e1 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  Haus.Garten"
-#define STRING_COLUMN_EXAMPLES_PAR   "Haus"
-#define STRING_COLUMN_EXAMPLES_PROJ  "Haus.Garten"
-#define STRING_COLUMN_EXAMPLES_TAGS  "Haus @Hausarbeit next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
 #define STRING_COLUMN_LABEL_AGE      "Alter"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 360053693..3b5d26320 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
-#define STRING_COLUMN_EXAMPLES_PAR   "home"
-#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a16c4b077..782da0bbf 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  domo.ĝardeno"
-#define STRING_COLUMN_EXAMPLES_PAR   "domo"
-#define STRING_COLUMN_EXAMPLES_PROJ  "domo.ĝardeno"
-#define STRING_COLUMN_EXAMPLES_TAGS  "domo @aĉo next"
 #define STRING_COLUMN_LABEL_ACTIVE   "Ak"
 #define STRING_COLUMN_LABEL_ADDED    "Kreita"
 #define STRING_COLUMN_LABEL_AGE      "Aĝo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 74772f6e6..40a0f7e02 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardín"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardín"
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @tarea"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_ADDED    "Añadida"
 #define STRING_COLUMN_LABEL_AGE      "Edad"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index d73166d18..d4801803b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  maison.jardin"
-#define STRING_COLUMN_EXAMPLES_PAR   "maison"
-#define STRING_COLUMN_EXAMPLES_PROJ  "maison.jardin"
-#define STRING_COLUMN_EXAMPLES_TAGS  "maison @routine next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
 #define STRING_COLUMN_LABEL_AGE      "Age"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 90d0e3610..456bf4af6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.giardino"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.giardino"
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @faccende next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
 #define STRING_COLUMN_LABEL_AGE      "Età"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 9e9a0671e..3ff733910 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  home.garden"
-#define STRING_COLUMN_EXAMPLES_PAR   "home"
-#define STRING_COLUMN_EXAMPLES_PROJ  "home.garden"
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f98f3a9ae..5a69a47ef 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  dom.ogród"
-#define STRING_COLUMN_EXAMPLES_PAR   "dom"
-#define STRING_COLUMN_EXAMPLES_PROJ  "dom.ogród"
-#define STRING_COLUMN_EXAMPLES_TAGS  "home @chore next"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Dodane"
 #define STRING_COLUMN_LABEL_AGE      "Wiek"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a5cbe861c..a44a8ff85 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_EXAMPLES_IND   "  casa.jardim"
-#define STRING_COLUMN_EXAMPLES_PAR   "casa"
-#define STRING_COLUMN_EXAMPLES_PROJ  "casa.jardim"
-#define STRING_COLUMN_EXAMPLES_TAGS  "casa @contas próxima"
 #define STRING_COLUMN_LABEL_ACTIVE   "A"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_ADDED    "Adicionada"
 #define STRING_COLUMN_LABEL_AGE      "Idade"

From 481958471441581dd2fad1db23cd10cf42490cc9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 19:21:48 -0500
Subject: [PATCH 690/879] l10n: Eliminated STRING_COLUMN_LABEL_ACTIVE,
 STRING_COLUMN_LABEL_STARTED

---
 src/columns/ColStart.cpp | 7 +++----
 src/l10n/deu-DEU.h       | 2 --
 src/l10n/eng-USA.h       | 2 --
 src/l10n/epo-RUS.h       | 2 --
 src/l10n/esp-ESP.h       | 2 --
 src/l10n/fra-FRA.h       | 2 --
 src/l10n/ita-ITA.h       | 2 --
 src/l10n/jpn-JPN.h       | 2 --
 src/l10n/pol-POL.h       | 2 --
 src/l10n/por-PRT.h       | 2 --
 10 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index eb27cd3a2..056873790 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -28,7 +28,6 @@
 #include <ColStart.h>
 #include <Context.h>
 #include <utf8.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -36,7 +35,7 @@ extern Context context;
 ColumnStart::ColumnStart ()
 {
   _name  = "start";
-  _label = STRING_COLUMN_LABEL_STARTED;
+  _label = "Started";
 
   _styles.push_back ("active");
   _examples.push_back (context.config.get ("active.indicator"));
@@ -49,8 +48,8 @@ void ColumnStart::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-  if (_style == "active" && _label == STRING_COLUMN_LABEL_STARTED)
-    _label = STRING_COLUMN_LABEL_ACTIVE;
+  if (_style == "active" && _label == "Started")
+    _label = "A";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6442733e1..6e007e7e4 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
 #define STRING_COLUMN_LABEL_AGE      "Alter"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -60,7 +59,6 @@
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Geplant"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
-#define STRING_COLUMN_LABEL_STARTED  "Begonnen"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3b5d26320..749cbc841 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Scheduled"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
-#define STRING_COLUMN_LABEL_STARTED  "Started"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 782da0bbf..d607ef114 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "Ak"
 #define STRING_COLUMN_LABEL_ADDED    "Kreita"
 #define STRING_COLUMN_LABEL_AGE      "Aĝo"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Fiksa"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Eko"
-#define STRING_COLUMN_LABEL_STARTED  "Ekita"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "Fn"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 40a0f7e02..b365c7668 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_ADDED    "Añadida"
 #define STRING_COLUMN_LABEL_AGE      "Edad"
 #define STRING_COLUMN_LABEL_CATEGORY "Categoría"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Programada"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_START    "Comienzo"
-#define STRING_COLUMN_LABEL_STARTED  "Comenzada"
 #define STRING_COLUMN_LABEL_STAT     "Est"
 #define STRING_COLUMN_LABEL_STATUS   "Estatus"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index d4801803b..8f281111a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
 #define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Planifiée"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Début"
-#define STRING_COLUMN_LABEL_STARTED  "Débutée"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Statut"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 456bf4af6..a3d57f4cd 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
 #define STRING_COLUMN_LABEL_AGE      "Età"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Fissato"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Inizio"
-#define STRING_COLUMN_LABEL_STARTED  "Iniziati"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 3ff733910..e85a1801a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Added"
 #define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Scheduled"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
-#define STRING_COLUMN_LABEL_STARTED  "Started"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5a69a47ef..857543407 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"
 #define STRING_COLUMN_LABEL_ADDED    "Dodane"
 #define STRING_COLUMN_LABEL_AGE      "Wiek"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Zaplanowane"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
-#define STRING_COLUMN_LABEL_STARTED  "Rozpoczęte"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a44a8ff85..19d4cf21b 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ACTIVE   "A"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_ADDED    "Adicionada"
 #define STRING_COLUMN_LABEL_AGE      "Idade"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
@@ -61,7 +60,6 @@
 #define STRING_COLUMN_LABEL_SCHED    "Agendado"
 #define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Início"
-#define STRING_COLUMN_LABEL_STARTED  "Iniciada"
 #define STRING_COLUMN_LABEL_STAT     "Es"
 #define STRING_COLUMN_LABEL_STATUS   "Estado"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|

From a7b915299accda6dd5a651596d4bd1bfce016f3a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 19:25:10 -0500
Subject: [PATCH 691/879] l10n: Eliminated STRING_COLUMN_LABEL_ADDED,
 STRING_COLUMN_LABEL_AGE

---
 src/columns/ColEntry.cpp | 7 +++----
 src/l10n/deu-DEU.h       | 2 --
 src/l10n/eng-USA.h       | 2 --
 src/l10n/epo-RUS.h       | 2 --
 src/l10n/esp-ESP.h       | 2 --
 src/l10n/fra-FRA.h       | 2 --
 src/l10n/ita-ITA.h       | 2 --
 src/l10n/jpn-JPN.h       | 2 --
 src/l10n/pol-POL.h       | 2 --
 src/l10n/por-PRT.h       | 2 --
 10 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index b1400e53b..64b87643e 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -26,14 +26,13 @@
 
 #include <cmake.h>
 #include <ColEntry.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnEntry::ColumnEntry ()
 {
   _name       = "entry";
   _modifiable = true;
-  _label      = STRING_COLUMN_LABEL_ADDED;
+  _label      = "Added";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -44,8 +43,8 @@ void ColumnEntry::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "age" &&
-      _label == STRING_COLUMN_LABEL_ADDED)
-    _label = STRING_COLUMN_LABEL_AGE;
+      _label == "Added")
+    _label = "Age";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 6e007e7e4..2e3019b97 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Hinzugefügt"
-#define STRING_COLUMN_LABEL_AGE      "Alter"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Spalten"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 749cbc841..f2728072c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Added"
-#define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index d607ef114..86518874e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Kreita"
-#define STRING_COLUMN_LABEL_AGE      "Aĝo"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b365c7668..e38e607a4 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Añadida"
-#define STRING_COLUMN_LABEL_AGE      "Edad"
 #define STRING_COLUMN_LABEL_CATEGORY "Categoría"
 #define STRING_COLUMN_LABEL_COLUMN   "Columnas"
 #define STRING_COLUMN_LABEL_COMMAND  "Comando"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8f281111a..67b7b672b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Ajoutée"
-#define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index a3d57f4cd..6e084134e 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Aggiunto"
-#define STRING_COLUMN_LABEL_AGE      "Età"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonna"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index e85a1801a..8b8fe629a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Added"
-#define STRING_COLUMN_LABEL_AGE      "Age"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 857543407..49875adaa 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Dodane"
-#define STRING_COLUMN_LABEL_AGE      "Wiek"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 19d4cf21b..6068ee6c6 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ADDED    "Adicionada"
-#define STRING_COLUMN_LABEL_AGE      "Idade"
 #define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colunas"
 #define STRING_COLUMN_LABEL_COMMAND  "Command"

From 42a9352f4873a58ba3db100367cf2d3d56f79203 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 19:35:23 -0500
Subject: [PATCH 692/879] l10n: Eliminated some column labels

---
 src/CLI2.cpp                 |  2 +-
 src/commands/CmdCommands.cpp | 19 +++++++++----------
 src/l10n/deu-DEU.h           |  9 ---------
 src/l10n/eng-USA.h           |  9 ---------
 src/l10n/epo-RUS.h           |  9 ---------
 src/l10n/esp-ESP.h           |  9 ---------
 src/l10n/fra-FRA.h           |  9 ---------
 src/l10n/ita-ITA.h           |  9 ---------
 src/l10n/jpn-JPN.h           |  9 ---------
 src/l10n/pol-POL.h           |  9 ---------
 src/l10n/por-PRT.h           |  9 ---------
 11 files changed, 10 insertions(+), 92 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index d8f383e0d..a4070c340 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -649,7 +649,7 @@ void CLI2::prepareFilter ()
     }
 
     if (combined.size ())
-      context.footnote (std::string (STRING_COLUMN_LABEL_FILTER) + ": " + combined);
+      context.footnote (std::string ("Filter: ") + combined);
   }
 }
 
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 4fe07ab4c..87b0de63b 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -33,7 +33,6 @@
 #include <Table.h>
 #include <Command.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -58,15 +57,15 @@ int CmdCommands::execute (std::string& output)
 {
   Table view;
   view.width (context.getWidth ());
-  view.add (STRING_COLUMN_LABEL_COMMAND);
-  view.add (STRING_COLUMN_LABEL_CATEGORY);
-  view.add (STRING_COLUMN_LABEL_RO,       false);
-  view.add (STRING_COLUMN_LABEL_SHOWS_ID, false);
-  view.add (STRING_COLUMN_LABEL_GC,       false);
-  view.add (STRING_COLUMN_LABEL_CONTEXT,  false);
-  view.add (STRING_COLUMN_LABEL_FILTER,   false);
-  view.add (STRING_COLUMN_LABEL_MODS,     false);
-  view.add (STRING_COLUMN_LABEL_MISC,     false);
+  view.add ("Command");
+  view.add ("Category");
+  view.add ("R/W",     false);
+  view.add ("ID",      false);
+  view.add ("GC",      false);
+  view.add ("Context", false);
+  view.add ("Filter",  false);
+  view.add ("Mods",    false);
+  view.add ("Misc",    false);
   view.add ("Description");
   view.leftMargin (context.config.getInteger ("indent.report"));
   view.extraPadding (context.config.getInteger ("row.padding"));
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 2e3019b97..3206db46f 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Spalten"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Erledigt"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Anzahl"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_EXAMPLES "Beispiele"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_RECUR_L  "Wiederholung"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Geplant"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index f2728072c..ae7873fd1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Completed"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_EXAMPLES "Example"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Scheduled"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 86518874e..dcec7e651 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Finita"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Nombro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
 #define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modifo"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Nomo"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orfa UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekto"
 #define STRING_COLUMN_LABEL_RECUR    "Reokazas"
 #define STRING_COLUMN_LABEL_RECUR_L  "Reokazas ĉiu"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Fiksa"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Eko"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index e38e607a4..9cb8ef36d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Categoría"
 #define STRING_COLUMN_LABEL_COLUMN   "Columnas"
-#define STRING_COLUMN_LABEL_COMMAND  "Comando"
 #define STRING_COLUMN_LABEL_COMPLETE "Completada"
-#define STRING_COLUMN_LABEL_CONTEXT  "Contexto"
 #define STRING_COLUMN_LABEL_COUNT    "Recuento"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo"
-#define STRING_COLUMN_LABEL_FILTER   "Filtro"
-#define STRING_COLUMN_LABEL_GC       "GC"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_MODIFY   "Modificable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_NAME     "Nombre"
 #define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Proyecto"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrencia"
-#define STRING_COLUMN_LABEL_RO       "R/W"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Programada"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_START    "Comienzo"
 #define STRING_COLUMN_LABEL_STAT     "Est"
 #define STRING_COLUMN_LABEL_STATUS   "Estatus"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 67b7b672b..03807e608 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Complétée"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Temps restant"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_EXAMPLES "Exemple"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Nom"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
 #define STRING_COLUMN_LABEL_PROJECT  "Projet"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Récurrence"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Planifiée"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Début"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Statut"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 6e084134e..b44912089 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colonna"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Completato"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Conteggio"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_EXAMPLES "Esempio"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Progetto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodico"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Fissato"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Inizio"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 8b8fe629a..17505f503 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Columns"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Completed"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_EXAMPLES "Example"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Scheduled"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 49875adaa..b0805549d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Ukończone"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Ile"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_EXAMPLES "Przykłady"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Nazwa"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodyczny"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Zaplanowane"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6068ee6c6..976bfddfb 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,11 +27,8 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_CATEGORY "Category"
 #define STRING_COLUMN_LABEL_COLUMN   "Colunas"
-#define STRING_COLUMN_LABEL_COMMAND  "Command"
 #define STRING_COLUMN_LABEL_COMPLETE "Concluída"
-#define STRING_COLUMN_LABEL_CONTEXT  "Context"
 #define STRING_COLUMN_LABEL_COUNT    "Contagem"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
@@ -39,24 +36,18 @@
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_EXAMPLES "Exemplo"
-#define STRING_COLUMN_LABEL_FILTER   "Filter"
-#define STRING_COLUMN_LABEL_GC       "GC"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MISC     "Misc"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_MODS     "Mods"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
 #define STRING_COLUMN_LABEL_PROJECT  "Projeto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodicidade"
-#define STRING_COLUMN_LABEL_RO       "R/W"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_SCHED    "Agendado"
-#define STRING_COLUMN_LABEL_SHOWS_ID "ID"
 #define STRING_COLUMN_LABEL_START    "Início"
 #define STRING_COLUMN_LABEL_STAT     "Es"
 #define STRING_COLUMN_LABEL_STATUS   "Estado"

From ce1c98ec52c985546425b102c581e375206d5caa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 19:43:05 -0500
Subject: [PATCH 693/879] l10n: Eliminated some column labels

---
 src/commands/CmdColumns.cpp | 17 +++++++----------
 src/commands/CmdUDAs.cpp    |  2 +-
 src/l10n/deu-DEU.h          |  6 ------
 src/l10n/eng-USA.h          |  6 ------
 src/l10n/epo-RUS.h          |  6 ------
 src/l10n/esp-ESP.h          |  6 ------
 src/l10n/fra-FRA.h          |  6 ------
 src/l10n/ita-ITA.h          |  6 ------
 src/l10n/jpn-JPN.h          |  6 ------
 src/l10n/pol-POL.h          |  6 ------
 src/l10n/por-PRT.h          |  6 ------
 11 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 6cbf4935b..1d7b0c076 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -32,11 +32,8 @@
 #include <Color.h>
 #include <shared.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
-#define STRING_CMD_COLUMNS_USAGE     "All supported columns and formatting styles"
-
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -44,7 +41,7 @@ CmdColumns::CmdColumns ()
 {
   _keyword               = "columns";
   _usage                 = "task          columns [substring]";
-  _description           = STRING_CMD_COLUMNS_USAGE;
+  _description           = "All supported columns and formatting styles";
   _read_only             = true;
   _displays_id           = false;
   _needs_gc              = false;
@@ -74,11 +71,11 @@ int CmdColumns::execute (std::string& output)
   // Render a list of column names, formats and examples.
   Table formats;
   formats.width (context.getWidth ());
-  formats.add (STRING_COLUMN_LABEL_COLUMN);
-  formats.add (STRING_COLUMN_LABEL_TYPE);
-  formats.add (STRING_COLUMN_LABEL_MODIFY);
-  formats.add (STRING_COLUMN_LABEL_STYLES);
-  formats.add (STRING_COLUMN_LABEL_EXAMPLES);
+  formats.add ("Columns");
+  formats.add ("Type");
+  formats.add ("Modifiable");
+  formats.add ("Supported Formats");
+  formats.add ("Example");
   setHeaderUnderline (formats);
 
   for (const auto& name : names)
@@ -94,7 +91,7 @@ int CmdColumns::execute (std::string& output)
         auto row = formats.addRow ();
         formats.set (row, 0, i == 0 ? name : "");
         formats.set (row, 1, i == 0 ? context.columns[name]->type () : "");
-        formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? STRING_COLUMN_LABEL_MODIFY : STRING_COLUMN_LABEL_NOMODIFY) : "");
+        formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? "Modifiable" : "Read Only") : "");
         formats.set (row, 3, styles[i] + (i == 0 ? "*" : ""));
         formats.set (row, 4, i < examples.size () ? examples[i] : "");
       }
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 2b2fb70f1..8e870217c 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -87,7 +87,7 @@ int CmdUDAs::execute (std::string& output)
     Table table;
     table.width (context.getWidth ());
     table.add (STRING_COLUMN_LABEL_UDA);
-    table.add (STRING_COLUMN_LABEL_TYPE);
+    table.add ("Type");
     table.add (STRING_COLUMN_LABEL_LABEL);
     table.add (STRING_COLUMN_LABEL_VALUES);
     table.add (STRING_COLUMN_LABEL_DEFAULT);
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 3206db46f..aad7de874 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Spalten"
 #define STRING_COLUMN_LABEL_COMPLETE "Erledigt"
 #define STRING_COLUMN_LABEL_COUNT    "Anzahl"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Fällig"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
-#define STRING_COLUMN_LABEL_EXAMPLES "Beispiele"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Name"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
@@ -60,10 +56,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Wiederholend"
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
-#define STRING_COLUMN_LABEL_STYLES   "Unterstützte Formate"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
 #define STRING_COLUMN_LABEL_TAGS     "Schlagworte"
-#define STRING_COLUMN_LABEL_TYPE     "Typ"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index ae7873fd1..8c2cac11d 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_COMPLETE "Completed"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
-#define STRING_COLUMN_LABEL_EXAMPLES "Example"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Name"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
-#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_TAGS     "Tags"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index dcec7e651..062132607 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
 #define STRING_COLUMN_LABEL_COMPLETE "Finita"
 #define STRING_COLUMN_LABEL_COUNT    "Nombro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Datlimo"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
-#define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo"
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modifo"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Nomo"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orfa UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekto"
 #define STRING_COLUMN_LABEL_RECUR    "Reokazas"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Reokazanta"
 #define STRING_COLUMN_LABEL_STAT_W   "At"
 #define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
-#define STRING_COLUMN_LABEL_STYLES   "Formaĝoj Subtenataj"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
 #define STRING_COLUMN_LABEL_TAGS     "Etikedoj"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
 #define STRING_COLUMN_LABEL_UDA      "Nomo"
 #define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 9cb8ef36d..837fb9621 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Columnas"
 #define STRING_COLUMN_LABEL_COMPLETE "Completada"
 #define STRING_COLUMN_LABEL_COUNT    "Recuento"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Vencimiento"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
-#define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_MODIFY   "Modificable"
 #define STRING_COLUMN_LABEL_NAME     "Nombre"
-#define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Proyecto"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Recurrentes"
 #define STRING_COLUMN_LABEL_STAT_W   "E"
 #define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
-#define STRING_COLUMN_LABEL_STYLES   "Formatos soportados"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_TAGS     "Marcas"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
 #define STRING_COLUMN_LABEL_UDA      "Nombre"
 #define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 03807e608..1e41524a1 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
 #define STRING_COLUMN_LABEL_COMPLETE "Complétée"
 #define STRING_COLUMN_LABEL_COUNT    "Temps restant"
 #define STRING_COLUMN_LABEL_DATE     "Date"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Échéance"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
-#define STRING_COLUMN_LABEL_EXAMPLES "Exemple"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Nom"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
 #define STRING_COLUMN_LABEL_PROJECT  "Projet"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Récurrente"
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "En attente"
-#define STRING_COLUMN_LABEL_STYLES   "Formats supportés"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
 #define STRING_COLUMN_LABEL_TAGS     "Étiquettes"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
 #define STRING_COLUMN_LABEL_UDA      "Nom"
 #define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b44912089..282156399 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Colonna"
 #define STRING_COLUMN_LABEL_COMPLETE "Completato"
 #define STRING_COLUMN_LABEL_COUNT    "Conteggio"
 #define STRING_COLUMN_LABEL_DATE     "Data"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Scadenza"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
-#define STRING_COLUMN_LABEL_EXAMPLES "Esempio"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
 #define STRING_COLUMN_LABEL_PROJECT  "Progetto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Periodicamente"
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
-#define STRING_COLUMN_LABEL_STYLES   "Formati Supportati"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_TAGS     "Tags"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
 #define STRING_COLUMN_LABEL_UDA      "Nome"
 #define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 17505f503..82acdedc4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Columns"
 #define STRING_COLUMN_LABEL_COMPLETE "Completed"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
-#define STRING_COLUMN_LABEL_EXAMPLES "Example"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Name"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
-#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_TAGS     "Tags"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b0805549d..140d3ece4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
 #define STRING_COLUMN_LABEL_COMPLETE "Ukończone"
 #define STRING_COLUMN_LABEL_COUNT    "Ile"
 #define STRING_COLUMN_LABEL_DATE     "Data"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Do"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
-#define STRING_COLUMN_LABEL_EXAMPLES "Przykłady"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Nazwa"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
 #define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Zależne"
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
-#define STRING_COLUMN_LABEL_STYLES   "Formaty"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_TAGS     "Tagi"
-#define STRING_COLUMN_LABEL_TYPE     "Typ"
 #define STRING_COLUMN_LABEL_UDA      "Nazwa"
 #define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 976bfddfb..5a84057f2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COLUMN   "Colunas"
 #define STRING_COLUMN_LABEL_COMPLETE "Concluída"
 #define STRING_COLUMN_LABEL_COUNT    "Contagem"
 #define STRING_COLUMN_LABEL_DATE     "Data"
@@ -35,13 +34,10 @@
 #define STRING_COLUMN_LABEL_DUE      "Vence"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
-#define STRING_COLUMN_LABEL_EXAMPLES "Exemplo"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
 #define STRING_COLUMN_LABEL_PROJECT  "Projeto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
@@ -61,10 +57,8 @@
 #define STRING_COLUMN_LABEL_STAT_RE  "Recorrentes"
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
-#define STRING_COLUMN_LABEL_STYLES   "Formatos Suportados"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_TAGS     "Marcas"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
 #define STRING_COLUMN_LABEL_UDA      "Nome"
 #define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"

From 1cd810f8f6c38bb34f27c4d417d7018c8edc9729 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:02:38 -0500
Subject: [PATCH 694/879] l10n: Eliminated some column labels

---
 src/columns/ColEnd.cpp | 3 +--
 src/l10n/deu-DEU.h     | 1 -
 src/l10n/eng-USA.h     | 1 -
 src/l10n/epo-RUS.h     | 1 -
 src/l10n/esp-ESP.h     | 1 -
 src/l10n/fra-FRA.h     | 1 -
 src/l10n/ita-ITA.h     | 1 -
 src/l10n/jpn-JPN.h     | 1 -
 src/l10n/pol-POL.h     | 1 -
 src/l10n/por-PRT.h     | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index e945e5d1b..db143d2d2 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -26,13 +26,12 @@
 
 #include <cmake.h>
 #include <ColEnd.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnEnd::ColumnEnd ()
 {
   _name  = "end";
-  _label = STRING_COLUMN_LABEL_COMPLETE;
+  _label = "Completed";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index aad7de874..769cb5a0a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Erledigt"
 #define STRING_COLUMN_LABEL_COUNT    "Anzahl"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 8c2cac11d..41b8a324d 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Completed"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 062132607..2c9f523d7 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Finita"
 #define STRING_COLUMN_LABEL_COUNT    "Nombro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 837fb9621..cf8c5d04e 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Completada"
 #define STRING_COLUMN_LABEL_COUNT    "Recuento"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 1e41524a1..8a90340f8 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Complétée"
 #define STRING_COLUMN_LABEL_COUNT    "Temps restant"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 282156399..b33a1450e 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Completato"
 #define STRING_COLUMN_LABEL_COUNT    "Conteggio"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 82acdedc4..ea97e49c4 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Completed"
 #define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 140d3ece4..b83ab3c5c 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Ukończone"
 #define STRING_COLUMN_LABEL_COUNT    "Ile"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 5a84057f2..d7401f40d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COMPLETE "Concluída"
 #define STRING_COLUMN_LABEL_COUNT    "Contagem"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"

From e6fd4efd087abb271600914e6853ce5880d7189d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:06:20 -0500
Subject: [PATCH 695/879] l10n: Eliminated some column labels

---
 src/columns/ColDue.cpp       | 2 +-
 src/columns/ColScheduled.cpp | 2 +-
 src/commands/CmdTags.cpp     | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 1 -
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 12 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 5a81f4d98..e448b55d9 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -44,7 +44,7 @@ void ColumnDue::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "countdown" && _label == STRING_COLUMN_LABEL_DUE)
-    _label = STRING_COLUMN_LABEL_COUNT;
+    _label = "Count";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 1c8f730e9..382a5ed52 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -43,7 +43,7 @@ void ColumnScheduled::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "countdown" && _label == STRING_COLUMN_LABEL_SCHED)
-    _label = STRING_COLUMN_LABEL_COUNT;
+    _label = "Count";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index db787b9d9..7ce7efeeb 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -92,7 +92,7 @@ int CmdTags::execute (std::string& output)
     Table view;
     view.width (context.getWidth ());
     view.add (STRING_COLUMN_LABEL_TAG);
-    view.add (STRING_COLUMN_LABEL_COUNT, false);
+    view.add ("Count", false);
     setHeaderUnderline (view);
 
     Color bold;
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 769cb5a0a..504f41085 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Anzahl"
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_DUE      "Fällig"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 41b8a324d..858800771 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_DUE      "Due"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 2c9f523d7..43037227e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Nombro"
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_DUE      "Datlimo"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index cf8c5d04e..b06f23035 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Recuento"
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_DUE      "Vencimiento"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8a90340f8..772201bfb 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Temps restant"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_DUE      "Échéance"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b33a1450e..bc4fffb5e 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Conteggio"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_DUE      "Scadenza"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ea97e49c4..cef8c4bf1 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Count"
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_DUE      "Due"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index b83ab3c5c..80cb88ab8 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Ile"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_DUE      "Do"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index d7401f40d..77cb53a5d 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_COUNT    "Contagem"
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_DUE      "Vence"

From 03ede837e41656a3d589a20c034b81ee28b2770e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:07:57 -0500
Subject: [PATCH 696/879] l10n: Eliminated some column labels

---
 src/columns/ColDue.cpp   | 5 ++---
 src/commands/CmdInfo.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 11 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index e448b55d9..68976c2d7 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -26,14 +26,13 @@
 
 #include <cmake.h>
 #include <ColDue.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDue::ColumnDue ()
 {
   _name       = "due";
   _modifiable = true;
-  _label      = STRING_COLUMN_LABEL_DUE;
+  _label      = "Due";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -43,7 +42,7 @@ void ColumnDue::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-  if (_style == "countdown" && _label == STRING_COLUMN_LABEL_DUE)
+  if (_style == "countdown" && _label == "Due")
     _label = "Count";
 }
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index e2120e9fd..42a2beee3 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -254,7 +254,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("due"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_DUE);
+      view.set (row, 0, "Due");
       view.set (row, 1, Datetime (task.get_date ("due")).toString (dateformat));
     }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 504f41085..1f3fb218a 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
-#define STRING_COLUMN_LABEL_DUE      "Fällig"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 858800771..408025af1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
-#define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 43037227e..63183fd4b 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
-#define STRING_COLUMN_LABEL_DUE      "Datlimo"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b06f23035..d6ce57533 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
-#define STRING_COLUMN_LABEL_DUE      "Vencimiento"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 772201bfb..5ed77cea7 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
-#define STRING_COLUMN_LABEL_DUE      "Échéance"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index bc4fffb5e..1c7647786 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
-#define STRING_COLUMN_LABEL_DUE      "Scadenza"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index cef8c4bf1..4121b6d54 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
-#define STRING_COLUMN_LABEL_DUE      "Due"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 80cb88ab8..c7a6e50c4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
-#define STRING_COLUMN_LABEL_DUE      "Do"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 77cb53a5d..adac90538 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
-#define STRING_COLUMN_LABEL_DUE      "Vence"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"

From df5cf4ff9c92b0bda5b67f4605d793177121a8bc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:09:51 -0500
Subject: [PATCH 697/879] l10n: Eliminated some column labels

---
 src/columns/ColScheduled.cpp | 4 ++--
 src/commands/CmdInfo.cpp     | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 1 -
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 11 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 382a5ed52..b585edd81 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -32,7 +32,7 @@
 ColumnScheduled::ColumnScheduled ()
 {
   _name  = "scheduled";
-  _label = STRING_COLUMN_LABEL_SCHED;
+  _label = "Scheduled";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@ void ColumnScheduled::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-  if (_style == "countdown" && _label == STRING_COLUMN_LABEL_SCHED)
+  if (_style == "countdown" && _label == "Scheduled")
     _label = "Count";
 }
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 42a2beee3..40723fcd8 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -238,7 +238,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("scheduled"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_SCHED);
+      view.set (row, 0, "Scheduled");
       view.set (row, 1, Datetime (task.get_date ("scheduled")).toString (dateformat));
     }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 1f3fb218a..a81e5ea10 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_RECUR_L  "Wiederholung"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Geplant"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 408025af1..8bbcfcde5 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 63183fd4b..1ab13acac 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Reokazas"
 #define STRING_COLUMN_LABEL_RECUR_L  "Reokazas ĉiu"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Fiksa"
 #define STRING_COLUMN_LABEL_START    "Eko"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index d6ce57533..6039a88f0 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrencia"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Programada"
 #define STRING_COLUMN_LABEL_START    "Comienzo"
 #define STRING_COLUMN_LABEL_STAT     "Est"
 #define STRING_COLUMN_LABEL_STATUS   "Estatus"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5ed77cea7..7a178dc6a 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Récurrence"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Planifiée"
 #define STRING_COLUMN_LABEL_START    "Début"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Statut"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 1c7647786..7694a3d90 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodico"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Fissato"
 #define STRING_COLUMN_LABEL_START    "Inizio"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Stato"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4121b6d54..6fa34fce9 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index c7a6e50c4..7930b6fbd 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodyczny"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Zaplanowane"
 #define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STATUS   "Status"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index adac90538..475d76547 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -40,7 +40,6 @@
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_RECUR_L  "Periodicidade"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_SCHED    "Agendado"
 #define STRING_COLUMN_LABEL_START    "Início"
 #define STRING_COLUMN_LABEL_STAT     "Es"
 #define STRING_COLUMN_LABEL_STATUS   "Estado"

From dccb8081bc6473db8fedc7936b8be1b62048624f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:11:25 -0500
Subject: [PATCH 698/879] l10n: Eliminated some column labels

---
 src/commands/CmdInfo.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 40723fcd8..f3a6df5db 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -507,7 +507,7 @@ int CmdInfo::execute (std::string& output)
       journal.forceColor ();
 
     journal.width (context.getWidth ());
-    journal.add (STRING_COLUMN_LABEL_DATE);
+    journal.add ("Date");
     journal.add ("Modification");
 
     if (context.config.getBoolean ("journal.info") &&
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index a81e5ea10..97ddb101c 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Datum"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 8bbcfcde5..1f438a8bb 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 1ab13acac..0fc0d37b0 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Dato"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 6039a88f0..11a266449 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Fecha"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7a178dc6a..7684db8ca 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7694a3d90..ce77ca519 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 6fa34fce9..b66f41b1d 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Date"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 7930b6fbd..fc6403304 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 475d76547..ae01efcb9 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DATE     "Data"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"

From 569522b0078ae4faaae3328e87ec18467f392a0b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:12:59 -0500
Subject: [PATCH 699/879] l10n: Eliminated some column labels

---
 src/columns/ColWait.cpp | 3 +--
 src/l10n/deu-DEU.h      | 1 -
 src/l10n/eng-USA.h      | 1 -
 src/l10n/epo-RUS.h      | 1 -
 src/l10n/esp-ESP.h      | 1 -
 src/l10n/fra-FRA.h      | 1 -
 src/l10n/ita-ITA.h      | 1 -
 src/l10n/jpn-JPN.h      | 1 -
 src/l10n/pol-POL.h      | 1 -
 src/l10n/por-PRT.h      | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index 6d255275b..377047917 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -26,13 +26,12 @@
 
 #include <cmake.h>
 #include <ColWait.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnWait::ColumnWait ()
 {
   _name  = "wait";
-  _label = STRING_COLUMN_LABEL_WAIT;
+  _label = "Wait";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 97ddb101c..138fc88d4 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -71,7 +71,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_VALUES   "Erlaubte Werte"
-#define STRING_COLUMN_LABEL_WAIT     "Aufgeschoben"
 #define STRING_COLUMN_LABEL_WAITING  "Aufgeschoben bis"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 1f438a8bb..77e44d357 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_WAIT     "Wait"
 #define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0fc0d37b0..a6daf6045 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_VALUES   "Valoroj permesataj"
-#define STRING_COLUMN_LABEL_WAIT     "Atendu"
 #define STRING_COLUMN_LABEL_WAITING  "Atendu ĝis"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 11a266449..0be6d72ce 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_VALUES   "Valores permitidos"
-#define STRING_COLUMN_LABEL_WAIT     "Espera"
 #define STRING_COLUMN_LABEL_WAITING  "Esperando hasta"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7684db8ca..5fe4c46d3 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_VALUES   "Valeurs autorisées"
-#define STRING_COLUMN_LABEL_WAIT     "Attente"
 #define STRING_COLUMN_LABEL_WAITING  "En attente jusqu’au"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ce77ca519..4de6ae897 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_VALUES   "Valori consentiti"
-#define STRING_COLUMN_LABEL_WAIT     "Attesa"
 #define STRING_COLUMN_LABEL_WAITING  "Attesa fino"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index b66f41b1d..0e9a1ca89 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_WAIT     "Wait"
 #define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index fc6403304..f04bc8577 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_VALUES   "Dozwolone Wartości"
-#define STRING_COLUMN_LABEL_WAIT     "Czeka"
 #define STRING_COLUMN_LABEL_WAITING  "Czeka dopóki"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ae01efcb9..6ba6aa7b5 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -72,7 +72,6 @@
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_VALUES   "Valores Permitidos"
-#define STRING_COLUMN_LABEL_WAIT     "Adiada"
 #define STRING_COLUMN_LABEL_WAITING  "Adiada até"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."

From 3d8be2119e29a984abd17840858bb8ecfb029b46 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:14:14 -0500
Subject: [PATCH 700/879] l10n: Eliminated some column labels

---
 src/commands/CmdUDAs.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 8e870217c..179854da3 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -90,7 +90,7 @@ int CmdUDAs::execute (std::string& output)
     table.add ("Type");
     table.add (STRING_COLUMN_LABEL_LABEL);
     table.add (STRING_COLUMN_LABEL_VALUES);
-    table.add (STRING_COLUMN_LABEL_DEFAULT);
+    table.add ("Default");
     table.add (STRING_COLUMN_LABEL_UDACOUNT);
     setHeaderUnderline (table);
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 138fc88d4..7e2906220 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 77e44d357..2f957710c 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a6daf6045..371f960f1 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 0be6d72ce..594abb102 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 5fe4c46d3..f3cee6ead 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 4de6ae897..447405daa 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0e9a1ca89..21eab7c84 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f04bc8577..e5d2d8d7d 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 6ba6aa7b5..52808e78c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"

From 5c9d96d5a89f56ee0c885d0f078c043719a78c73 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:15:26 -0500
Subject: [PATCH 701/879] l10n: Eliminated some column labels

---
 src/commands/CmdInfo.cpp | 2 +-
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index f3a6df5db..87a6eaf04 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -262,7 +262,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("end"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_END);
+      view.set (row, 0, "End");
       view.set (row, 1, Datetime (task.get_date ("end")).toString (dateformat));
     }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7e2906220..83f087aac 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Ende"
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 2f957710c..a66e14b41 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 371f960f1..a8b68b352 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Fino"
 #define STRING_COLUMN_LABEL_ENTERED  "Kreita"
 #define STRING_COLUMN_LABEL_LABEL    "Rubriko"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 594abb102..a61909553 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index f3cee6ead..d7297a068 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Fin"
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 447405daa..915dd01b9 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Fine"
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 21eab7c84..ff17140cd 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "End"
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e5d2d8d7d..7795bf6e7 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Koniec"
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 52808e78c..df7bf897f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_END      "Fim"
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_LAST     "Last instance"

From 2872b44b45907e9f555e9065ed780c6c2998ba99 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:18:18 -0500
Subject: [PATCH 702/879] l10n: Eliminated some column labels

---
 src/columns/ColLast.cpp | 62 +++++++++++++++++++++++++++++++++++++++++
 src/l10n/deu-DEU.h      |  1 -
 src/l10n/eng-USA.h      |  1 -
 src/l10n/epo-RUS.h      | 17 ++++++-----
 src/l10n/esp-ESP.h      |  1 -
 src/l10n/fra-FRA.h      |  1 -
 src/l10n/ita-ITA.h      |  1 -
 src/l10n/jpn-JPN.h      |  1 -
 src/l10n/pol-POL.h      |  1 -
 src/l10n/por-PRT.h      |  1 -
 10 files changed, 70 insertions(+), 17 deletions(-)
 create mode 100644 src/columns/ColLast.cpp

diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp
new file mode 100644
index 000000000..511b65428
--- /dev/null
+++ b/src/columns/ColLast.cpp
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <ColLast.h>
+#include <format.h>
+
+////////////////////////////////////////////////////////////////////////////////
+ColumnLast::ColumnLast ()
+{
+  _name       = "last";
+  _style      = "number";
+  _label      = "Last instance";
+  _modifiable = false;
+  _styles     = {"number"};
+  _examples   = {"12"};
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Set the minimum and maximum widths for the value.
+void ColumnLast::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
+{
+  minimum = maximum = 0;
+  if (task.has (_name))
+    minimum = maximum = task.get (_name).length ();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ColumnLast::render (
+  std::vector <std::string>& lines,
+  Task& task,
+  int width,
+  Color& color)
+{
+  if (task.has (_name))
+    renderStringRight (lines, width, color, task.get (_name));
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 83f087aac..36f0e5ef8 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a66e14b41..523710966 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a8b68b352..20205e267 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,15 +27,14 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Kreita"
-#define STRING_COLUMN_LABEL_LABEL    "Rubriko"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
-#define STRING_COLUMN_LABEL_MOD      "Modifo"
-#define STRING_COLUMN_LABEL_NAME     "Nomo"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orfa UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Projekto"
-#define STRING_COLUMN_LABEL_RECUR    "Reokazas"
-#define STRING_COLUMN_LABEL_RECUR_L  "Reokazas ĉiu"
+#define STRING_COLUMN_LABEL_ENTERED  "Entered"
+#define STRING_COLUMN_LABEL_LABEL    "Label"
+#define STRING_COLUMN_LABEL_MOD      "Modified"
+#define STRING_COLUMN_LABEL_NAME     "Name"
+#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
+#define STRING_COLUMN_LABEL_PROJECT  "Project"
+#define STRING_COLUMN_LABEL_RECUR    "Recur"
+#define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
 #define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_START    "Eko"
 #define STRING_COLUMN_LABEL_STAT     "St"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a61909553..1378ecd4a 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_NAME     "Nombre"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index d7297a068..297800c75 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
 #define STRING_COLUMN_LABEL_NAME     "Nom"
 #define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 915dd01b9..007d6c626 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index ff17140cd..f6f24e43a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 7795bf6e7..0f35ba856 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
 #define STRING_COLUMN_LABEL_NAME     "Nazwa"
 #define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index df7bf897f..1431720c6 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -29,7 +29,6 @@
 
 #define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
-#define STRING_COLUMN_LABEL_LAST     "Last instance"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"

From 41f2133693aec25951899304512e9970fd99bf05 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:32:17 -0500
Subject: [PATCH 703/879] l10n: Eliminated some column labels

---
 src/columns/ColProject.cpp   |  3 +--
 src/columns/ColStatus.cpp    |  4 ++--
 src/columns/ColTags.cpp      |  8 ++++----
 src/columns/ColUUID.cpp      |  3 +--
 src/columns/ColUrgency.cpp   |  3 +--
 src/commands/CmdInfo.cpp     | 25 ++++++++++++-------------
 src/commands/CmdProjects.cpp |  3 +--
 src/l10n/deu-DEU.h           | 20 --------------------
 src/l10n/eng-USA.h           | 20 --------------------
 src/l10n/epo-RUS.h           | 20 --------------------
 src/l10n/esp-ESP.h           | 20 --------------------
 src/l10n/fra-FRA.h           | 20 --------------------
 src/l10n/ita-ITA.h           | 20 --------------------
 src/l10n/jpn-JPN.h           | 20 --------------------
 src/l10n/pol-POL.h           | 20 --------------------
 src/l10n/por-PRT.h           | 20 --------------------
 16 files changed, 22 insertions(+), 207 deletions(-)

diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index a68c22fe4..b29d9309c 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -35,7 +35,6 @@
 #include <format.h>
 #include <utf8.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 extern Task& contextTask;
@@ -45,7 +44,7 @@ ColumnProject::ColumnProject ()
 {
   _name      = "project";
   _style     = "full";
-  _label     = STRING_COLUMN_LABEL_PROJECT;
+  _label     = "Project";
   _styles    = {"full", "parent", "indented"};
   _examples  = {"home.garden",
                 "home",
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 7c041232f..a2eec1a38 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -35,7 +35,7 @@ ColumnStatus::ColumnStatus ()
 {
   _name     = "status";
   _style    = "long";
-  _label    = STRING_COLUMN_LABEL_STATUS;
+  _label    = "Status";
   _styles   = {"long", "short"};
   _examples = {STRING_COLUMN_LABEL_STAT_PE,
                STRING_COLUMN_LABEL_STAT_P};
@@ -48,7 +48,7 @@ void ColumnStatus::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-  if (_style == "short" && _label == STRING_COLUMN_LABEL_STATUS)
+  if (_style == "short" && _label == "Status")
     _label = STRING_COLUMN_LABEL_STAT;
 }
 
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 91806a2a0..9b90a5de4 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -45,7 +45,7 @@ ColumnTags::ColumnTags ()
 {
   _name      = "tags";
   _style     = "list";
-  _label     = STRING_COLUMN_LABEL_TAGS;
+  _label     = "Tags";
   _styles    = {"list", "indicator", "count"};
   _examples  = {"home @chore next",
                 context.config.get ("tag.indicator"),
@@ -61,12 +61,12 @@ void ColumnTags::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "indicator" &&
-      _label == STRING_COLUMN_LABEL_TAGS)
+      _label == "Tags")
     _label = _label.substr (0, context.config.get ("tag.indicator").length ());
 
   else if (_style == "count" &&
-            _label == STRING_COLUMN_LABEL_TAGS)
-    _label = STRING_COLUMN_LABEL_TAG;
+            _label == "Tags")
+    _label = "Tag";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 5583e7086..87341e5a7 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -27,14 +27,13 @@
 #include <cmake.h>
 #include <ColUUID.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUUID::ColumnUUID ()
 {
   _name       = "uuid";
   _style      = "long";
-  _label      = STRING_COLUMN_LABEL_UUID;
+  _label      = "UUID";
   _modifiable = false;
   _styles     = {"long", "short"};
   _examples   = {"f30cb9c3-3fc0-483f-bfb2-3bf134f00694", "f30cb9c3"};
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index d492d4b0d..7b32d5081 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -27,14 +27,13 @@
 #include <cmake.h>
 #include <ColUrgency.h>
 #include <format.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUrgency::ColumnUrgency ()
 {
   _name       = "urgency";
   _style      = "real";
-  _label      = STRING_COLUMN_LABEL_URGENCY;
+  _label      = "Urgency";
   _modifiable = false;
   _styles     = {"real", "integer"};
   _examples   = {"4.6", "4"};
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 87a6eaf04..1ceed7073 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -37,7 +37,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -75,7 +74,7 @@ int CmdInfo::execute (std::string& output)
 
   if (! filtered.size ())
   {
-    context.footnote (STRING_FEEDBACK_NO_MATCH);
+    context.footnote ("No matches.");
     rc = 1;
   }
 
@@ -105,8 +104,8 @@ int CmdInfo::execute (std::string& output)
       view.obfuscate ();
     if (context.color ())
       view.forceColor ();
-    view.add (STRING_COLUMN_LABEL_NAME);
-    view.add (STRING_COLUMN_LABEL_VALUE);
+    view.add ("Name");
+    view.add ("Value");
     setHeaderUnderline (view);
 
     Datetime now;
@@ -137,14 +136,14 @@ int CmdInfo::execute (std::string& output)
 
     // status
     row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_STATUS);
+    view.set (row, 0, "Status");
     view.set (row, 1, status);
 
     // project
     if (task.has ("project"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_PROJECT);
+      view.set (row, 0, "Project");
       view.set (row, 1, task.get ("project"));
     }
 
@@ -182,7 +181,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("recur"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_RECUR_L);
+      view.set (row, 0, "Recurrence");
       view.set (row, 1, task.get ("recur"));
     }
 
@@ -212,7 +211,7 @@ int CmdInfo::execute (std::string& output)
 
     // entry
     row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_ENTERED);
+    view.set (row, 0, "Entered");
     Datetime dt (task.get_date ("entry"));
     std::string entry = dt.toString (dateformat);
 
@@ -230,7 +229,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("wait"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_WAITING);
+      view.set (row, 0, "Waiting until");
       view.set (row, 1, Datetime (task.get_date ("wait")).toString (dateformat));
     }
 
@@ -246,7 +245,7 @@ int CmdInfo::execute (std::string& output)
     if (task.has ("start"))
     {
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_START);
+      view.set (row, 0, "Start");
       view.set (row, 1, Datetime (task.get_date ("start")).toString (dateformat));
     }
 
@@ -292,7 +291,7 @@ int CmdInfo::execute (std::string& output)
       auto allTags = join (" ", tags);
 
       row = view.addRow ();
-      view.set (row, 0, STRING_COLUMN_LABEL_TAGS);
+      view.set (row, 0, "Tags");
       view.set (row, 1, allTags);
     }
 
@@ -339,13 +338,13 @@ int CmdInfo::execute (std::string& output)
 
     // uuid
     row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_UUID);
+    view.set (row, 0, "UUID");
     auto uuid = task.get ("uuid");
     view.set (row, 1, uuid);
 
     // Task::urgency
     row = view.addRow ();
-    view.set (row, 0, STRING_COLUMN_LABEL_URGENCY);
+    view.set (row, 0, "Urgency");
     view.set (row, 1, format (task.urgency (), 4, 4));
 
     // Show any UDAs
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index b1654b4c6..a69c79327 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -33,7 +33,6 @@
 #include <Table.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
@@ -107,7 +106,7 @@ int CmdProjects::execute (std::string& output)
     // Render a list of project names from the map.
     Table view;
     view.width (context.getWidth ());
-    view.add (STRING_COLUMN_LABEL_PROJECT);
+    view.add ("Project");
     view.add ("Tasks", false);
     setHeaderUnderline (view);
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 36f0e5ef8..d9d0e47e8 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,17 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Erfasst"
 #define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
-#define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
-#define STRING_COLUMN_LABEL_RECUR_L  "Wiederholung"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
 #define STRING_COLUMN_LABEL_STAT_CO  "Erledigt"
 #define STRING_COLUMN_LABEL_STAT_D   "G"
@@ -49,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
-#define STRING_COLUMN_LABEL_TAGS     "Schlagworte"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wert"
-#define STRING_COLUMN_LABEL_DATE     "Datum"
-#define STRING_COLUMN_LABEL_COLUMN   "Spalten"
-#define STRING_COLUMN_LABEL_STYLES   "Unterstützte Formate"
-#define STRING_COLUMN_LABEL_EXAMPLES "Beispiele"
-#define STRING_COLUMN_LABEL_SCHED    "Geplant"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_TYPE     "Typ"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
-#define STRING_COLUMN_LABEL_DEFAULT  "Standard"
 #define STRING_COLUMN_LABEL_VALUES   "Erlaubte Werte"
-#define STRING_COLUMN_LABEL_WAITING  "Aufgeschoben bis"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
@@ -117,6 +98,5 @@
 #define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
 #define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
 #define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
-tdefine STRING_COLUMN_LABEL_START    "Beginn"
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 523710966..861d465df 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
 #define STRING_COLUMN_LABEL_STAT_CO  "Completed"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_DATE     "Date"
-#define STRING_COLUMN_LABEL_COLUMN   "Columns"
-#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
-#define STRING_COLUMN_LABEL_EXAMPLES "Example"
-#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Label"
-#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 20205e267..e84b2d6ce 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Eko"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "Fn"
 #define STRING_COLUMN_LABEL_STAT_CO  "Finita"
 #define STRING_COLUMN_LABEL_STAT_D   "Vŝ"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "At"
 #define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
-#define STRING_COLUMN_LABEL_TAGS     "Etikedoj"
 #define STRING_COLUMN_LABEL_UDA      "Nomo"
 #define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
-#define STRING_COLUMN_LABEL_DATE     "Dato"
-#define STRING_COLUMN_LABEL_COLUMN   "Kolumnoj"
-#define STRING_COLUMN_LABEL_STYLES   "Formaĝoj Subtenataj"
-#define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo"
-#define STRING_COLUMN_LABEL_SCHED    "Fiksa"
-#define STRING_COLUMN_LABEL_UDA      "Nomo"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Rubriko"
-#define STRING_COLUMN_LABEL_DEFAULT  "Defaŭlto"
 #define STRING_COLUMN_LABEL_VALUES   "Valoroj permesataj"
-#define STRING_COLUMN_LABEL_WAITING  "Atendu ĝis"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1378ecd4a..c5ab019b3 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Entrada"
 #define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_NAME     "Nombre"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
-#define STRING_COLUMN_LABEL_PROJECT  "Proyecto"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_RECUR_L  "Recurrencia"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Comienzo"
 #define STRING_COLUMN_LABEL_STAT     "Est"
-#define STRING_COLUMN_LABEL_STATUS   "Estatus"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_STAT_CO  "Completadas"
 #define STRING_COLUMN_LABEL_STAT_D   "S"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "E"
 #define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_TAGS     "Marcas"
 #define STRING_COLUMN_LABEL_UDA      "Nombre"
 #define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_DATE     "Fecha"
-#define STRING_COLUMN_LABEL_COLUMN   "Columnas"
-#define STRING_COLUMN_LABEL_STYLES   "Formatos soportados"
-#define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo"
-#define STRING_COLUMN_LABEL_SCHED    "Programada"
-#define STRING_COLUMN_LABEL_UDA      "Nombre"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
-#define STRING_COLUMN_LABEL_MODIFY   "Modificable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura"
-#define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
-#define STRING_COLUMN_LABEL_DEFAULT  "Defecto"
 #define STRING_COLUMN_LABEL_VALUES   "Valores permitidos"
-#define STRING_COLUMN_LABEL_WAITING  "Esperando hasta"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 297800c75..2439efcca 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Entrée"
 #define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
-#define STRING_COLUMN_LABEL_NAME     "Nom"
 #define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
-#define STRING_COLUMN_LABEL_PROJECT  "Projet"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
-#define STRING_COLUMN_LABEL_RECUR_L  "Récurrence"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Début"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Statut"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
 #define STRING_COLUMN_LABEL_STAT_CO  "Complétée"
 #define STRING_COLUMN_LABEL_STAT_D   "S"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "En attente"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
-#define STRING_COLUMN_LABEL_TAGS     "Étiquettes"
 #define STRING_COLUMN_LABEL_UDA      "Nom"
 #define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
-#define STRING_COLUMN_LABEL_DATE     "Date"
-#define STRING_COLUMN_LABEL_COLUMN   "Colonnes"
-#define STRING_COLUMN_LABEL_STYLES   "Formats supportés"
-#define STRING_COLUMN_LABEL_EXAMPLES "Exemple"
-#define STRING_COLUMN_LABEL_SCHED    "Planifiée"
-#define STRING_COLUMN_LABEL_UDA      "Nom"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Étiq"
-#define STRING_COLUMN_LABEL_DEFAULT  "Défaut"
 #define STRING_COLUMN_LABEL_VALUES   "Valeurs autorisées"
-#define STRING_COLUMN_LABEL_WAITING  "En attente jusqu’au"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 007d6c626..d01452550 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Inserito"
 #define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
-#define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
-#define STRING_COLUMN_LABEL_PROJECT  "Progetto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_RECUR_L  "Periodico"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Inizio"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Stato"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
 #define STRING_COLUMN_LABEL_STAT_CO  "Completati"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
 #define STRING_COLUMN_LABEL_UDA      "Nome"
 #define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
-#define STRING_COLUMN_LABEL_DATE     "Data"
-#define STRING_COLUMN_LABEL_COLUMN   "Colonna"
-#define STRING_COLUMN_LABEL_STYLES   "Formati Supportati"
-#define STRING_COLUMN_LABEL_EXAMPLES "Esempio"
-#define STRING_COLUMN_LABEL_SCHED    "Fissato"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Etichetta"
-#define STRING_COLUMN_LABEL_DEFAULT  "Predefinito"
 #define STRING_COLUMN_LABEL_VALUES   "Valori consentiti"
-#define STRING_COLUMN_LABEL_WAITING  "Attesa fino"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f6f24e43a..f9f214329 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Entered"
 #define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_NAME     "Name"
 #define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Project"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_RECUR_L  "Recurrence"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
 #define STRING_COLUMN_LABEL_STAT_CO  "Completed"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_TAGS     "Tags"
 #define STRING_COLUMN_LABEL_UDA      "Name"
 #define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_DATE     "Date"
-#define STRING_COLUMN_LABEL_COLUMN   "Columns"
-#define STRING_COLUMN_LABEL_STYLES   "Supported Formats"
-#define STRING_COLUMN_LABEL_EXAMPLES "Example"
-#define STRING_COLUMN_LABEL_SCHED    "Scheduled"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_TYPE     "Type"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Label"
-#define STRING_COLUMN_LABEL_DEFAULT  "Default"
 #define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
-#define STRING_COLUMN_LABEL_WAITING  "Waiting until"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0f35ba856..5512a9ec4 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Dodane"
 #define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
-#define STRING_COLUMN_LABEL_NAME     "Nazwa"
 #define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
-#define STRING_COLUMN_LABEL_PROJECT  "Projekt"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_RECUR_L  "Periodyczny"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Start"
 #define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STATUS   "Status"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
 #define STRING_COLUMN_LABEL_STAT_CO  "Ukończone"
 #define STRING_COLUMN_LABEL_STAT_D   "D"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_TAGS     "Tagi"
 #define STRING_COLUMN_LABEL_UDA      "Nazwa"
 #define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
-#define STRING_COLUMN_LABEL_DATE     "Data"
-#define STRING_COLUMN_LABEL_COLUMN   "Kolumny"
-#define STRING_COLUMN_LABEL_STYLES   "Formaty"
-#define STRING_COLUMN_LABEL_EXAMPLES "Przykłady"
-#define STRING_COLUMN_LABEL_SCHED    "Zaplanowane"
-#define STRING_COLUMN_LABEL_UDA      "Nazwa"
-#define STRING_COLUMN_LABEL_TYPE     "Typ"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Etykieta"
-#define STRING_COLUMN_LABEL_DEFAULT  "Domyślne"
 #define STRING_COLUMN_LABEL_VALUES   "Dozwolone Wartości"
-#define STRING_COLUMN_LABEL_WAITING  "Czeka dopóki"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 1431720c6..a0057c4ce 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,18 +27,11 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_ENTERED  "Criada"
 #define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_NAME     "Nome"
 #define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
-#define STRING_COLUMN_LABEL_PROJECT  "Projeto"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_RECUR_L  "Periodicidade"
-#define STRING_COLUMN_LABEL_RTYPE    "Recurrence type"
-#define STRING_COLUMN_LABEL_START    "Início"
 #define STRING_COLUMN_LABEL_STAT     "Es"
-#define STRING_COLUMN_LABEL_STATUS   "Estado"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_STAT_CO  "Concluídas"
 #define STRING_COLUMN_LABEL_STAT_D   "E"
@@ -50,26 +43,13 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_TAGS     "Marcas"
 #define STRING_COLUMN_LABEL_UDA      "Nome"
 #define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_DATE     "Data"
-#define STRING_COLUMN_LABEL_COLUMN   "Colunas"
-#define STRING_COLUMN_LABEL_STYLES   "Formatos Suportados"
-#define STRING_COLUMN_LABEL_EXAMPLES "Exemplo"
-#define STRING_COLUMN_LABEL_SCHED    "Agendado"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_TYPE     "Tipo"
-#define STRING_COLUMN_LABEL_MODIFY   "Modifiable"
-#define STRING_COLUMN_LABEL_NOMODIFY "Read Only"
-#define STRING_COLUMN_LABEL_LABEL    "Rótulo"
-#define STRING_COLUMN_LABEL_DEFAULT  "Por omissão"
 #define STRING_COLUMN_LABEL_VALUES   "Valores Permitidos"
-#define STRING_COLUMN_LABEL_WAITING  "Adiada até"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."

From c94f481f2a7bd07150f49f291f323c547cc6cb23 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:38:14 -0500
Subject: [PATCH 704/879] l10n: Eliminated some column labels

---
 src/commands/CmdUDAs.cpp | 13 ++++++-------
 src/l10n/deu-DEU.h       | 11 +++--------
 src/l10n/eng-USA.h       |  5 -----
 src/l10n/epo-RUS.h       |  5 -----
 src/l10n/esp-ESP.h       |  5 -----
 src/l10n/fra-FRA.h       |  5 -----
 src/l10n/ita-ITA.h       |  5 -----
 src/l10n/jpn-JPN.h       |  5 -----
 src/l10n/pol-POL.h       |  5 -----
 src/l10n/por-PRT.h       |  5 -----
 10 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 179854da3..5b06c7d75 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -35,7 +35,6 @@
 #include <format.h>
 #include <shared.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -86,12 +85,12 @@ int CmdUDAs::execute (std::string& output)
     // possible default value, and finally the usage count.
     Table table;
     table.width (context.getWidth ());
-    table.add (STRING_COLUMN_LABEL_UDA);
+    table.add ("Name");
     table.add ("Type");
-    table.add (STRING_COLUMN_LABEL_LABEL);
-    table.add (STRING_COLUMN_LABEL_VALUES);
+    table.add ("Label");
+    table.add ("Allowed Values");
     table.add ("Default");
-    table.add (STRING_COLUMN_LABEL_UDACOUNT);
+    table.add ("Usage Count");
     setHeaderUnderline (table);
 
     for (auto& uda : udas)
@@ -147,8 +146,8 @@ int CmdUDAs::execute (std::string& output)
     // Display the orphans and their counts.
     Table orphanTable;
     orphanTable.width (context.getWidth ());
-    orphanTable.add (STRING_COLUMN_LABEL_ORPHAN);
-    orphanTable.add (STRING_COLUMN_LABEL_UDACOUNT);
+    orphanTable.add ("Orphan UDA");
+    orphanTable.add ("Usage Count");
     setHeaderUnderline (orphanTable);
 
     for (auto& o : orphans)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d9d0e47e8..9809fa8f5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
-#define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
-#define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Wert"
-#define STRING_COLUMN_LABEL_VALUES   "Erlaubte Werte"
+#define string_column_label_urgency  "dringlichkeit"
+#define string_column_label_uuid     "uuid"
+#define string_column_label_value    "wert"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 861d465df..531a69c02 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e84b2d6ce..ea7603147 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "Fn"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "At"
 #define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
-#define STRING_COLUMN_LABEL_UDA      "Nomo"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
-#define STRING_COLUMN_LABEL_VALUES   "Valoroj permesataj"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c5ab019b3..8996329a5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_STAT     "Est"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "E"
 #define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UDA      "Nombre"
-#define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_VALUES   "Valores permitidos"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2439efcca..2c0034c94 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
-#define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "En attente"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
-#define STRING_COLUMN_LABEL_UDA      "Nom"
-#define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
-#define STRING_COLUMN_LABEL_VALUES   "Valeurs autorisées"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d01452550..2f8a3e27c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
-#define STRING_COLUMN_LABEL_VALUES   "Valori consentiti"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f9f214329..a5b00e197 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5512a9ec4..9ab876592 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
-#define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Nazwa"
-#define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
-#define STRING_COLUMN_LABEL_VALUES   "Dozwolone Wartości"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a0057c4ce..996d0c4d5 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "Es"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_VALUES   "Valores Permitidos"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."

From 3df06e6482b4a9ae82a144e0794413db0f9184cd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:43:24 -0500
Subject: [PATCH 705/879] l10n: Eliminated some column labels

---
 src/columns/ColStatus.cpp | 37 ++++++++++++++++++-------------------
 src/commands/CmdStats.cpp | 11 +++++------
 src/l10n/deu-DEU.h        | 11 -----------
 src/l10n/eng-USA.h        | 11 -----------
 src/l10n/epo-RUS.h        | 11 -----------
 src/l10n/esp-ESP.h        | 11 -----------
 src/l10n/fra-FRA.h        | 11 -----------
 src/l10n/ita-ITA.h        | 11 -----------
 src/l10n/jpn-JPN.h        | 11 -----------
 src/l10n/pol-POL.h        | 11 -----------
 src/l10n/por-PRT.h        | 11 -----------
 11 files changed, 23 insertions(+), 124 deletions(-)

diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index a2eec1a38..4adc23e87 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -27,7 +27,6 @@
 #include <cmake.h>
 #include <ColStatus.h>
 #include <format.h>
-#include <i18n.h>
 #include <utf8.h>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -37,8 +36,8 @@ ColumnStatus::ColumnStatus ()
   _style    = "long";
   _label    = "Status";
   _styles   = {"long", "short"};
-  _examples = {STRING_COLUMN_LABEL_STAT_PE,
-               STRING_COLUMN_LABEL_STAT_P};
+  _examples = {"Pending",
+               "P"};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +48,7 @@ void ColumnStatus::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "short" && _label == "Status")
-    _label = STRING_COLUMN_LABEL_STAT;
+    _label = "St";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -62,15 +61,15 @@ void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& max
       _style == "long")
   {
     if (status == Task::pending)
-      minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_PE);
+      minimum = maximum = utf8_width ("Pending");
     else if (status == Task::deleted)
-      minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_DE);
+      minimum = maximum = utf8_width ("Deleted");
     else if (status == Task::waiting)
-      minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_WA);
+      minimum = maximum = utf8_width ("Waiting");
     else if (status == Task::completed)
-      minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_CO);
+      minimum = maximum = utf8_width ("Completed");
     else if (status == Task::recurring)
-      minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_RE);
+      minimum = maximum = utf8_width ("Recurring");
   }
   else if (_style == "short")
     minimum = maximum = 1;
@@ -89,20 +88,20 @@ void ColumnStatus::render (
   if (_style == "default" ||
       _style == "long")
   {
-         if (status == Task::pending)   value = STRING_COLUMN_LABEL_STAT_PE;
-    else if (status == Task::completed) value = STRING_COLUMN_LABEL_STAT_CO;
-    else if (status == Task::deleted)   value = STRING_COLUMN_LABEL_STAT_DE;
-    else if (status == Task::waiting)   value = STRING_COLUMN_LABEL_STAT_WA;
-    else if (status == Task::recurring) value = STRING_COLUMN_LABEL_STAT_RE;
+         if (status == Task::pending)   value = "Pending";
+    else if (status == Task::completed) value = "Completed";
+    else if (status == Task::deleted)   value = "Deleted";
+    else if (status == Task::waiting)   value = "Waiting";
+    else if (status == Task::recurring) value = "Recurring";
   }
 
   else if (_style == "short")
   {
-         if (status == Task::pending)   value = STRING_COLUMN_LABEL_STAT_P;
-    else if (status == Task::completed) value = STRING_COLUMN_LABEL_STAT_C;
-    else if (status == Task::deleted)   value = STRING_COLUMN_LABEL_STAT_D;
-    else if (status == Task::waiting)   value = STRING_COLUMN_LABEL_STAT_W;
-    else if (status == Task::recurring) value = STRING_COLUMN_LABEL_STAT_R;
+         if (status == Task::pending)   value = "P";
+    else if (status == Task::completed) value = "C";
+    else if (status == Task::deleted)   value = "D";
+    else if (status == Task::waiting)   value = "W";
+    else if (status == Task::recurring) value = "R";
   }
 
   renderStringLeft (lines, width, color, value);
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index a47625256..7b993d762 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -37,7 +37,6 @@
 #include <main.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -163,23 +162,23 @@ int CmdStats::execute (std::string& output)
   setHeaderUnderline (view);
 
   int row = view.addRow ();
-  view.set (row, 0, STRING_COLUMN_LABEL_STAT_PE);
+  view.set (row, 0, "Pending");
   view.set (row, 1, pendingT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_COLUMN_LABEL_STAT_WA);
+  view.set (row, 0, "Waiting");
   view.set (row, 1, waitingT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_COLUMN_LABEL_STAT_RE);
+  view.set (row, 0, "Recurring");
   view.set (row, 1, recurringT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_COLUMN_LABEL_STAT_CO);
+  view.set (row, 0, "Completed");
   view.set (row, 1, completedT);
 
   row = view.addRow ();
-  view.set (row, 0, STRING_COLUMN_LABEL_STAT_DE);
+  view.set (row, 0, "Deleted");
   view.set (row, 1, deletedT);
 
   row = view.addRow ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 9809fa8f5..4bb792bb9 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "E"
-#define STRING_COLUMN_LABEL_STAT_CO  "Erledigt"
-#define STRING_COLUMN_LABEL_STAT_D   "G"
-#define STRING_COLUMN_LABEL_STAT_DE  "Gelöscht"
-#define STRING_COLUMN_LABEL_STAT_P   "O"
-#define STRING_COLUMN_LABEL_STAT_PE  "Offen"
-#define STRING_COLUMN_LABEL_STAT_R   "W"
-#define STRING_COLUMN_LABEL_STAT_RE  "Wiederholend"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
-#define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define string_column_label_urgency  "dringlichkeit"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 531a69c02..a8dc51656 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "C"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
-#define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
-#define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
-#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index ea7603147..ff43e55e2 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "Fn"
-#define STRING_COLUMN_LABEL_STAT_CO  "Finita"
-#define STRING_COLUMN_LABEL_STAT_D   "Vŝ"
-#define STRING_COLUMN_LABEL_STAT_DE  "Viŝita"
-#define STRING_COLUMN_LABEL_STAT_P   "Pd"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendanta"
-#define STRING_COLUMN_LABEL_STAT_R   "Re"
-#define STRING_COLUMN_LABEL_STAT_RE  "Reokazanta"
-#define STRING_COLUMN_LABEL_STAT_W   "At"
-#define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 8996329a5..290f3041b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT     "Est"
-#define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_CO  "Completadas"
-#define STRING_COLUMN_LABEL_STAT_D   "S"
-#define STRING_COLUMN_LABEL_STAT_DE  "Suprimidas"
-#define STRING_COLUMN_LABEL_STAT_P   "P"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendientes"
-#define STRING_COLUMN_LABEL_STAT_R   "R"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurrentes"
-#define STRING_COLUMN_LABEL_STAT_W   "E"
-#define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2c0034c94..256948140 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "C"
-#define STRING_COLUMN_LABEL_STAT_CO  "Complétée"
-#define STRING_COLUMN_LABEL_STAT_D   "S"
-#define STRING_COLUMN_LABEL_STAT_DE  "Supprimée"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
-#define STRING_COLUMN_LABEL_STAT_PE  "Prévue"
-#define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_STAT_RE  "Récurrente"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
-#define STRING_COLUMN_LABEL_STAT_WA  "En attente"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 2f8a3e27c..c5663a114 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "C"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completati"
-#define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_DE  "Cancellati"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
-#define STRING_COLUMN_LABEL_STAT_PE  "Da fare"
-#define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_STAT_RE  "Periodicamente"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
-#define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index a5b00e197..127dcf70f 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "C"
-#define STRING_COLUMN_LABEL_STAT_CO  "Completed"
-#define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_DE  "Deleted"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
-#define STRING_COLUMN_LABEL_STAT_PE  "Pending"
-#define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_STAT_RE  "Recurring"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
-#define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 9ab876592..e64aa1c82 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_STAT     "St"
-#define STRING_COLUMN_LABEL_STAT_C   "C"
-#define STRING_COLUMN_LABEL_STAT_CO  "Ukończone"
-#define STRING_COLUMN_LABEL_STAT_D   "D"
-#define STRING_COLUMN_LABEL_STAT_DE  "Usnięte"
-#define STRING_COLUMN_LABEL_STAT_P   "P"
-#define STRING_COLUMN_LABEL_STAT_PE  "W toku"
-#define STRING_COLUMN_LABEL_STAT_R   "R"
-#define STRING_COLUMN_LABEL_STAT_RE  "Zależne"
-#define STRING_COLUMN_LABEL_STAT_W   "W"
-#define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 996d0c4d5..82a4ace8f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -29,17 +29,6 @@
 
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
-#define STRING_COLUMN_LABEL_STAT     "Es"
-#define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_CO  "Concluídas"
-#define STRING_COLUMN_LABEL_STAT_D   "E"
-#define STRING_COLUMN_LABEL_STAT_DE  "Eliminadas"
-#define STRING_COLUMN_LABEL_STAT_P   "P"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_PE  "Pendentes"
-#define STRING_COLUMN_LABEL_STAT_R   "R"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_STAT_RE  "Recorrentes"
-#define STRING_COLUMN_LABEL_STAT_W   "A"
-#define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"

From 4b485ad570386df0e4039b68469e0668362c9246 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:44:45 -0500
Subject: [PATCH 706/879] l10n: Eliminated some column labels

---
 src/columns/ColModified.cpp | 3 +--
 src/l10n/deu-DEU.h          | 1 -
 src/l10n/eng-USA.h          | 1 -
 src/l10n/epo-RUS.h          | 1 -
 src/l10n/esp-ESP.h          | 1 -
 src/l10n/fra-FRA.h          | 1 -
 src/l10n/ita-ITA.h          | 1 -
 src/l10n/jpn-JPN.h          | 1 -
 src/l10n/pol-POL.h          | 1 -
 src/l10n/por-PRT.h          | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index a61dcba0d..ca04e8651 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -26,13 +26,12 @@
 
 #include <cmake.h>
 #include <ColModified.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnModified::ColumnModified ()
 {
   _name  = "modified";
-  _label = STRING_COLUMN_LABEL_MOD;
+  _label = "Modified";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 4bb792bb9..b47e9d312 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Geändert"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a8dc51656..b348810f1 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index ff43e55e2..970597491 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 290f3041b..1b37b1211 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 256948140..62dc1f965 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modifiée"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index c5663a114..b2192223f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modificato"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 127dcf70f..4ef28d0be 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modified"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index e64aa1c82..0e7ccce4f 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Zmienione"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 82a4ace8f..9472176dd 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_MOD      "Modificada"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"

From 02f786694ea235ef8ed5b96d9d21f7969a2254d8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:46:48 -0500
Subject: [PATCH 707/879] l10n: Eliminated some column labels

---
 src/columns/ColRecur.cpp | 5 ++---
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 57e2350af..28ac58e79 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -35,7 +35,6 @@
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
-#include <i18n.h>
 
 extern Context context;
 extern Task& contextTask;
@@ -45,7 +44,7 @@ ColumnRecur::ColumnRecur ()
 {
   _name       = "recur";
   _style      = "duration";
-  _label      = STRING_COLUMN_LABEL_RECUR;
+  _label      = "Recur";
   _modifiable = true;
   _styles     = {"duration", "indicator"};
   _examples   = {"weekly", context.config.get ("recurrence.indicator")};
@@ -58,7 +57,7 @@ void ColumnRecur::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-  if (_style == "indicator" && _label == STRING_COLUMN_LABEL_RECUR)
+  if (_style == "indicator" && _label == "Recur")
     _label = _label.substr (0, context.config.get ("recurrence.indicator").length ());
 }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b47e9d312..b458bae27 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define string_column_label_urgency  "dringlichkeit"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index b348810f1..df83335c0 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 970597491..af5486d5b 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 1b37b1211..da32ebb1b 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 62dc1f965..a6c324c7b 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index b2192223f..f956e7af6 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 4ef28d0be..519a7e0da 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0e7ccce4f..0d0cfa0ad 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9472176dd..7b71bc209 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"

From 6e3c556d0bacece0b0a9cd35563f746f993aca33 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:49:27 -0500
Subject: [PATCH 708/879] l10n: Eliminated some column labels

---
 src/commands/CmdTags.cpp | 7 +++----
 src/l10n/deu-DEU.h       | 1 -
 src/l10n/eng-USA.h       | 1 -
 src/l10n/epo-RUS.h       | 1 -
 src/l10n/esp-ESP.h       | 1 -
 src/l10n/fra-FRA.h       | 1 -
 src/l10n/ita-ITA.h       | 1 -
 src/l10n/jpn-JPN.h       | 1 -
 src/l10n/pol-POL.h       | 1 -
 src/l10n/por-PRT.h       | 1 -
 10 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 7ce7efeeb..c084db004 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -34,7 +34,6 @@
 #include <Table.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -91,7 +90,7 @@ int CmdTags::execute (std::string& output)
     // Render a list of tags names from the map.
     Table view;
     view.width (context.getWidth ());
-    view.add (STRING_COLUMN_LABEL_TAG);
+    view.add ("Tag");
     view.add ("Count", false);
     setHeaderUnderline (view);
 
@@ -124,9 +123,9 @@ int CmdTags::execute (std::string& output)
       context.footnote (format ("{1} tags", unique.size ()));
 
     if (quantity == 1)
-      context.footnote (STRING_FEEDBACK_TASKS_SINGLE);
+      context.footnote ("(1 task)");
     else
-      context.footnote (format (STRING_FEEDBACK_TASKS_PLURAL, quantity));
+      context.footnote (format ("({1} tasks)", quantity));
 
     out << '\n';
   }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index b458bae27..3ef431fbc 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Schlagwort"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
 #define string_column_label_urgency  "dringlichkeit"
 #define string_column_label_uuid     "uuid"
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index df83335c0..5bcd4a9b5 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index af5486d5b..a70a55664 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Etik"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index da32ebb1b..c7211f55d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index a6c324c7b..7ff5445d7 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Étiq"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index f956e7af6..55327dde7 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 519a7e0da..0e32da521 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0d0cfa0ad..f7c3baa60 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Tag"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 7b71bc209..78afe77a2 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,7 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_TAG      "Marca"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|

From 0ef1166b0b2c27ea894632c6222e160d278e3e55 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:49:42 -0500
Subject: [PATCH 709/879] DOM: No more I18N

---
 src/DOM.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DOM.cpp b/src/DOM.cpp
index da4dfe1b9..dd7b8c524 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -37,7 +37,6 @@
 #include <shared.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 

From ef58767834621cba8f1be519fb9c0e3910313286 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 22:50:49 -0500
Subject: [PATCH 710/879] l10n: Eliminated some column labels

---
 src/columns/ColUntil.cpp | 3 +--
 src/l10n/deu-DEU.h       | 4 ----
 src/l10n/eng-USA.h       | 4 ----
 src/l10n/epo-RUS.h       | 4 ----
 src/l10n/esp-ESP.h       | 4 ----
 src/l10n/fra-FRA.h       | 4 ----
 src/l10n/ita-ITA.h       | 4 ----
 src/l10n/jpn-JPN.h       | 4 ----
 src/l10n/pol-POL.h       | 4 ----
 src/l10n/por-PRT.h       | 4 ----
 10 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index c233d85d9..b41fb43e7 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -26,13 +26,12 @@
 
 #include <cmake.h>
 #include <ColUntil.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUntil::ColumnUntil ()
 {
   _name  = "until";
-  _label = STRING_COLUMN_LABEL_UNTIL;
+  _label = "Until";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 3ef431fbc..353bcbef5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Bis"
-#define string_column_label_urgency  "dringlichkeit"
-#define string_column_label_uuid     "uuid"
-#define string_column_label_value    "wert"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 5bcd4a9b5..e0ce1071f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgency"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Value"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index a70a55664..14bf0df2d 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
-#define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Valoro"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c7211f55d..56dbe11a8 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Hasta"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
-#define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
-#define STRING_COLUMN_LABEL_VALUE    "Valor"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 7ff5445d7..8880a4677 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgence"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Valeur"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 55327dde7..a08d363bc 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Fino a"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Valore"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0e32da521..0b067fad7 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Until"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgency"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Value"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index f7c3baa60..0f5d0a000 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Do"
-#define STRING_COLUMN_LABEL_URGENCY  "Pilność"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Wartość"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 78afe77a2..c3f9fa7ab 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,10 +27,6 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_UNTIL    "Até"
-#define STRING_COLUMN_LABEL_URGENCY  "Urgência"
-#define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
-#define STRING_COLUMN_LABEL_VALUE    "Valor"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."

From 20508c45f218d209f2d5bb1412b050b9adf30323 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:06:56 -0500
Subject: [PATCH 711/879] l10n: Eliminated some column labels

---
 src/feedback.cpp   | 64 ++++++++++++++++++++--------------------------
 src/l10n/deu-DEU.h | 26 -------------------
 src/l10n/eng-USA.h | 26 -------------------
 src/l10n/epo-RUS.h | 26 -------------------
 src/l10n/esp-ESP.h | 26 -------------------
 src/l10n/fra-FRA.h | 26 -------------------
 src/l10n/ita-ITA.h | 26 -------------------
 src/l10n/jpn-JPN.h | 26 -------------------
 src/l10n/pol-POL.h | 26 -------------------
 src/l10n/por-PRT.h | 26 -------------------
 10 files changed, 28 insertions(+), 270 deletions(-)

diff --git a/src/feedback.cpp b/src/feedback.cpp
index 24469a220..03f7875a0 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -39,7 +39,6 @@
 #include <main.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -77,7 +76,7 @@ std::string taskDifferences (const Task& before, const Task& after)
   std::stringstream out;
   for (auto& name : beforeOnly)
     out << "  - "
-        << format (STRING_FEEDBACK_DELETED, Lexer::ucFirst (name))
+        << format ("{1} will be deleted.", Lexer::ucFirst (name))
         << "\n";
 
   for (auto& name : afterOnly)
@@ -87,12 +86,12 @@ std::string taskDifferences (const Task& before, const Task& after)
       auto deps_after = after.getDependencyTasks ();
 
       out << "  - "
-          << format (STRING_FEEDBACK_DEP_SET, taskIdentifiers (deps_after))
+          << format ("Dependencies will be set to '{1}'.", taskIdentifiers (deps_after))
           << "\n";
     }
     else
       out << "  - "
-          << format (STRING_FEEDBACK_ATT_SET,
+          << format ("{1} will be set to '{2}'.",
                      Lexer::ucFirst (name),
                      renderAttribute (name, after.get (name)))
           << "\n";
@@ -116,12 +115,12 @@ std::string taskDifferences (const Task& before, const Task& after)
         std::string to = taskIdentifiers (deps_after);
 
         out << "  - "
-            << format (STRING_FEEDBACK_DEP_MOD, from, to)
+            << format ("Dependencies will be changed from '{1}' to '{2}'.", from, to)
             << "\n";
       }
       else
         out << "  - "
-            << format (STRING_FEEDBACK_ATT_MOD,
+            << format ("{1} will be changed from '{2}' to '{3}'.",
                        Lexer::ucFirst (name),
                        renderAttribute (name, before.get (name)),
                        renderAttribute (name, after.get (name)))
@@ -131,9 +130,7 @@ std::string taskDifferences (const Task& before, const Task& after)
 
   // Shouldn't just say nothing.
   if (out.str ().length () == 0)
-    out << "  - "
-        << STRING_FEEDBACK_NOP
-        << "\n";
+    out << "  - No changes will be made.\n";
 
   return out.str ();
 }
@@ -166,24 +163,23 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-        out << format (STRING_FEEDBACK_DEP_DEL, taskIdentifiers (before.getDependencyTasks ()))
+        out << format ("Dependencies '{1}' deleted.", taskIdentifiers (before.getDependencyTasks ()))
             << "\n";
     }
     else if (name.substr (0, 11) == "annotation_")
     {
-      out << format (STRING_FEEDBACK_ANN_DEL, before.get (name))
-          << "\n";
+      out << format ("Annotation '{1}' deleted.\n", before.get (name));
     }
     else if (name == "start")
     {
-      out << format (STRING_FEEDBACK_ATT_DEL_DUR, Lexer::ucFirst (name),
+      out << format ("{1} deleted (duration: {2}).",
+                     Lexer::ucFirst (name),
                      Duration (current_timestamp - last_timestamp).format ())
           << "\n";
     }
     else
     {
-      out << format (STRING_FEEDBACK_ATT_DEL, Lexer::ucFirst (name))
-          << "\n";
+      out << format ("{1} deleted.\n", Lexer::ucFirst (name));
     }
   }
 
@@ -191,20 +187,19 @@ std::string taskInfoDifferences (
   {
     if (name == "depends")
     {
-      out << format (STRING_FEEDBACK_DEP_WAS_SET, taskIdentifiers (after.getDependencyTasks ()))
+      out << format ("Dependencies set to '{1}'.", taskIdentifiers (after.getDependencyTasks ()))
           << "\n";
     }
     else if (name.substr (0, 11) == "annotation_")
     {
-      out << format (STRING_FEEDBACK_ANN_ADD, after.get (name))
-          << "\n";
+      out << format ("Annotation of '{1}' added.\n", after.get (name));
     }
     else
     {
       if (name == "start")
           last_timestamp = current_timestamp;
 
-      out << format (STRING_FEEDBACK_ATT_WAS_SET,
+      out << format ("{1} set to '{2}'.",
                      Lexer::ucFirst (name),
                      renderAttribute (name, after.get (name), dateformat))
           << "\n";
@@ -223,16 +218,14 @@ std::string taskInfoDifferences (
         auto from = taskIdentifiers (before.getDependencyTasks ());
         auto to   = taskIdentifiers (after.getDependencyTasks ());
 
-        out << format (STRING_FEEDBACK_DEP_WAS_MOD, from, to)
-            << "\n";
+        out << format ("Dependencies changed from '{1}' to '{2}'.\n", from, to);
       }
       else if (name.substr (0, 11) == "annotation_")
       {
-        out << format (STRING_FEEDBACK_ANN_WAS_MOD, after.get (name))
-            << "\n";
+        out << format ("Annotation changed to '{1}'.\n", after.get (name));
       }
       else
-        out << format (STRING_FEEDBACK_ATT_WAS_MOD,
+        out << format ("{1} changed from '{2}' to '{3}'.",
                        Lexer::ucFirst (name),
                        renderAttribute (name, before.get (name), dateformat),
                        renderAttribute (name, after.get (name), dateformat))
@@ -241,8 +234,7 @@ std::string taskInfoDifferences (
 
   // Shouldn't just say nothing.
   if (out.str ().length () == 0)
-    out << STRING_FEEDBACK_WAS_NOP
-        << "\n";
+    out << "No changes made.\n";
 
   return out.str ();
 }
@@ -344,7 +336,7 @@ void feedback_reserved_tags (const std::string& tag)
       tag == "YEAR"      ||
       tag == "YESTERDAY")
   {
-    throw format (STRING_FEEDBACK_TAG_VIRTUAL, tag);
+    throw format ("Virtual tags (including '{1}') are reserved and may not be added or removed.", tag);
   }
 }
 
@@ -356,10 +348,10 @@ void feedback_special_tags (const Task& task, const std::string& tag)
   {
     std::string msg;
     std::string explanation;
-         if (tag == "nocolor") msg = STRING_FEEDBACK_TAG_NOCOLOR;
-    else if (tag == "nonag")   msg = STRING_FEEDBACK_TAG_NONAG;
-    else if (tag == "nocal")   msg = STRING_FEEDBACK_TAG_NOCAL;
-    else if (tag == "next")    msg = STRING_FEEDBACK_TAG_NEXT;
+         if (tag == "nocolor") msg = "The 'nocolor' special tag will disable color rules for this task.";
+    else if (tag == "nonag")   msg = "The 'nonag' special tag will prevent nagging when this task is modified.";
+    else if (tag == "nocal")   msg = "The 'nocal' special tag will keep this task off the 'calendar' report.";
+    else if (tag == "next")    msg = "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report.";
 
     if (msg.length ())
     {
@@ -390,14 +382,14 @@ void feedback_unblocked (const Task& task)
       if (blocking.size () == 0)
       {
         if (i.id)
-          std::cout << format (STRING_FEEDBACK_UNBLOCKED,
+          std::cout << format ("Unblocked {1} '{2}'.",
                                i.id,
                                i.get ("description"))
                     << "\n";
         else
         {
           std::string uuid = i.get ("uuid");
-          std::cout << format (STRING_FEEDBACK_UNBLOCKED,
+          std::cout << format ("Unblocked {1} '{2}'.",
                                i.get ("uuid"),
                                i.get ("description"))
                     << "\n";
@@ -420,8 +412,8 @@ void feedback_backlog ()
         ++count;
 
     if (count)
-      context.footnote (format (count > 1 ? STRING_FEEDBACK_BACKLOG_N
-                                          : STRING_FEEDBACK_BACKLOG, count));
+      context.footnote (format (count > 1 ?  "There are {1} local changes.  Sync required."
+                                          : "There is {1} local change.  Sync required.", count));
   }
 }
 
@@ -490,7 +482,7 @@ std::string onExpiration (Task& task)
   std::stringstream msg;
 
   if (context.verbose ("affected"))
-    msg << format (STRING_FEEDBACK_EXPIRED,
+    msg << format ("Task {1} '{2}' expired and was deleted.",
                    task.identifier (true),
                    task.get ("description"));
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 353bcbef5..d754bb899 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
-#define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
-#define STRING_FEEDBACK_ATT_DEL      "{1} wird gelöscht."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} wird gelöscht (Dauer: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} wird von '{2}' zu '{3}' geändert."
-#define STRING_FEEDBACK_ATT_SET      "{1} wird auf '{2}' gesetzt."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} wurde von '{2}' zu '{3}' geändert."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} wurde auf '{2}' gesetzt."
-#define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
-#define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
-#define STRING_FEEDBACK_DELETED      "{1} wird gelöscht."
-#define STRING_FEEDBACK_DEP_DEL      "Abhängigkeit '{1}' wird gelöscht."
-#define STRING_FEEDBACK_DEP_MOD      "Abhängigkeit wird von '{1}' zu '{2}' geändert."
-#define STRING_FEEDBACK_DEP_SET      "Abhängigkeit wird auf '{1}' gesetzt."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies wurde von '{1}' zu '{2}' geändert."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Abhängigkeit wurde auf '{1}' gesetzt."
-#define STRING_FEEDBACK_EXPIRED      "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht."
-#define STRING_FEEDBACK_NOP          "Keine Änderungen werden durchgeführt."
 #define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
-#define STRING_FEEDBACK_TAG_NEXT     "Das besondere Schlagwort 'next' erhöht die Dringlichkeit dieser Aufgabe, sodass sie im 'next'-Report erscheint."
-#define STRING_FEEDBACK_TAG_NOCAL    "Das besondere Schlagwort 'nocal' verhindert, dass diese Aufgabe im 'calendar'-Report erscheint."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "Das besondere Schlagwort 'nocolor' deaktiviert Farb-Regeln für diese Aufgabe."
-#define STRING_FEEDBACK_TAG_NONAG    "Das besondere Schlagwort 'nonag' verhindert Nachfragen, wenn diese Aufgabe geändert wird."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
-#define STRING_FEEDBACK_UNBLOCKED    "Aufgabe {1} '{2}' entsperrt."
-#define STRING_FEEDBACK_WAS_NOP      "Keine Änderungen wurden durchgeführt."
 #define STRING_TASK_DEPEND_CIRCULAR  "Verbotene zyklische Abhängigkeit erkannt."
 #define STRING_TASK_DEPEND_DUP       "Aufgabe {1} hängt bereits von Aufgabe {2} ab."
 #define STRING_TASK_DEPEND_ITSELF    "Eine Aufgabe kann nicht von sich selbst abhängen."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index e0ce1071f..b3a7ad65f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
-#define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_NOP          "No changes will be made."
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
-#define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
 #define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
 #define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 14bf0df2d..5b4765997 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
-#define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "Viŝis {1}."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "Viŝis {1} (duration: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} ŝanĝos el '{2}' al '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} iĝos '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} ŝanĝis el '{2}' al '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} iĝis '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
-#define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
-#define STRING_FEEDBACK_DELETED      "Viŝos {1}."
-#define STRING_FEEDBACK_DEP_DEL      "Viŝis dependojn '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "Dependoj ŝanĝos el '{1}' al '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Dependoj iĝos '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependoj ŝanĝis el '{1}' al '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependoj iĝis '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Tasko {1} '{2}' fortempiĝis do estis viŝata."
-#define STRING_FEEDBACK_NOP          "Ne ŝanĝos nenion."
 #define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
-#define STRING_FEEDBACK_TAG_NEXT     "Speciala etikedo 'next' pligrandigos la urĝecon de tiu tasko por ke ĝi aperus ĉe raporto 'next'."
-#define STRING_FEEDBACK_TAG_NOCAL    "Speciala etikedo 'nocal' ekskluzivos tiun taskon ĉe raporto 'calendar'."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "Speciala etikedo 'nocolor' malebligos kolorreguloj por tiu tasko."
-#define STRING_FEEDBACK_TAG_NONAG    "Speciala etikedo 'nonag' antaŭmalebligitos molestojn, kiam oni modifus tiun taskon."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
-#define STRING_FEEDBACK_UNBLOCKED    "Malblokis {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "Ne ŝanĝis nenion."
 #define STRING_TASK_DEPEND_CIRCULAR  "Detektis kaj malpermesis ciklan dependecon."
 #define STRING_TASK_DEPEND_DUP       "Tasko {1} jam dependas de tasko {2}."
 #define STRING_TASK_DEPEND_ITSELF    "Tasko ne povas dependi de si mem."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 56dbe11a8..754602f7d 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
-#define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duración: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} se cambiará de '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} se establecerá como '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} cambiado de '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} establecido como '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
-#define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
-#define STRING_FEEDBACK_DELETED      "Se eliminará {1}."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencias '{1}' eliminadas."
-#define STRING_FEEDBACK_DEP_MOD      "Las dependencias se cambiarán de '{1}' a '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Las dependencias se ajustarán a '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencias cambiadas de '{1}' a '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencias ajustadas a '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "La tarea {1} '{2}' caducó y fue eliminada."
-#define STRING_FEEDBACK_NOP          "No se harán cambios."
 #define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
-#define STRING_FEEDBACK_TAG_NEXT     "La etiqueta especial 'next' aumentará la urgencia de esta tarea para que aparezca en el informe 'next'."
-#define STRING_FEEDBACK_TAG_NOCAL    "La marca especial 'nocal' mantendrá esta tarea fuera del informe 'calendar'."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "La marca especial 'nocolor' deshabilitará las reglas de color para esta tarea."
-#define STRING_FEEDBACK_TAG_NONAG    "La marca especial 'nonag' evitará el recuerdo fastidioso cuando la tarea sea modificada."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
-#define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "No se hicieron cambios."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dependencia circular detectada y anulada."
 #define STRING_TASK_DEPEND_DUP       "La tarea {1} ya depende de la tarea {2}."
 #define STRING_TASK_DEPEND_ITSELF    "Una tarea no puede depender de sí misma."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8880a4677..e8f5e6da7 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
-#define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
-#define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Tâche {1} '{2}' a expiré et a été supprimée."
-#define STRING_FEEDBACK_NOP          "No changes will be made."
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
-#define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
 #define STRING_TASK_DEPEND_DUP       "La tâche {1} dépend déjà de la tâche {2}."
 #define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index a08d363bc..fd835ca0f 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
-#define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} cancellato."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} cancellato (durata: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} sarà modificata da '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} sarà impostata a '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} modificata da '{2}' a '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} impostata a '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_DELETED      "{1} sarà cancellato."
-#define STRING_FEEDBACK_DEP_DEL      "Dipendenze '{1}' cancellate."
-#define STRING_FEEDBACK_DEP_MOD      "Le dipendenze saranno modificate da '{1}' in '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Le dipendenze saranno impostate a '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dipendenze cambiate da '{1}' a '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dipendenze impostate a '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Il task {1} '{2}' è scaduto ed è stato eliminato"
-#define STRING_FEEDBACK_NOP          "Nessuna modifica sarà apportata."
 #define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
-#define STRING_FEEDBACK_TAG_NEXT     "Il tag speciale 'next' aumenterà l'urgenza di questo task in modo che appaia nel report 'next'."
-#define STRING_FEEDBACK_TAG_NOCAL    "Il tag speciale 'nocal' manterrà il task fuori dal report 'calendar'."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "Il tag speciale 'nocolor' disabilita le regole dei colori per questo task."
-#define STRING_FEEDBACK_TAG_NONAG    "Il tag speciale 'nonag' eviterà problemi quando il task è modificato."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_FEEDBACK_UNBLOCKED    "Sbloccato {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "Nessuna modifica apportata."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dipendenza circolare riscontrata ed evitata."
 #define STRING_TASK_DEPEND_DUP       "Task {1} già dipende da {2}."
 #define STRING_TASK_DEPEND_ITSELF    "Un task non può dipendere da sè stesso."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 0b067fad7..eb9026c38 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
-#define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} deleted."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} deleted (duration: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} will be changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} will be set to '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} changed from '{2}' to '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} set to '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
-#define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
-#define STRING_FEEDBACK_DELETED      "{1} will be deleted."
-#define STRING_FEEDBACK_DEP_DEL      "Dependencies '{1}' deleted."
-#define STRING_FEEDBACK_DEP_MOD      "Dependencies will be changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Dependencies will be set to '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Dependencies changed from '{1}' to '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Dependencies set to '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Task {1} '{2}' expired and was deleted."
-#define STRING_FEEDBACK_NOP          "No changes will be made."
 #define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
-#define STRING_FEEDBACK_TAG_NEXT     "The 'next' special tag will boost the urgency of this task so it appears on the 'next' report."
-#define STRING_FEEDBACK_TAG_NOCAL    "The 'nocal' special tag will keep this task off the 'calendar' report."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "The 'nocolor' special tag will disable color rules for this task."
-#define STRING_FEEDBACK_TAG_NONAG    "The 'nonag' special tag will prevent nagging when this task is modified."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
-#define STRING_FEEDBACK_UNBLOCKED    "Unblocked {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "No changes made."
 #define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
 #define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
 #define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 0f5d0a000..45e89eae7 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
-#define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} usunięte."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} usunięte (czas trwania: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} będzie ustawione z '{2}' na '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} będzie ustawione na '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} zmieniono z '{2}' na '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} ustawiono na '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
-#define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
-#define STRING_FEEDBACK_DELETED      "{1} będzie usunięte."
-#define STRING_FEEDBACK_DEP_DEL      "Zależności '{1}' usunięte."
-#define STRING_FEEDBACK_DEP_MOD      "Zależności będą zmienione z '{1}' na '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "Zależności będą ustawione na '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Zależności zmienione z '{1}' na '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Zależności ustawione na '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Zadanie {1} '{2}' jest przedawnione i zostało usunięte."
-#define STRING_FEEDBACK_NOP          "Nie będą wprowadzone żadne zmiany."
 #define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
-#define STRING_FEEDBACK_TAG_NEXT     "Specjalny tag 'next' podniesie pilność tego zadania co spowoduje wyświetlenie go w raporcie 'next'."
-#define STRING_FEEDBACK_TAG_NOCAL    "Specjalny tag 'nocal' spowoduje nie dodawanie zadania do kalendarza."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "Specjalny tag 'nocolor' wyłączy reguły kolorowania dla tego zadania."
-#define STRING_FEEDBACK_TAG_NONAG    "Specjalny tag 'nonag' uchroni przed upierdliwością kiedy zadanie jest modyfikowane."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
-#define STRING_FEEDBACK_UNBLOCKED    "Odblokowane {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "Nie wprowadzono żadnych zmian."
 #define STRING_TASK_DEPEND_CIRCULAR  "Wykryto i nie dopuszczono do zależności cyklicznej."
 #define STRING_TASK_DEPEND_DUP       "Zadanie {1} już jest zależne od zadania {2}."
 #define STRING_TASK_DEPEND_ITSELF    "Zadanie nie może zależeć od samego siebie."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index c3f9fa7ab..f79569aa6 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,36 +27,10 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
-#define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
-#define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."
-#define STRING_FEEDBACK_ATT_DEL      "{1} eliminado."
-#define STRING_FEEDBACK_ATT_DEL_DUR  "{1} eliminado (duração: {2})."
-#define STRING_FEEDBACK_ATT_MOD      "{1} será alterado de '{2}' para '{3}'."
-#define STRING_FEEDBACK_ATT_SET      "{1} será definido como '{2}'."
-#define STRING_FEEDBACK_ATT_WAS_MOD  "{1} alterado de '{2}' para '{3}'."
-#define STRING_FEEDBACK_ATT_WAS_SET  "{1} definido como '{2}'."
-#define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
-#define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
-#define STRING_FEEDBACK_DELETED      "{1} será eliminada."
-#define STRING_FEEDBACK_DEP_DEL      "Eliminadas as dependências '{1}'."
-#define STRING_FEEDBACK_DEP_MOD      "As dependências serão alteradas de '{1}' para '{2}'."
-#define STRING_FEEDBACK_DEP_SET      "As dependências serão alteradas para '{1}'."
-#define STRING_FEEDBACK_DEP_WAS_MOD  "Alteradas as dependências de '{1}' para '{2}'."
-#define STRING_FEEDBACK_DEP_WAS_SET  "Alteradas as dependências para '{1}'."
-#define STRING_FEEDBACK_EXPIRED      "Tarefa {1} '{2}' expirou e foi eliminada."
-#define STRING_FEEDBACK_NOP          "Não serão efetuadas alterações."
 #define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
-#define STRING_FEEDBACK_TAG_NEXT     "A marca especial 'next' irá aumentar a urgência desta tarefa de modo a que apareça no relatório 'next'."
-#define STRING_FEEDBACK_TAG_NOCAL    "A marca especial 'nocal' irá manter esta tarefa ausente do relatório de 'calendário'."
-#define STRING_FEEDBACK_TAG_NOCOLOR  "A marca especial 'nocolor' irá desactivar as regras de cor nesta tarefa."
-#define STRING_FEEDBACK_TAG_NONAG    "A marca especial 'nonag' irá prevenir avisos quando a tarefa é modificada."
-#define STRING_FEEDBACK_TAG_VIRTUAL  "Virtual tags (including '{1}') are reserved and may not be added or removed."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
-#define STRING_FEEDBACK_UNBLOCKED    "Desbloqueada {1} '{2}'."
-#define STRING_FEEDBACK_WAS_NOP      "Nenhuma alteração efetuada."
 #define STRING_TASK_DEPEND_CIRCULAR  "Dependência circular detetada e não permitida."
 #define STRING_TASK_DEPEND_DUP       "Tarefa {1} já depende da tarefa {2}."
 #define STRING_TASK_DEPEND_ITSELF    "Uma tarefa não pode depender dela própria."

From 238f81f6214172afef6703aa293c9bc970fbf0ed Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:19:11 -0500
Subject: [PATCH 712/879] l10n: Eliminated some column labels

---
 src/Task.cpp       | 40 +++++++++++++++++++---------------------
 src/l10n/deu-DEU.h | 15 ---------------
 src/l10n/eng-USA.h | 15 ---------------
 src/l10n/epo-RUS.h | 15 ---------------
 src/l10n/esp-ESP.h | 15 ---------------
 src/l10n/fra-FRA.h | 15 ---------------
 src/l10n/ita-ITA.h | 15 ---------------
 src/l10n/jpn-JPN.h | 15 ---------------
 src/l10n/pol-POL.h | 15 ---------------
 src/l10n/por-PRT.h | 15 ---------------
 10 files changed, 19 insertions(+), 156 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 0401c3ef0..9d2b5eed4 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -50,7 +50,6 @@
 #include <format.h>
 #include <util.h>
 
-#include <i18n.h>
 #ifdef PRODUCT_TASKWARRIOR
 #include <main.h>
 
@@ -58,7 +57,6 @@
 #include <Variant.h>
 #include <Filter.h>
 
-#define STRING_INFINITE_LOOP         "Terminated substitution because more than {1} changes were made - infinite loop protection."
 
 #define APPROACHING_INFINITY 1000   // Close enough.  This isn't rocket surgery.
 
@@ -763,10 +761,10 @@ void Task::parseJSON (const json::object* root_obj)
           json::string* what = (json::string*)annotation->_data["description"];
 
           if (! when)
-            throw format (STRING_TASK_NO_ENTRY, root_obj->dump ());
+            throw format ("Annotation is missing an entry date: {1}", root_obj-> dump ());
 
           if (! what)
-            throw format (STRING_TASK_NO_DESC, root_obj->dump ());
+            throw format ("Annotation is missing a description: {1}", root_obj->dump ());
 
           std::string name = "annotation_" + Datetime (when->_data).toEpochString ();
           annos.insert (std::make_pair (name, json::decode (what->_data)));
@@ -802,13 +800,13 @@ void Task::parseLegacy (const std::string& line)
   switch (determineVersion (line))
   {
   // File format version 1, from 2006-11-27 - 2007-12-31, v0.x+ - v0.9.3
-  case 1: throw std::string (STRING_TASK_NO_FF1);
+  case 1: throw std::string ("Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007.");
 
   // File format version 2, from 2008-1-1 - 2009-3-23, v0.9.3 - v1.5.0
-  case 2: throw std::string (STRING_TASK_NO_FF2);
+  case 2: throw std::string ("Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009.");
 
   // File format version 3, from 2009-3-23 - 2009-05-16, v1.6.0 - v1.7.1
-  case 3: throw std::string (STRING_TASK_NO_FF3);
+  case 3: throw std::string ("Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009.");
 
   // File format version 4, from 2009-05-16 - today, v1.7.1+
   case 4:
@@ -822,7 +820,7 @@ void Task::parseLegacy (const std::string& line)
             << '\'';
     context.debug (message.str ());
 #endif
-    throw std::string (STRING_TASK_PARSE_UNREC_FF);
+    throw std::string ("Unrecognized Taskwarrior file format or blank line in data.");
     break;
   }
 
@@ -1128,12 +1126,12 @@ void Task::addDependency (int depid)
   // Check that id is resolvable.
   std::string uuid = context.tdb2.pending.uuid (depid);
   if (uuid == "")
-    throw format (STRING_TASK_DEPEND_MISS_CREA, depid);
+    throw format ("Could not create a dependency on task {1} - not found.", depid);
 
   std::string depends = get ("depends");
   if (depends.find (uuid) != std::string::npos)
   {
-    context.footnote (format (STRING_TASK_DEPEND_DUP, id, depid));
+    context.footnote (format ("Task {1} already depends on task {2}.", id, depid));
     return;
   }
 
@@ -1145,7 +1143,7 @@ void Task::addDependency (int depid)
 void Task::addDependency (const std::string& uuid)
 {
   if (uuid == get ("uuid"))
-    throw std::string (STRING_TASK_DEPEND_ITSELF);
+    throw std::string ("A task cannot be dependent on itself.");
 
   // Store the dependency.
   std::string depends = get ("depends");
@@ -1157,7 +1155,7 @@ void Task::addDependency (const std::string& uuid)
     else
     {
 #ifdef PRODUCT_TASKWARRIOR
-      context.footnote (format (STRING_TASK_DEPEND_DUP, get ("uuid"), uuid));
+      context.footnote (format ("Task {1} already depends on task {2}.", get ("uuid"), uuid));
 #endif
       return;
     }
@@ -1168,7 +1166,7 @@ void Task::addDependency (const std::string& uuid)
   // Prevent circular dependencies.
 #ifdef PRODUCT_TASKWARRIOR
   if (dependencyIsCircular (*this))
-    throw std::string (STRING_TASK_DEPEND_CIRCULAR);
+    throw std::string ("Circular dependency detected and disallowed.");
 #endif
 
   recalc_urgency = true;
@@ -1188,7 +1186,7 @@ void Task::removeDependency (const std::string& uuid)
     recalc_urgency = true;
   }
   else
-    throw format (STRING_TASK_DEPEND_MISS_DEL, uuid);
+    throw format ("Could not delete a dependency on task {1} - not found.", uuid);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1199,7 +1197,7 @@ void Task::removeDependency (int id)
   if (uuid != "" && depends.find (uuid) != std::string::npos)
     removeDependency (uuid);
   else
-    throw format (STRING_TASK_DEPEND_MISS_DEL, id);
+    throw format ("Could not delete a dependency on task {1} - not found.", id);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1445,7 +1443,7 @@ void Task::substitute (
         done = true;
 
       if (++counter > APPROACHING_INFINITY)
-        throw format (STRING_INFINITE_LOOP, APPROACHING_INFINITY);
+        throw format ("Terminated substitution because more than {1} changes were made - infinite loop protection.", APPROACHING_INFINITY);
     }
 
     if (!done)
@@ -1468,7 +1466,7 @@ void Task::substitute (
             done = true;
 
           if (++counter > APPROACHING_INFINITY)
-            throw format (STRING_INFINITE_LOOP, APPROACHING_INFINITY);
+            throw format ("Terminated substitution because more than {1} changes were made - infinite loop protection.", APPROACHING_INFINITY);
         }
       }
     }
@@ -1633,11 +1631,11 @@ void Task::validate (bool applyDefault /* = true */)
   if (! has ("description"))
     throw std::string ("A task must have a description.");
   else if (get ("description") == "")
-    throw std::string (STRING_TASK_VALID_BLANK);
+    throw std::string ("Cannot add a task that is blank.");
 
   // Cannot have a recur frequency with no due date - when would it recur?
   if (has ("recur") && (! has ("due") || get ("due") == ""))
-    throw std::string (STRING_TASK_VALID_REC_DUE);
+    throw std::string ("A recurring task must also have a 'due' date.");
 
   // Recur durations must be valid.
   if (has ("recur"))
@@ -1666,7 +1664,7 @@ void Task::validate_before (const std::string& left, const std::string& right)
 
     // if date is zero, then it is being removed (e.g. "due: wait:1day")
     if (date_left > date_right && date_right.toEpoch () != 0)
-      context.footnote (format (STRING_TASK_VALID_BEFORE, left, right));
+      context.footnote (format ("Warning: You have specified that the '{1}' date is after the '{2}' date.", left, right));
   }
 #endif
 }
@@ -2099,7 +2097,7 @@ void Task::modify (modType type, bool text_required /* = false */)
           }
 
           else
-            throw format (STRING_TASK_INVALID_COL_TYPE, column->type (), name);
+            throw format ("Unrecognized column type '{1}' for column '{2}'", column->type (), name);
         }
       }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d754bb899..2b1a3466b 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Verbotene zyklische Abhängigkeit erkannt."
-#define STRING_TASK_DEPEND_DUP       "Aufgabe {1} hängt bereits von Aufgabe {2} ab."
-#define STRING_TASK_DEPEND_ITSELF    "Eine Aufgabe kann nicht von sich selbst abhängen."
-#define STRING_TASK_DEPEND_MISS_CREA "Konnte keine Abhängigkeit von Aufgabe {1} erstellen - Aufgabe nicht gefunden."
-#define STRING_TASK_DEPEND_MISS_DEL  "Konnte keine Abhängigkeit zu Aufgabe {1} löschen - nicht gefunden."
-#define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
-#define STRING_TASK_NO_DESC          "Kommentar fehlt Beschreibung: {1}"
-#define STRING_TASK_NO_ENTRY         "Kommentar fehlt Erfassungsdatum: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior unterstützt Datei-Format 1 nicht mehr, welches ursprünglich zwischen dem 27. November 2006 und 31. Dezember 2007 eingesetzt wurde."
-#define STRING_TASK_NO_FF2           "Taskwarrior unterstützt Datei-Format 2 nicht mehr, welches ursprünglich zwischen dem 1. Januar 2008 und 12. April 2009 eingesetzt wurde."
-#define STRING_TASK_NO_FF3           "Taskwarrior unterstützt Datei-Format 3 nicht mehr, welches ursprünglich zwischen dem 23. März 2009 und 16. Mai 2009 eingesetzt wurde."
-#define STRING_TASK_PARSE_UNREC_FF   "Nicht erkanntes taskwarrior-Dateiformat."
 #define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
 #define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum."
-#define STRING_TASK_VALID_BLANK      "Leere Aufgaben können nicht angelegt werden."
-#define STRING_TASK_VALID_REC_DUE    "Wiederholende Aufgaben müssen eine Fälligkeit besitzen."
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index b3a7ad65f..a87d7ed34 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 5b4765997..4609a858e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Detektis kaj malpermesis ciklan dependecon."
-#define STRING_TASK_DEPEND_DUP       "Tasko {1} jam dependas de tasko {2}."
-#define STRING_TASK_DEPEND_ITSELF    "Tasko ne povas dependi de si mem."
-#define STRING_TASK_DEPEND_MISS_CREA "Ne povis krei dependecon de tasko {1} - netrovita."
-#define STRING_TASK_DEPEND_MISS_DEL  "Ne povis viŝi dependecon de tasko {1} - netrovita."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Komento havas mankon de priskribo: {1}"
-#define STRING_TASK_NO_ENTRY         "Komento havas mankon de enskrib-dato: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior ne pli subtenas dosier-aranĝon 1, kiu estis originale uzata inter la 27-a de novembro 2006 kaj la 31-a de decembro 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior ne pli subtenas dosier-aranĝon 2, kiu estis originale uzata inter la 1-a de januaro 2008 kaj la 12-a de aprilo 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Ne povis rekoni taskan dosier-aranĝon."
 #define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
 #define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Averto: Vi specifis daton '{1}' post dato '{2}'."
-#define STRING_TASK_VALID_BLANK      "Ne povas krei blankan taskon."
-#define STRING_TASK_VALID_REC_DUE    "Reokazanta tasko devas ankaŭ havi daton 'due'."
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 754602f7d..a00fb7edf 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Dependencia circular detectada y anulada."
-#define STRING_TASK_DEPEND_DUP       "La tarea {1} ya depende de la tarea {2}."
-#define STRING_TASK_DEPEND_ITSELF    "Una tarea no puede depender de sí misma."
-#define STRING_TASK_DEPEND_MISS_CREA "No se pudo crear una dependencia de la tarea {1} - no encontrada."
-#define STRING_TASK_DEPEND_MISS_DEL  "No se pudo eliminar una dependencia de la tarea {1} - no encontrada."
-#define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
-#define STRING_TASK_NO_DESC          "La anotación carece de descripción: {1}"
-#define STRING_TASK_NO_ENTRY         "La anotación carece de fecha de entrada: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior ya no admite el formato de archivo 1, usado originalmente entre el 27 de noviembre de 2006 y el 31 de diciembre de 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior ya no admite el formato de archivo 2, usado originalmente entre el 1 de enero de 2008 y el 12 de abril de 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior ya no admite el formato de archivo 3, usado originalmente entre el 23 de marzo de 2009 y el  16 de mayo de 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Formato de archivo taskwarrior no reconocido."
 #define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
 #define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'."
-#define STRING_TASK_VALID_BLANK      "No se puede añadir una tarea que está en blanco."
-#define STRING_TASK_VALID_REC_DUE    "Una tarea recurrente debe tener también una fecha de vencimiento."
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index e8f5e6da7..a87d7ed34 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_DEPEND_DUP       "La tâche {1} dépend déjà de la tâche {2}."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index fd835ca0f..7aebab6bb 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Dipendenza circolare riscontrata ed evitata."
-#define STRING_TASK_DEPEND_DUP       "Task {1} già dipende da {2}."
-#define STRING_TASK_DEPEND_ITSELF    "Un task non può dipendere da sè stesso."
-#define STRING_TASK_DEPEND_MISS_CREA "Impossibile creare la dipendenza dal task {1} - non trovato."
-#define STRING_TASK_DEPEND_MISS_DEL  "Impossibile cancellare la dipendenza dal task {1} - non trovato."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Annotazione senza descrizione: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotazione senza data di immissione: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior non supporta più il formato di file 1, usato tra il 27 Novembre 2006 e il 31 Dicembre 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Formato di file non riconosciuto."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Warning: data '{1}' con valore successivo alla data '{2}'."
-#define STRING_TASK_VALID_BLANK      "Impossibile aggiungere un task vuoto."
-#define STRING_TASK_VALID_REC_DUE    "Un task periodico deve avere una data di scadenza."
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index eb9026c38..412bfe02a 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Circular dependency detected and disallowed."
-#define STRING_TASK_DEPEND_DUP       "Task {1} already depends on task {2}."
-#define STRING_TASK_DEPEND_ITSELF    "A task cannot be dependent on itself."
-#define STRING_TASK_DEPEND_MISS_CREA "Could not create a dependency on task {1} - not found."
-#define STRING_TASK_DEPEND_MISS_DEL  "Could not delete a dependency on task {1} - not found."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Annotation is missing a description: {1}"
-#define STRING_TASK_NO_ENTRY         "Annotation is missing an entry date: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior no longer supports file format 1, originally used between 27 November 2006 and 31 December 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior no longer supports file format 2, originally used between 1 January 2008 and 12 April 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Unrecognized Taskwarrior file format or blank line in data."
 #define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
 #define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Warning: You have specified that the '{1}' date is after the '{2}' date."
-#define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 45e89eae7..374a1efa1 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Wykryto i nie dopuszczono do zależności cyklicznej."
-#define STRING_TASK_DEPEND_DUP       "Zadanie {1} już jest zależne od zadania {2}."
-#define STRING_TASK_DEPEND_ITSELF    "Zadanie nie może zależeć od samego siebie."
-#define STRING_TASK_DEPEND_MISS_CREA "Nie można dodać zależności dla zadania {1} - nie znaleziono."
-#define STRING_TASK_DEPEND_MISS_DEL  "Nie można usunąć zależności dla zadania {1} - nie znaleziono."
-#define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
-#define STRING_TASK_NO_DESC          "Komentarz nie posiada treści: {1}"
-#define STRING_TASK_NO_ENTRY         "Komentarz nie posiada daty utworzenia: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior nie wspiera więcej formatu plików 1, wcześniej używanego pomiędzy 27 Listopada 2006 i 31 Grudnia 2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior nie wspiera więcej formatu plików 2, wcześniej używanego pomiędzy 1 Stycznia 2008 i 12 Kwietnia 2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior nie wspiera więcej formatu plików 3, wcześniej używanego pomiędzy 23 Marca 2009 i 16 Maja 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Nierozpoznany format pliku programu taskwarrior."
 #define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
 #define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Uwaga: podałeś datę '{1}' jako datę po '{2}'."
-#define STRING_TASK_VALID_BLANK      "Nie można dodać pustego zadania."
-#define STRING_TASK_VALID_REC_DUE    "Zadanie cykliczne musi posiadać datę zakończenia."
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index f79569aa6..627a1cba5 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -31,23 +31,8 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
-#define STRING_TASK_DEPEND_CIRCULAR  "Dependência circular detetada e não permitida."
-#define STRING_TASK_DEPEND_DUP       "Tarefa {1} já depende da tarefa {2}."
-#define STRING_TASK_DEPEND_ITSELF    "Uma tarefa não pode depender dela própria."
-#define STRING_TASK_DEPEND_MISS_CREA "Não foi possível criar a dependência da tarefa {1} - esta não existe."
-#define STRING_TASK_DEPEND_MISS_DEL  "Não foi possível eliminar a dependência da tarefa {1} - esta não existe."
-#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
-#define STRING_TASK_NO_DESC          "Descrição da anotação em falta: {1}"
-#define STRING_TASK_NO_ENTRY         "Data de entrada da anotação em falta: {1}"
-#define STRING_TASK_NO_FF1           "Taskwarrior já não suporta o formato 1, originalmente usado entre 27-Novembro-2006 e 31-Dezembro-2007."
-#define STRING_TASK_NO_FF2           "Taskwarrior já não suporta o formato 2, originalmente usado entre 1-Janeiro-2008 e 12-April-2009."
-#define STRING_TASK_NO_FF3           "Taskwarrior no longer supports file format 3, originally used between 23 March 2009 and 16 May 2009."
-#define STRING_TASK_PARSE_UNREC_FF   "Formato taskwarrior não reconhecido."
 #define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
 #define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
 #define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
-#define STRING_TASK_VALID_BEFORE     "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'."
-#define STRING_TASK_VALID_BLANK      "Não é possível adicionar uma tarefa em branco."
-#define STRING_TASK_VALID_REC_DUE    "Uma tarefa recorrente necessita de uma data de vencimento."
 
 #endif

From 540484f92fa5c6e47e3514dc67ad78fe94ca34cc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:21:43 -0500
Subject: [PATCH 713/879] l10n: Eliminated some column labels

---
 src/Filter.cpp     | 7 +++----
 src/l10n/deu-DEU.h | 3 ---
 src/l10n/eng-USA.h | 3 ---
 src/l10n/epo-RUS.h | 3 ---
 src/l10n/esp-ESP.h | 3 ---
 src/l10n/fra-FRA.h | 3 ---
 src/l10n/ita-ITA.h | 3 ---
 src/l10n/jpn-JPN.h | 3 ---
 src/l10n/pol-POL.h | 3 ---
 src/l10n/por-PRT.h | 3 ---
 10 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/Filter.cpp b/src/Filter.cpp
index 2b36b28ea..211d7defd 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -32,7 +32,6 @@
 #include <DOM.h>
 #include <Eval.h>
 #include <Variant.h>
-#include <i18n.h>
 #include <format.h>
 #include <shared.h>
 
@@ -278,15 +277,15 @@ void Filter::safety () const
         ! filter)
     {
       if (! context.config.getBoolean ("allow.empty.filter"))
-         throw std::string (STRING_TASK_SAFETY_ALLOW);
+         throw std::string ("You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken.");
 
       // If user is willing to be asked, this can be avoided.
       if (context.config.getBoolean ("confirmation") &&
-          confirm (STRING_TASK_SAFETY_VALVE))
+          confirm ("This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"))
         return;
 
       // Sound the alarm.
-      throw std::string (STRING_TASK_SAFETY_FAIL);
+      throw std::string ("Command prevented from running.");
     }
   }
 }
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 2b1a3466b..7ebd2b318 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
-#define STRING_TASK_SAFETY_ALLOW     "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
-#define STRING_TASK_SAFETY_FAIL      "Befehl an Ausführung gehindert."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index a87d7ed34..3b9d978f3 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 4609a858e..fab45d47e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
-#define STRING_TASK_SAFETY_ALLOW     "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
-#define STRING_TASK_SAFETY_FAIL      "Antaŭmalebligis komandon."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index a00fb7edf..3b6b0c4f1 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
-#define STRING_TASK_SAFETY_ALLOW     "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
-#define STRING_TASK_SAFETY_FAIL      "Se impidió la ejecución del comando."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index a87d7ed34..3b9d978f3 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_SAFETY_FAIL      "Command prevented from running."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 7aebab6bb..0a27d7d11 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
-#define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_SAFETY_FAIL      "Prevenuta l'esecuzione del comando."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 412bfe02a..5ab45c26e 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
-#define STRING_TASK_SAFETY_ALLOW     "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
-#define STRING_TASK_SAFETY_FAIL      "コマンドの実行は中止された。"
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 374a1efa1..ee2d3a60e 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
-#define STRING_TASK_SAFETY_ALLOW     "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
-#define STRING_TASK_SAFETY_FAIL      "Niedopuszczono do wykonania polecenia."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 627a1cba5..9a3517a4f 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -31,8 +31,5 @@
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
 #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
 #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
-#define STRING_TASK_SAFETY_ALLOW     "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
-#define STRING_TASK_SAFETY_FAIL      "Execução do comando abortada."
-#define STRING_TASK_SAFETY_VALVE     "This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"
 
 #endif

From a9adf06d9898e825a77746764f2a1f00d4ef5c74 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:22:41 -0500
Subject: [PATCH 714/879] l10n: Eliminated some column labels

---
 src/l10n/deu-DEU.h | 2 --
 src/l10n/eng-USA.h | 2 --
 src/l10n/epo-RUS.h | 2 --
 src/l10n/esp-ESP.h | 2 --
 src/l10n/fra-FRA.h | 2 --
 src/l10n/ita-ITA.h | 2 --
 src/l10n/jpn-JPN.h | 2 --
 src/l10n/pol-POL.h | 2 --
 src/l10n/por-PRT.h | 2 --
 9 files changed, 18 deletions(-)

diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7ebd2b318..7211108df 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
 #define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)"
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3b9d978f3..723e13a6f 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index fab45d47e..0d99cb933 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
 #define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)"
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 3b6b0c4f1..314db44ab 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
 #define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)"
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 3b9d978f3..723e13a6f 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
 #define STRING_FEEDBACK_NO_TASKS     "No tasks."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 0a27d7d11..ec706a2aa 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
 #define STRING_FEEDBACK_NO_TASKS     "Nessun task."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} task)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 task)"
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 5ab45c26e..18871484c 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
 #define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)"
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index ee2d3a60e..be1f03370 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
 #define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)"
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 9a3517a4f..12caccf8c 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -29,7 +29,5 @@
 
 #define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
 #define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
-#define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)"
-#define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)"
 
 #endif

From 0ffadafe3c8e3c11b5dccd4353bbf5cdd051fa3b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:25:11 -0500
Subject: [PATCH 715/879] l10n: Eliminated some column labels

---
 src/commands/CmdHistory.cpp | 5 ++---
 src/l10n/deu-DEU.h          | 1 -
 src/l10n/eng-USA.h          | 1 -
 src/l10n/epo-RUS.h          | 1 -
 src/l10n/esp-ESP.h          | 1 -
 src/l10n/fra-FRA.h          | 1 -
 src/l10n/ita-ITA.h          | 1 -
 src/l10n/jpn-JPN.h          | 1 -
 src/l10n/pol-POL.h          | 1 -
 src/l10n/por-PRT.h          | 1 -
 10 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 99c1d83ec..716a7068b 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -33,7 +33,6 @@
 #include <main.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <Datetime.h>
 
 #define STRING_CMD_HISTORY_YEAR      "Year"
@@ -186,7 +185,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
   }
   else
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS);
+    context.footnote ("No tasks.");
     rc = 1;
   }
 
@@ -278,7 +277,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
         << '\n';
   else
   {
-    context.footnote (STRING_FEEDBACK_NO_TASKS);
+    context.footnote ("No tasks.");
     rc = 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 7211108df..e13959741 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
-#define STRING_FEEDBACK_NO_TASKS     "Keine Aufgaben."
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 723e13a6f..8bdf3f019 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
-#define STRING_FEEDBACK_NO_TASKS     "No tasks."
 
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 0d99cb933..80711bb5e 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
-#define STRING_FEEDBACK_NO_TASKS     "Nenia tasko."
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 314db44ab..b1d9547af 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
-#define STRING_FEEDBACK_NO_TASKS     "Ninguna tarea."
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 723e13a6f..8bdf3f019 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "No matches."
-#define STRING_FEEDBACK_NO_TASKS     "No tasks."
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ec706a2aa..219b5bf83 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
-#define STRING_FEEDBACK_NO_TASKS     "Nessun task."
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 18871484c..95e659224 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
-#define STRING_FEEDBACK_NO_TASKS     "タスクがない。"
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index be1f03370..4b95fe990 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
-#define STRING_FEEDBACK_NO_TASKS     "Brak zadań."
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index 12caccf8c..b709feb2a 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -28,6 +28,5 @@
 #define INCLUDED_STRINGS
 
 #define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
-#define STRING_FEEDBACK_NO_TASKS     "Nenhuma tarefa."
 
 #endif

From 1ea9721e90ae93519e06e333b7f7ba3d4df06253 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:26:38 -0500
Subject: [PATCH 716/879] l10n: Eliminated some column labels

---
 src/commands/CmdBurndown.cpp | 2 +-
 src/commands/CmdCustom.cpp   | 2 +-
 src/l10n/deu-DEU.h           | 1 -
 src/l10n/eng-USA.h           | 2 --
 src/l10n/epo-RUS.h           | 1 -
 src/l10n/esp-ESP.h           | 1 -
 src/l10n/fra-FRA.h           | 1 -
 src/l10n/ita-ITA.h           | 1 -
 src/l10n/jpn-JPN.h           | 1 -
 src/l10n/pol-POL.h           | 1 -
 src/l10n/por-PRT.h           | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 66e1536a2..ba0034857 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -397,7 +397,7 @@ std::string Chart::render ()
   }
 
   if (_max_value == 0)
-    context.footnote (STRING_FEEDBACK_NO_MATCH);
+    context.footnote ("No matches.");
 
   // Create a grid, folded into a string.
   _grid = "";
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index ce173ef22..a41d2c4a0 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -229,7 +229,7 @@ int CmdCustom::execute (std::string& output)
   }
   else
   {
-    context.footnote (STRING_FEEDBACK_NO_MATCH);
+    context.footnote ("No matches.");
     rc = 1;
   }
 
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index e13959741..930f43371 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Keine treffer."
 
 #endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 8bdf3f019..b09566b31 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,6 +27,4 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "No matches."
-
 #endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 80711bb5e..930f43371 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Nenia kongruanto."
 
 #endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index b1d9547af..930f43371 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Ninguna coincidencia."
 
 #endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 8bdf3f019..930f43371 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "No matches."
 
 #endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index 219b5bf83..930f43371 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Nessuna corrispondenza."
 
 #endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index 95e659224..930f43371 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "一致したものはありません。"
 
 #endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 4b95fe990..11e3cc2bc 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Nie znaleziono pasujących."
 
 #endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index b709feb2a..930f43371 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,6 +27,5 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_FEEDBACK_NO_MATCH     "Nenhuma correspondência."
 
 #endif

From 7be5b866182bb3e4eb934ea457226ebad5c53400 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:29:59 -0500
Subject: [PATCH 717/879] l10n: Eliminated i18n.h

---
 src/CLI2.cpp                 |  1 -
 src/CMakeLists.txt           |  1 -
 src/ViewTask.cpp             |  1 -
 src/columns/ColScheduled.cpp |  1 -
 src/columns/ColTags.cpp      |  1 -
 src/columns/ColTypeDate.cpp  |  1 -
 src/columns/ColUDA.cpp       |  1 -
 src/commands/CmdBurndown.cpp |  1 -
 src/commands/CmdCustom.cpp   |  1 -
 src/commands/CmdHistory.h    |  1 -
 src/commands/CmdSummary.cpp  |  1 -
 src/i18n.h                   | 66 ------------------------------------
 src/l10n/deu-DEU.h           | 31 -----------------
 src/l10n/eng-USA.h           | 30 ----------------
 src/l10n/epo-RUS.h           | 31 -----------------
 src/l10n/esp-ESP.h           | 31 -----------------
 src/l10n/fra-FRA.h           | 31 -----------------
 src/l10n/ita-ITA.h           | 31 -----------------
 src/l10n/jpn-JPN.h           | 31 -----------------
 src/l10n/pol-POL.h           | 31 -----------------
 src/l10n/por-PRT.h           | 31 -----------------
 src/recur.cpp                |  1 -
 22 files changed, 356 deletions(-)
 delete mode 100644 src/i18n.h
 delete mode 100644 src/l10n/deu-DEU.h
 delete mode 100644 src/l10n/eng-USA.h
 delete mode 100644 src/l10n/epo-RUS.h
 delete mode 100644 src/l10n/esp-ESP.h
 delete mode 100644 src/l10n/fra-FRA.h
 delete mode 100644 src/l10n/ita-ITA.h
 delete mode 100644 src/l10n/jpn-JPN.h
 delete mode 100644 src/l10n/pol-POL.h
 delete mode 100644 src/l10n/por-PRT.h

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index a4070c340..3bd4332ab 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -34,7 +34,6 @@
 #include <Color.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 382a19502..15a94a656 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,6 @@ add_library (task CLI2.cpp CLI2.h
                   ViewTask.cpp ViewTask.h
                   dependency.cpp
                   feedback.cpp
-                  i18n.h
                   legacy.cpp
                   nag.cpp
                   recur.cpp
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 411b6191c..9ef8ba3fa 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -31,7 +31,6 @@
 #include <format.h>
 #include <util.h>
 #include <utf8.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index b585edd81..2f55a0298 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -26,7 +26,6 @@
 
 #include <cmake.h>
 #include <ColScheduled.h>
-#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 ColumnScheduled::ColumnScheduled ()
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 9b90a5de4..d4a654517 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -33,7 +33,6 @@
 #include <Filter.h>
 #include <shared.h>
 #include <format.h>
-#include <i18n.h>
 #include <utf8.h>
 #include <main.h>
 
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index afae46348..2502784a7 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -33,7 +33,6 @@
 #include <Variant.h>
 #include <Filter.h>
 #include <format.h>
-#include <i18n.h>
 
 extern Context context;
 extern Task& contextTask;
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index b991eb183..463b3ef9d 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -32,7 +32,6 @@
 #include <shared.h>
 #include <format.h>
 #include <utf8.h>
-#include <i18n.h>
 #include <stdlib.h>
 
 extern Context context;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index ba0034857..eb70b22b3 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -37,7 +37,6 @@
 #include <Datetime.h>
 #include <Duration.h>
 #include <main.h>
-#include <i18n.h>
 #include <shared.h>
 #include <format.h>
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index a41d2c4a0..90f4abbe9 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -35,7 +35,6 @@
 #include <Filter.h>
 #include <Lexer.h>
 #include <ViewTask.h>
-#include <i18n.h>
 #include <format.h>
 #include <shared.h>
 #include <util.h>
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index d94eeaf95..b51a2303c 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -31,7 +31,6 @@
 #include <Command.h>
 #include <Table.h>
 #include <Datetime.h>
-#include <i18n.h>
 
 template<class HistoryStrategy>
 class CmdHistoryBase : public Command
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 1fd483d9b..65a511306 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -35,7 +35,6 @@
 #include <Duration.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
 extern Context context;
diff --git a/src/i18n.h b/src/i18n.h
deleted file mode 100644
index 205d9d7ea..000000000
--- a/src/i18n.h
+++ /dev/null
@@ -1,66 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Strings that should be localized:
-//   - All text output that the user sees or types
-//
-// Strings that should NOT be localized:
-//   - ./taskrc configuration variable names
-//   - certain literals associated with parsing
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_I18N
-#define INCLUDED_I18N
-
-#include <cmake.h>
-
-// Translators:
-//   Add more, as appropriate.
-#if PACKAGE_LANGUAGE == LANGUAGE_ENG_USA
-#include <l10n/eng-USA.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_ESP_ESP
-#include <l10n/esp-ESP.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_FRA_FRA
-#include <l10n/fra-FRA.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU
-#include <l10n/deu-DEU.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_ITA_ITA
-#include <l10n/ita-ITA.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_POR_PRT
-#include <l10n/por-PRT.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_EPO_RUS
-#include <l10n/epo-RUS.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_POL_POL
-#include <l10n/pol-POL.h>
-#elif PACKAGE_LANGUAGE == LANGUAGE_JPN_JPN
-#include <l10n/jpn-JPN.h>
-#endif
-
-#endif
-
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/deu-DEU.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
deleted file mode 100644
index b09566b31..000000000
--- a/src/l10n/eng-USA.h
+++ /dev/null
@@ -1,30 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-#endif
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/epo-RUS.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/esp-ESP.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/fra-FRA.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/ita-ITA.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/jpn-JPN.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
deleted file mode 100644
index 11e3cc2bc..000000000
--- a/src/l10n/pol-POL.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
deleted file mode 100644
index 930f43371..000000000
--- a/src/l10n/por-PRT.h
+++ /dev/null
@@ -1,31 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2018, 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
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_STRINGS
-#define INCLUDED_STRINGS
-
-
-#endif
diff --git a/src/recur.cpp b/src/recur.cpp
index 15d71a9bf..13d4a0400 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -43,7 +43,6 @@
 #include <Duration.h>
 #include <format.h>
 #include <util.h>
-#include <i18n.h>
 #include <main.h>
 
 // Global context for use by all.

From 34c5a686352bb72c2a846a8fe534e4ee6cc7064c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 21 Jan 2018 23:34:45 -0500
Subject: [PATCH 718/879] I18N: Removed language build settings

---
 CMakeLists.txt | 17 -----------------
 ChangeLog      |  1 +
 INSTALL        | 20 --------------------
 cmake.h.in     | 12 ------------
 4 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7d2a67e6..f70e672b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,23 +125,6 @@ if (SOLARIS)
   endif (NSL_LIBRARY)
 endif (SOLARIS)
 
-# Set the package language.
-if (LANGUAGE)
-  set (PACKAGE_LANGUAGE ${LANGUAGE})
-else (LANGUAGE)
-  set (PACKAGE_LANGUAGE 1)
-endif (LANGUAGE)
-
-set (LANGUAGE_ENG_USA 1)
-set (LANGUAGE_ESP_ESP 2)
-set (LANGUAGE_DEU_DEU 3)
-set (LANGUAGE_FRA_FRA 4)
-set (LANGUAGE_ITA_ITA 5)
-set (LANGUAGE_POR_PRT 6)
-set (LANGUAGE_EPO_RUS 7)
-set (LANGUAGE_POL_POL 8)
-set (LANGUAGE_JPN_JPN 9)
-
 message ("-- Configuring cmake.h")
 configure_file (
   ${CMAKE_SOURCE_DIR}/cmake.h.in
diff --git a/ChangeLog b/ChangeLog
index aa08e7819..6e3df0dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,6 +106,7 @@
   tw.width, tw.height, tw.version.
 - The message telling you to sync now indicates how many local changes will be
   synced.
+- Removed compile-time language settings and I18N.
 
 ------ current release ---------------------------
 
diff --git a/INSTALL b/INSTALL
index 75a222eb8..5893488ee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -103,26 +103,6 @@ In order to build Taskwarrior without "sync" support, call cmake with the
 and proceed as described in "Basic Installation".
 
 
-Localizations
--------------
-
-To make use of a translation, specify a language number, as found in cmake.h:
-
-  $ cmake -DLANGUAGE=2 .
-
-Currently the defined languages are:
-
-  eng_USA 1
-  esp_ESP 2
-  deu_DEU 3
-  fra_FRA 4
-  ita_ITA 5
-  por_PRT 6
-  epo_RUS 7
-  pol_POL 8
-  jpn-JPN 9
-
-
 Uninstallation
 --------------
 
diff --git a/cmake.h.in b/cmake.h.in
index aee21418f..ff74c832b 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -17,18 +17,6 @@
 /* Installation details */
 #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"
 
-/* Localization */
-#define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE}
-#define LANGUAGE_ENG_USA ${LANGUAGE_ENG_USA}
-#define LANGUAGE_ESP_ESP ${LANGUAGE_ESP_ESP}
-#define LANGUAGE_FRA_FRA ${LANGUAGE_FRA_FRA}
-#define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
-#define LANGUAGE_ITA_ITA ${LANGUAGE_ITA_ITA}
-#define LANGUAGE_POR_PRT ${LANGUAGE_POR_PRT}
-#define LANGUAGE_EPO_RUS ${LANGUAGE_EPO_RUS}
-#define LANGUAGE_POL_POL ${LANGUAGE_POL_POL}
-#define LANGUAGE_JPN_JPN ${LANGUAGE_JPN_JPN}
-
 /* git information */
 #cmakedefine HAVE_COMMIT
 

From 41491843deffbab8746748c7e7c92ff1fd98fa82 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Jan 2018 21:51:48 -0500
Subject: [PATCH 719/879] Tests: Fixed brokend color.footnote test

---
 test/color.rules.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/color.rules.t b/test/color.rules.t
index f35c6ba18..f3d3a1c3a 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -144,7 +144,7 @@ class TestColorRules(TestCase):
 
     def test_color_footnote(self):
         """Footnote color."""
-        code, out, err = self.t('rc.verbose=footnote /control/')
+        code, out, err = self.t('rc.verbose=on /control/')
         self.assertIn('\x1b[31mConfiguration override', err)
 
     def test_color_debug(self):

From e0dbf4b691cee50e4f274dffc20fe3c1342b5a02 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Jan 2018 21:53:26 -0500
Subject: [PATCH 720/879] Tests: Fixed broken color merge tests

---
 test/color.rules.t | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/color.rules.t b/test/color.rules.t
index f3d3a1c3a..3379244be 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -229,11 +229,10 @@ class TestColorRulesMerging(TestCase):
         self.t.config('color.tagged','on white')
         self.t.config('rule.color.precedence', 'due,tagged')
 
-        self.t('add due:today +home hometask')  # Task that matches both color rules
+        self.t('add due:tomorrow +home hometask')  # Task that matches both color rules
 
     @unittest.skipIf('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin')
     @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD')
-    @unittest.expectedFailure
     def test_colors_merge(self):
         """Tests whether colors merge"""
         code, out, err = self.t('1 info')
@@ -241,8 +240,6 @@ class TestColorRulesMerging(TestCase):
 
     @unittest.skipIf('CYGWIN' in platform.system(), 'Skipping color merge test for Cygwin')
     @unittest.skipIf('FreeBSD' in platform.system(), 'Skipping color merge test for FREEBSD')
-    @unittest.expectedFailure
-    @unittest.expectedFailure
     def test_colors_merge_off(self):
         """No color merge behaviour with rule.color.merge=no"""
         self.t.config('rule.color.merge', 'no')

From d5a0b616e16d481b93d60339a9e1f9f390adb61c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Jan 2018 23:50:42 -0500
Subject: [PATCH 721/879] Lexer: Fixed DOM missing lookahead

---
 src/Lexer.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index b6372b29d..9365f2344 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -726,7 +726,7 @@ bool Lexer::isNumber (std::string& token, Lexer::Type& type)
       }
     }
 
-    // Lookahread: !<isWhitespace> | !<isSingleCharOperator>
+    // Lookahead: !<isWhitespace> | !<isSingleCharOperator>
     // If there is an immediately consecutive character, that is not an operator, fail.
     if (_eos > marker &&
         ! isWhitespace (_text[marker]) &&
@@ -1173,6 +1173,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
 
+  // rc. ...
   std::string partialToken;
   Lexer::Type partialType;
   if (isLiteral ("rc.", false, false) &&
@@ -1185,6 +1186,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
   else
     _cursor = marker;
 
+  // Literals
   if (isOneOf ({"tw.syncneeded",
                 "tw.program",
                 "tw.args",
@@ -1233,7 +1235,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
   else
     _cursor = checkpoint;
 
-  // [prefix]attribute
+  // [prefix]attribute (bounded)
   if (isOneOf (attributes, false, true))
   {
     token = _text.substr (marker, _cursor - marker);
@@ -1241,7 +1243,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
     return true;
   }
 
-  // [prefix]attribute.
+  // [prefix]attribute. (unbounded)
   if (isOneOf (attributes, false, false))
   {
     if (isLiteral (".", false, false))
@@ -1259,13 +1261,19 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
         type = Lexer::Type::dom;
         return true;
       }
+
+      _cursor = checkpoint;
     }
-    else
+
+    // Lookahead: !<alpha>
+    else if (! isAlpha (_text[marker]))
     {
       token = _text.substr (marker, _cursor - marker);
       type = Lexer::Type::dom;
       return true;
     }
+
+    _cursor = checkpoint;
   }
 
   // [prefix]annotations.
@@ -1310,6 +1318,8 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
         }
       }
     }
+    else
+      _cursor = checkpoint;
   }
 
   _cursor = marker;
@@ -1450,6 +1460,7 @@ bool Lexer::isAllDigits (const std::string& text)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// This is intentionally looking for a single token.
 bool Lexer::isDOM (const std::string& text)
 {
   Lexer lex (text);

From 2c89688b46d526ea7d3fd60eff9e9390a304f305 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Jan 2018 23:57:44 -0500
Subject: [PATCH 722/879] TW-1947: "urgency.over" filter seems to not work
 correct

- Thanks to Marc Richter.
---
 AUTHORS          |  1 +
 ChangeLog        |  2 ++
 src/CLI2.cpp     | 19 ++++++++++++-------
 test/operators.t | 20 ++++++++++++++++++++
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ab810b47e..5598ef1f2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -318,3 +318,4 @@ suggestions:
   Dan Callahan
   Martin Strunz
   Kai HTML
+  Marc Richter
diff --git a/ChangeLog b/ChangeLog
index 6e3df0dd3..9ae14736d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@
           (thanks to Paul J. Fenwick)
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
           (thanks to Paul J. Fenwick)
+- TW-1947 "urgency.over" filter seems to not work correct
+          (thanks to Marc Richter).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 3bd4332ab..b5719f5a6 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1279,7 +1279,7 @@ void CLI2::desugarFilterAttributes ()
         A2 op ("", Lexer::Type::op);
         op.tag ("FILTER");
 
-        A2 rhs ("", Lexer::Type::string);
+        A2 rhs ("", values[0]._lextype);
         rhs.tag ("FILTER");
 
         // Special case for '<name>:<value>'.
@@ -1372,16 +1372,21 @@ void CLI2::desugarFilterAttributes ()
         reconstructed.push_back (op);
 
         // Do not modify this construct without full understanding.
-        if (values.size () == 1 || ! evalSupported)
+        // Getting this wrong breaks a whole lot of filtering tests.
+        if (values.size () > 1 || evalSupported)
         {
-          if (Lexer::isDOM (rhs.attribute ("raw")))
-            rhs._lextype = Lexer::Type::dom;
-
+          for (auto& v : values)
+            reconstructed.push_back (v);
+        }
+        else if (Lexer::isDOM (rhs.attribute ("raw")))
+        {
+          rhs._lextype = Lexer::Type::dom;
           reconstructed.push_back (rhs);
         }
         else
-          for (auto& v : values)
-            reconstructed.push_back (v);
+        {
+          reconstructed.push_back (rhs);
+        }
 
         found = true;
       }
diff --git a/test/operators.t b/test/operators.t
index 71642876b..91cb16ffd 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -269,6 +269,16 @@ class TestOperatorsQuantity(TestCase):
         self.assertNotIn("four", out)
         self.assertNotIn("five", out)
 
+    def test_urgency_over(self):
+        """operator urgency.over:10.0"""
+        code, out, err = self.t("ls urgency.over:10.0")
+
+        self.assertIn("one", out)
+        self.assertIn("two", out)
+        self.assertNotIn("three", out)
+        self.assertNotIn("four", out)
+        self.assertNotIn("five", out)
+
     # < operator #
 
     def test_due_before(self):
@@ -331,6 +341,16 @@ class TestOperatorsQuantity(TestCase):
         self.assertIn("four", out)
         self.assertIn("five", out)
 
+    def test_urgency_under(self):
+        """operator urgency.under:10.0"""
+        code, out, err = self.t("ls urgency.under:10.0")
+
+        self.assertNotIn("one", out)
+        self.assertNotIn("two", out)
+        self.assertIn("three", out)
+        self.assertIn("four", out)
+        self.assertIn("five", out)
+
     # >= operator #
 
     def test_due_greater_equal(self):

From 49dedfbc86886c427108cf1300d47fab0fc56a8b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Jan 2018 00:47:23 -0500
Subject: [PATCH 723/879] Lexer: Migrated to unicodeWhitespace

---
 src/Lexer.cpp    | 106 +++++++++++++++--------------------------------
 src/Lexer.h      |   1 -
 src/util.cpp     |   3 +-
 test/lexer.t.cpp |  33 +--------------
 4 files changed, 37 insertions(+), 106 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 9365f2344..9b399fec7 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <Datetime.h>
 #include <Duration.h>
+#include <unicode.h>
 #include <utf8.h>
 
 static const std::string uuid_pattern = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
@@ -59,7 +60,7 @@ Lexer::~Lexer ()
 bool Lexer::token (std::string& token, Lexer::Type& type)
 {
   // Eat white space.
-  while (isWhitespace (_text[_cursor]))
+  while (unicodeWhitespace (_text[_cursor]))
     utf8_next_char (_text, _cursor);
 
   // Terminate at EOS.
@@ -142,48 +143,6 @@ const std::string Lexer::typeName (const Lexer::Type& type)
   return "unknown";
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Complete Unicode whitespace list.
-//
-// http://en.wikipedia.org/wiki/Whitespace_character
-// Updated 2015-09-13
-// Static
-//
-// TODO This list should be derived from the Unicode database.
-bool Lexer::isWhitespace (int c)
-{
-  return (c == 0x0020 ||   // space Common  Separator, space
-          c == 0x0009 ||   // Common  Other, control  HT, Horizontal Tab
-          c == 0x000A ||   // Common  Other, control  LF, Line feed
-          c == 0x000B ||   // Common  Other, control  VT, Vertical Tab
-          c == 0x000C ||   // Common  Other, control  FF, Form feed
-          c == 0x000D ||   // Common  Other, control  CR, Carriage return
-          c == 0x0085 ||   // Common  Other, control  NEL, Next line
-          c == 0x00A0 ||   // no-break space  Common  Separator, space
-          c == 0x1680 ||   // ogham space mark  Ogham Separator, space
-          c == 0x180E ||   // mongolian vowel separator Mongolian Separator, space
-          c == 0x2000 ||   // en quad Common  Separator, space
-          c == 0x2001 ||   // em quad Common  Separator, space
-          c == 0x2002 ||   // en space  Common  Separator, space
-          c == 0x2003 ||   // em space  Common  Separator, space
-          c == 0x2004 ||   // three-per-em space  Common  Separator, space
-          c == 0x2005 ||   // four-per-em space Common  Separator, space
-          c == 0x2006 ||   // six-per-em space  Common  Separator, space
-          c == 0x2007 ||   // figure space  Common  Separator, space
-          c == 0x2008 ||   // punctuation space Common  Separator, space
-          c == 0x2009 ||   // thin space  Common  Separator, space
-          c == 0x200A ||   // hair space  Common  Separator, space
-          c == 0x200B ||   // zero width space
-          c == 0x200C ||   // zero width non-joiner
-          c == 0x200D ||   // zero width joiner
-          c == 0x2028 ||   // line separator  Common  Separator, line
-          c == 0x2029 ||   // paragraph separator Common  Separator, paragraph
-          c == 0x202F ||   // narrow no-break space Common  Separator, space
-          c == 0x205F ||   // medium mathematical space Common  Separator, space
-          c == 0x2060 ||   // word joiner
-          c == 0x3000);    // ideographic space Common  Separator, space
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Lexer::isAlpha (int c)
 {
@@ -213,7 +172,7 @@ bool Lexer::isHexDigit (int c)
 bool Lexer::isIdentifierStart (int c)
 {
   return c                          &&  // Include null character check.
-         ! isWhitespace         (c) &&
+         ! unicodeWhitespace    (c) &&
          ! isDigit              (c) &&
          ! isSingleCharOperator (c) &&
          ! isPunctuation        (c);
@@ -225,7 +184,7 @@ bool Lexer::isIdentifierNext (int c)
   return c                          &&  // Include null character check.
          c != ':'                   &&  // Used in isPair.
          c != '='                   &&  // Used in isPair.
-         ! isWhitespace         (c) &&
+         ! unicodeWhitespace    (c) &&
          ! isSingleCharOperator (c);
 }
 
@@ -272,15 +231,15 @@ bool Lexer::isTripleCharOperator (int c0, int c1, int c2, int c3)
 bool Lexer::isBoundary (int left, int right)
 {
   // EOS
-  if (right == '\0')                                 return true;
+  if (right == '\0')                                          return true;
 
   // XOR
-  if (isAlpha (left)       != isAlpha (right))       return true;
-  if (isDigit (left)       != isDigit (right))       return true;
-  if (isWhitespace (left)  != isWhitespace (right))  return true;
+  if (isAlpha (left)           != isAlpha (right))            return true;
+  if (isDigit (left)           != isDigit (right))            return true;
+  if (unicodeWhitespace (left) != unicodeWhitespace (right))  return true;
 
   // OR
-  if (isPunctuation (left) || isPunctuation (right)) return true;
+  if (isPunctuation (left) || isPunctuation (right))          return true;
 
   return false;
 }
@@ -289,7 +248,8 @@ bool Lexer::isBoundary (int left, int right)
 bool Lexer::isHardBoundary (int left, int right)
 {
   // EOS
-  if (right == '\0')                                               return true;
+  if (right == '\0')
+    return true;
 
   // FILTER operators that don't need to be surrounded by whitespace.
   if (left == '(' ||
@@ -628,10 +588,10 @@ bool Lexer::isUUID (std::string& token, Lexer::Type& type, bool endBoundary)
       break;
   }
 
-  if (i >= uuid_min_length              &&
-      (! endBoundary                    ||
-       ! _text[marker + i]              ||
-       isWhitespace (_text[marker + i]) ||
+  if (i >= uuid_min_length                   &&
+      (! endBoundary                         ||
+       ! _text[marker + i]                   ||
+       unicodeWhitespace (_text[marker + i]) ||
        isSingleCharOperator (_text[marker + i])))
   {
     token = _text.substr (_cursor, i);
@@ -726,10 +686,10 @@ bool Lexer::isNumber (std::string& token, Lexer::Type& type)
       }
     }
 
-    // Lookahead: !<isWhitespace> | !<isSingleCharOperator>
+    // Lookahead: !<unicodeWhitespace> | !<isSingleCharOperator>
     // If there is an immediately consecutive character, that is not an operator, fail.
     if (_eos > marker &&
-        ! isWhitespace (_text[marker]) &&
+        ! unicodeWhitespace (_text[marker]) &&
         ! isSingleCharOperator (_text[marker]))
       return false;
 
@@ -806,7 +766,7 @@ bool Lexer::isURL (std::string& token, Lexer::Type& type)
       marker += 3;
 
       while (marker < _eos &&
-             ! isWhitespace (_text[marker]))
+             ! unicodeWhitespace (_text[marker]))
         utf8_next_char (_text, marker);
 
       token = _text.substr (_cursor, marker - _cursor);
@@ -847,7 +807,7 @@ bool Lexer::isPair (std::string& token, Lexer::Type& type)
     if (readWord (_text, "'\"", _cursor, ignoredToken) ||
         readWord (_text,        _cursor, ignoredToken) ||
         isEOS ()                                       ||
-        isWhitespace (_text[_cursor]))
+        unicodeWhitespace (_text[_cursor]))
     {
       token = _text.substr (marker, _cursor - marker);
       type = Lexer::Type::pair;
@@ -901,7 +861,7 @@ bool Lexer::isSet (std::string& token, Lexer::Type& type)
   // Success is multiple numbers, matching the pattern.
   if (count > 1 &&
       (isEOS () ||
-       isWhitespace (_text[_cursor]) ||
+       unicodeWhitespace (_text[_cursor]) ||
        isHardBoundary (_text[_cursor], _text[_cursor + 1])))
   {
     token = _text.substr (marker, _cursor - marker);
@@ -916,7 +876,7 @@ bool Lexer::isSet (std::string& token, Lexer::Type& type)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::tag
-//   ^ | '(' | ')' | <isWhitespace>
+//   ^ | '(' | ')' | <unicodeWhitespace>
 //     [ +|- ] <isIdentifierStart> [ <isIdentifierNext> ]*
 bool Lexer::isTag (std::string& token, Lexer::Type& type)
 {
@@ -924,7 +884,7 @@ bool Lexer::isTag (std::string& token, Lexer::Type& type)
 
   // Lookbehind: Assert ^ or preceded by whitespace, (, or ).
   if (marker > 0                         &&
-      ! isWhitespace (_text[marker - 1]) &&
+      ! unicodeWhitespace (_text[marker - 1]) &&
       _text[marker - 1] != '('           &&
       _text[marker - 1] != ')')
     return false;
@@ -970,12 +930,12 @@ bool Lexer::isPath (std::string& token, Lexer::Type& type)
       break;
 
     if (_text[marker] &&
-        ! isWhitespace (_text[marker]) &&
+        ! unicodeWhitespace (_text[marker]) &&
         _text[marker] != '/')
     {
       utf8_next_char (_text, marker);
       while (_text[marker] &&
-             ! isWhitespace (_text[marker]) &&
+             ! unicodeWhitespace (_text[marker]) &&
              _text[marker] != '/')
         utf8_next_char (_text, marker);
     }
@@ -997,7 +957,7 @@ bool Lexer::isPath (std::string& token, Lexer::Type& type)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::substitution
-//   / <unquoted-string> / <unquoted-string> / [g]  <EOS> | <isWhitespace>
+//   / <unquoted-string> / <unquoted-string> / [g]  <EOS> | <unicodeWhitespace>
 bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
@@ -1012,9 +972,9 @@ bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
       if (_text[_cursor] == 'g')
         ++_cursor;
 
-      // Lookahread: <EOS> | <isWhitespace>
+      // Lookahread: <EOS> | <unicodeWhitespace>
       if (_text[_cursor] == '\0' ||
-          isWhitespace (_text[_cursor]))
+          unicodeWhitespace (_text[_cursor]))
       {
         token = _text.substr (marker, _cursor - marker);
         type = Lexer::Type::substitution;
@@ -1029,7 +989,7 @@ bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Lexer::Type::pattern
-//   / <unquoted-string> /  <EOS> | <isWhitespace>
+//   / <unquoted-string> /  <EOS> | <unicodeWhitespace>
 bool Lexer::isPattern (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
@@ -1037,7 +997,7 @@ bool Lexer::isPattern (std::string& token, Lexer::Type& type)
   std::string word;
   if (readWord (_text, "/", _cursor, word) &&
       (isEOS () ||
-       isWhitespace (_text[_cursor])))
+       unicodeWhitespace (_text[_cursor])))
   {
     token = _text.substr (marker, _cursor - marker);
     type = Lexer::Type::pattern;
@@ -1357,7 +1317,7 @@ bool Lexer::isWord (std::string& token, Lexer::Type& type)
   std::size_t marker = _cursor;
 
   while (_text[marker]                  &&
-         ! isWhitespace (_text[marker]) &&
+         ! unicodeWhitespace (_text[marker]) &&
          ! isSingleCharOperator (_text[marker]))
     utf8_next_char (_text, marker);
 
@@ -1393,7 +1353,7 @@ bool Lexer::isLiteral (
   // End boundary conditions must be met.
   if (endBoundary &&
       _text[_cursor + common] &&
-      ! Lexer::isWhitespace (_text[_cursor + common]) &&
+      ! unicodeWhitespace (_text[_cursor + common]) &&
       ! Lexer::isSingleCharOperator (_text[_cursor + common]))
     return false;
 
@@ -1567,7 +1527,7 @@ bool Lexer::readWord (
 //
 // Ends at:
 //   Lexer::isEOS
-//   Lexer::isWhitespace
+//   unicodeWhitespace
 //   Lexer::isHardBoundary
 bool Lexer::readWord (
   const std::string& text,
@@ -1582,7 +1542,7 @@ bool Lexer::readWord (
   while ((c = text[cursor]))  // Handles EOS.
   {
     // Unquoted word ends on white space.
-    if (Lexer::isWhitespace (c))
+    if (unicodeWhitespace (c))
       break;
 
     // Parentheses mostly.
diff --git a/src/Lexer.h b/src/Lexer.h
index 410843335..fe8b80e59 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -61,7 +61,6 @@ public:
 
   // Static helpers.
   static const std::string typeName          (const Lexer::Type&);
-  static bool isWhitespace                   (int);
   static bool isAlpha                        (int);
   static bool isDigit                        (int);
   static bool isHexDigit                     (int);
diff --git a/src/util.cpp b/src/util.cpp
index b5aa15873..1f9222cb8 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -51,6 +51,7 @@
 #include <signal.h>
 #include <sys/select.h>
 #include <Lexer.h>
+#include <unicode.h>
 #include <utf8.h>
 #include <util.h>
 #include <main.h>
@@ -268,7 +269,7 @@ bool nontrivial (const std::string& input)
   std::string::size_type i = 0;
   int character;
   while ((character = utf8_next_char (input, i)))
-    if (! Lexer::isWhitespace (character))
+    if (! unicodeWhitespace (character))
       return true;
 
   return false;
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index cc0c2747d..e16d12976 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -37,9 +37,9 @@
 int main (int, char**)
 {
 #ifdef PRODUCT_TASKWARRIOR
-  UnitTest t (1280);
+  UnitTest t (1253);
 #else
-  UnitTest t (1262);
+  UnitTest t (1235);
 #endif
 
   // Use same Datetime/Duraiton configuration as Context∴:staticInitialization.
@@ -58,35 +58,6 @@ int main (int, char**)
   Lexer::attributes["tags"]        = "string";
   Lexer::attributes["description"] = "string";
 
-  // White space detection.
-  t.notok (Lexer::isWhitespace (0x0041), "U+0041 (A) ! isWhitespace");
-  t.ok (Lexer::isWhitespace (0x0020), "U+0020 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x0009), "U+0009 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x000A), "U+000A isWhitespace");
-  t.ok (Lexer::isWhitespace (0x000B), "U+000B isWhitespace");
-  t.ok (Lexer::isWhitespace (0x000C), "U+000C isWhitespace");
-  t.ok (Lexer::isWhitespace (0x000D), "U+000D isWhitespace");
-  t.ok (Lexer::isWhitespace (0x0085), "U+0085 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x00A0), "U+00A0 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x1680), "U+1680 isWhitespace"); // 10
-  t.ok (Lexer::isWhitespace (0x180E), "U+180E isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2000), "U+2000 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2001), "U+2001 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2002), "U+2002 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2003), "U+2003 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2004), "U+2004 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2005), "U+2005 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2006), "U+2006 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2007), "U+2007 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2008), "U+2008 isWhitespace"); // 20
-  t.ok (Lexer::isWhitespace (0x2009), "U+2009 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x200A), "U+200A isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2028), "U+2028 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x2029), "U+2029 isWhitespace");
-  t.ok (Lexer::isWhitespace (0x202F), "U+202F isWhitespace");
-  t.ok (Lexer::isWhitespace (0x205F), "U+205F isWhitespace");
-  t.ok (Lexer::isWhitespace (0x3000), "U+3000 isWhitespace");
-
   // static bool Lexer::isBoundary (int, int);
   t.ok    (Lexer::isBoundary (' ', 'a'), "' ' --> 'a' = isBoundary");
   t.ok    (Lexer::isBoundary ('a', ' '), "'a' --> ' ' = isBoundary");

From ea26369f800e6bb473719f0433fd3acb49f20781 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Jan 2018 00:53:47 -0500
Subject: [PATCH 724/879] Lexer: Migrated to unicodeHexDigit

---
 src/Lexer.cpp | 29 ++++++++++-------------------
 src/Lexer.h   |  1 -
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 9b399fec7..df8af936d 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -159,15 +159,6 @@ bool Lexer::isDigit (int c)
   return c >= 0x30 && c <= 0x39;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Digits 0-9 a-f A-F.
-bool Lexer::isHexDigit (int c)
-{
-  return (c >= '0' && c <= '9') ||
-         (c >= 'a' && c <= 'f') ||
-         (c >= 'A' && c <= 'F');
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Lexer::isIdentifierStart (int c)
 {
@@ -581,7 +572,7 @@ bool Lexer::isUUID (std::string& token, Lexer::Type& type, bool endBoundary)
   {
     if (uuid_pattern[i] == 'x')
     {
-      if (! isHexDigit (_text[marker + i]))
+      if (! unicodeHexDigit (_text[marker + i]))
         break;
     }
     else if (uuid_pattern[i] != _text[marker + i])
@@ -616,7 +607,7 @@ bool Lexer::isHexNumber (std::string& token, Lexer::Type& type)
   {
     marker += 2;
 
-    while (isHexDigit (_text[marker]))
+    while (unicodeHexDigit (_text[marker]))
       ++marker;
 
     if (marker - _cursor > 2)
@@ -1469,10 +1460,10 @@ bool Lexer::readWord (
     else if (eos - cursor >= 6 &&
              ((text[cursor + 0] == 'U'  && text[cursor + 1] == '+') ||
               (text[cursor + 0] == '\\' && text[cursor + 1] == 'u')) &&
-             isHexDigit (text[cursor + 2]) &&
-             isHexDigit (text[cursor + 3]) &&
-             isHexDigit (text[cursor + 4]) &&
-             isHexDigit (text[cursor + 5]))
+             unicodeHexDigit (text[cursor + 2]) &&
+             unicodeHexDigit (text[cursor + 3]) &&
+             unicodeHexDigit (text[cursor + 4]) &&
+             unicodeHexDigit (text[cursor + 5]))
     {
       word += utf8_character (
                 hexToInt (
@@ -1553,10 +1544,10 @@ bool Lexer::readWord (
     else if (eos - cursor >= 6 &&
              ((text[cursor + 0] == 'U'  && text[cursor + 1] == '+') ||
               (text[cursor + 0] == '\\' && text[cursor + 1] == 'u')) &&
-             isHexDigit (text[cursor + 2]) &&
-             isHexDigit (text[cursor + 3]) &&
-             isHexDigit (text[cursor + 4]) &&
-             isHexDigit (text[cursor + 5]))
+             unicodeHexDigit (text[cursor + 2]) &&
+             unicodeHexDigit (text[cursor + 3]) &&
+             unicodeHexDigit (text[cursor + 4]) &&
+             unicodeHexDigit (text[cursor + 5]))
     {
       word += utf8_character (
                 hexToInt (
diff --git a/src/Lexer.h b/src/Lexer.h
index fe8b80e59..f5438bf31 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -63,7 +63,6 @@ public:
   static const std::string typeName          (const Lexer::Type&);
   static bool isAlpha                        (int);
   static bool isDigit                        (int);
-  static bool isHexDigit                     (int);
   static bool isIdentifierStart              (int);
   static bool isIdentifierNext               (int);
   static bool isSingleCharOperator           (int);

From 0086a51311a724ad033076376886d4a727006a09 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Jan 2018 00:59:05 -0500
Subject: [PATCH 725/879] Lexer: Migrated to unicodeLatinAlpha

---
 src/Lexer.cpp | 13 +++----------
 src/Lexer.h   |  1 -
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index df8af936d..ca5d0c3d6 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -143,13 +143,6 @@ const std::string Lexer::typeName (const Lexer::Type& type)
   return "unknown";
 }
 
-////////////////////////////////////////////////////////////////////////////////
-bool Lexer::isAlpha (int c)
-{
-  return (c >= 'A' && c <= 'Z') ||
-         (c >= 'a' && c <= 'z');
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Digits 0-9.
 //
@@ -225,7 +218,7 @@ bool Lexer::isBoundary (int left, int right)
   if (right == '\0')                                          return true;
 
   // XOR
-  if (isAlpha (left)           != isAlpha (right))            return true;
+  if (unicodeLatinAlpha (left) != unicodeLatinAlpha (right))  return true;
   if (isDigit (left)           != isDigit (right))            return true;
   if (unicodeWhitespace (left) != unicodeWhitespace (right))  return true;
 
@@ -262,7 +255,7 @@ bool Lexer::isPunctuation (int c)
          c != '$'      &&
          c != '_'      &&
          ! isDigit (c) &&
-         ! isAlpha (c);
+         ! unicodeLatinAlpha (c);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1217,7 +1210,7 @@ bool Lexer::isDOM (std::string& token, Lexer::Type& type)
     }
 
     // Lookahead: !<alpha>
-    else if (! isAlpha (_text[marker]))
+    else if (! unicodeLatinAlpha (_text[marker]))
     {
       token = _text.substr (marker, _cursor - marker);
       type = Lexer::Type::dom;
diff --git a/src/Lexer.h b/src/Lexer.h
index f5438bf31..fe4951da2 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -61,7 +61,6 @@ public:
 
   // Static helpers.
   static const std::string typeName          (const Lexer::Type&);
-  static bool isAlpha                        (int);
   static bool isDigit                        (int);
   static bool isIdentifierStart              (int);
   static bool isIdentifierNext               (int);

From 3d7c681ed0c67ca11e78db111509732c4ca87a1a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 25 Jan 2018 01:08:26 -0500
Subject: [PATCH 726/879] Lexer: Migrated to unicodeLatinDigit

---
 src/Lexer.cpp | 57 ++++++++++++++++++++++-----------------------------
 src/Lexer.h   |  1 -
 src/recur.cpp |  5 +++--
 3 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index ca5d0c3d6..c0931dc06 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -143,21 +143,12 @@ const std::string Lexer::typeName (const Lexer::Type& type)
   return "unknown";
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Digits 0-9.
-//
-// TODO This list should be derived from the Unicode database.
-bool Lexer::isDigit (int c)
-{
-  return c >= 0x30 && c <= 0x39;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Lexer::isIdentifierStart (int c)
 {
   return c                          &&  // Include null character check.
          ! unicodeWhitespace    (c) &&
-         ! isDigit              (c) &&
+         ! unicodeLatinDigit    (c) &&
          ! isSingleCharOperator (c) &&
          ! isPunctuation        (c);
 }
@@ -219,7 +210,7 @@ bool Lexer::isBoundary (int left, int right)
 
   // XOR
   if (unicodeLatinAlpha (left) != unicodeLatinAlpha (right))  return true;
-  if (isDigit (left)           != isDigit (right))            return true;
+  if (unicodeLatinDigit (left) != unicodeLatinDigit (right))  return true;
   if (unicodeWhitespace (left) != unicodeWhitespace (right))  return true;
 
   // OR
@@ -248,13 +239,13 @@ bool Lexer::isHardBoundary (int left, int right)
 ////////////////////////////////////////////////////////////////////////////////
 bool Lexer::isPunctuation (int c)
 {
-  return isprint (c)   &&
-         c != ' '      &&
-         c != '@'      &&
-         c != '#'      &&
-         c != '$'      &&
-         c != '_'      &&
-         ! isDigit (c) &&
+  return isprint (c)             &&
+         c != ' '                &&
+         c != '@'                &&
+         c != '#'                &&
+         c != '$'                &&
+         c != '_'                &&
+         ! unicodeLatinDigit (c) &&
          ! unicodeLatinAlpha (c);
 }
 
@@ -368,7 +359,7 @@ std::string Lexer::commify (const std::string& data)
   int i;
   for (int i = 0; i < (int) data.length (); ++i)
   {
-    if (Lexer::isDigit (data[i]))
+    if (unicodeLatinDigit (data[i]))
       end = i;
 
     if (data[i] == '.')
@@ -386,11 +377,11 @@ std::string Lexer::commify (const std::string& data)
     int consecutiveDigits = 0;
     for (; i >= 0; --i)
     {
-      if (Lexer::isDigit (data[i]))
+      if (unicodeLatinDigit (data[i]))
       {
         result += data[i];
 
-        if (++consecutiveDigits == 3 && i && Lexer::isDigit (data[i - 1]))
+        if (++consecutiveDigits == 3 && i && unicodeLatinDigit (data[i - 1]))
         {
           result += ',';
           consecutiveDigits = 0;
@@ -410,11 +401,11 @@ std::string Lexer::commify (const std::string& data)
     int consecutiveDigits = 0;
     for (; i >= 0; --i)
     {
-      if (Lexer::isDigit (data[i]))
+      if (unicodeLatinDigit (data[i]))
       {
         result += data[i];
 
-        if (++consecutiveDigits == 3 && i && Lexer::isDigit (data[i - 1]))
+        if (++consecutiveDigits == 3 && i && unicodeLatinDigit (data[i - 1]))
         {
           result += ',';
           consecutiveDigits = 0;
@@ -625,19 +616,19 @@ bool Lexer::isNumber (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
 
-  if (isDigit (_text[marker]))
+  if (unicodeLatinDigit (_text[marker]))
   {
     ++marker;
-    while (isDigit (_text[marker]))
+    while (unicodeLatinDigit (_text[marker]))
       utf8_next_char (_text, marker);
 
     if (_text[marker] == '.')
     {
       ++marker;
-      if (isDigit (_text[marker]))
+      if (unicodeLatinDigit (_text[marker]))
       {
         ++marker;
-        while (isDigit (_text[marker]))
+        while (unicodeLatinDigit (_text[marker]))
           utf8_next_char (_text, marker);
       }
     }
@@ -651,19 +642,19 @@ bool Lexer::isNumber (std::string& token, Lexer::Type& type)
           _text[marker] == '-')
         ++marker;
 
-      if (isDigit (_text[marker]))
+      if (unicodeLatinDigit (_text[marker]))
       {
         ++marker;
-        while (isDigit (_text[marker]))
+        while (unicodeLatinDigit (_text[marker]))
           utf8_next_char (_text, marker);
 
         if (_text[marker] == '.')
         {
           ++marker;
-          if (isDigit (_text[marker]))
+          if (unicodeLatinDigit (_text[marker]))
           {
             ++marker;
-            while (isDigit (_text[marker]))
+            while (unicodeLatinDigit (_text[marker]))
               utf8_next_char (_text, marker);
           }
         }
@@ -693,10 +684,10 @@ bool Lexer::isInteger (std::string& token, Lexer::Type& type)
 {
   std::size_t marker = _cursor;
 
-  if (isDigit (_text[marker]))
+  if (unicodeLatinDigit (_text[marker]))
   {
     ++marker;
-    while (isDigit (_text[marker]))
+    while (unicodeLatinDigit (_text[marker]))
       utf8_next_char (_text, marker);
 
     token = _text.substr (_cursor, marker - _cursor);
diff --git a/src/Lexer.h b/src/Lexer.h
index fe4951da2..dad17c5d4 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -61,7 +61,6 @@ public:
 
   // Static helpers.
   static const std::string typeName          (const Lexer::Type&);
-  static bool isDigit                        (int);
   static bool isIdentifierStart              (int);
   static bool isIdentifierNext               (int);
   static bool isSingleCharOperator           (int);
diff --git a/src/recur.cpp b/src/recur.cpp
index 13d4a0400..ab2c3c872 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -42,6 +42,7 @@
 #include <Datetime.h>
 #include <Duration.h>
 #include <format.h>
+#include <unicode.h>
 #include <util.h>
 #include <main.h>
 
@@ -238,7 +239,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
     return current + (days * 86400);
   }
 
-  else if (Lexer::isDigit (period[0]) &&
+  else if (unicodeLatinDigit (period[0]) &&
            period[period.length () - 1] == 'm')
   {
     int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
@@ -291,7 +292,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
     return Datetime (y, m, d, ho, mi, se);
   }
 
-  else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q')
+  else if (unicodeLatinDigit (period[0]) && period[period.length () - 1] == 'q')
   {
     int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
 

From c7f2739ddab40380b2789df092a728440a8b1480 Mon Sep 17 00:00:00 2001
From: Mark Scannell <scannell@google.com>
Date: Wed, 31 Jan 2018 19:45:07 -0500
Subject: [PATCH 727/879] Portability: Updated to make main re-entrant()

- New INSTALL instructions to emscripten, and AUTHORS for contribution.
---
 AUTHORS                         |   1 +
 CMakeLists.txt                  |   7 ++
 INSTALL                         |   8 ++
 src/CLI2.cpp                    | 138 ++++++++++++++++----------------
 src/Context.cpp                 |  14 ++++
 src/Context.h                   |   5 ++
 src/DOM.cpp                     |  48 ++++++-----
 src/Eval.cpp                    |  37 +++++----
 src/Filter.cpp                  |  52 ++++++------
 src/Hooks.cpp                   |  92 +++++++++++----------
 src/TDB2.cpp                    |  86 ++++++++++----------
 src/Task.cpp                    |  71 ++++++++--------
 src/ViewTask.cpp                |  36 ++++-----
 src/calc.cpp                    |   7 +-
 src/columns/ColDepends.cpp      |  10 +--
 src/columns/ColDescription.cpp  |  10 +--
 src/columns/ColProject.cpp      |   9 +--
 src/columns/ColRecur.cpp        |  11 ++-
 src/columns/ColStart.cpp        |   8 +-
 src/columns/ColTags.cpp         |  13 ++-
 src/columns/ColTypeDate.cpp     |  19 +++--
 src/columns/ColTypeDuration.cpp |   3 +-
 src/columns/ColTypeNumeric.cpp  |   3 +-
 src/columns/ColTypeString.cpp   |   5 +-
 src/columns/ColUDA.cpp          |  30 ++++---
 src/columns/Column.cpp          |  18 ++---
 src/commands/CmdAdd.cpp         |  16 ++--
 src/commands/CmdAliases.cpp     |   4 +-
 src/commands/CmdAnnotate.cpp    |  22 +++--
 src/commands/CmdAppend.cpp      |  22 +++--
 src/commands/CmdAttributes.cpp  |   4 +-
 src/commands/CmdBurndown.cpp    |  28 +++----
 src/commands/CmdCalc.cpp        |   8 +-
 src/commands/CmdCalendar.cpp    | 106 ++++++++++++------------
 src/commands/CmdColor.cpp       |  14 ++--
 src/commands/CmdColumns.cpp     |  18 ++---
 src/commands/CmdCommands.cpp    |  16 ++--
 src/commands/CmdConfig.cpp      |  20 +++--
 src/commands/CmdContext.cpp     |  26 +++---
 src/commands/CmdCustom.cpp      |  52 ++++++------
 src/commands/CmdDelete.cpp      |  28 +++----
 src/commands/CmdDenotate.cpp    |  14 ++--
 src/commands/CmdDiagnostics.cpp |  50 ++++++------
 src/commands/CmdDone.cpp        |  14 ++--
 src/commands/CmdDuplicate.cpp   |  14 ++--
 src/commands/CmdEdit.cpp        |  84 ++++++++++---------
 src/commands/CmdExec.cpp        |   4 +-
 src/commands/CmdExport.cpp      |   8 +-
 src/commands/CmdGet.cpp         |   4 +-
 src/commands/CmdHelp.cpp        |  18 ++---
 src/commands/CmdHistory.cpp     |  28 +++----
 src/commands/CmdIDs.cpp         |  14 ++--
 src/commands/CmdImport.cpp      |  10 +--
 src/commands/CmdInfo.cpp        |  46 +++++------
 src/commands/CmdLog.cpp         |  10 +--
 src/commands/CmdLogo.cpp        |   6 +-
 src/commands/CmdModify.cpp      |  32 ++++----
 src/commands/CmdPrepend.cpp     |  22 +++--
 src/commands/CmdProjects.cpp    |  16 ++--
 src/commands/CmdPurge.cpp       |  16 ++--
 src/commands/CmdReports.cpp     |   8 +-
 src/commands/CmdShow.cpp        |  33 ++++----
 src/commands/CmdStart.cpp       |  14 ++--
 src/commands/CmdStats.cpp       |  24 +++---
 src/commands/CmdStop.cpp        |  14 ++--
 src/commands/CmdSummary.cpp     |  14 ++--
 src/commands/CmdSync.cpp        |  90 ++++++++++-----------
 src/commands/CmdTags.cpp        |  30 ++++---
 src/commands/CmdTimesheet.cpp   |  16 ++--
 src/commands/CmdUDAs.cpp        |  20 +++--
 src/commands/CmdUndo.cpp        |   4 +-
 src/commands/CmdUnique.cpp      |   8 +-
 src/commands/CmdUrgency.cpp     |   4 +-
 src/commands/CmdVersion.cpp     |   6 +-
 src/commands/Command.cpp        |  12 ++-
 src/dependency.cpp              |  20 +++--
 src/feedback.cpp                |  32 ++++----
 src/legacy.cpp                  |  14 ++--
 src/main.cpp                    |   9 ++-
 src/nag.cpp                     |   8 +-
 src/recur.cpp                   |  27 +++----
 src/rules.cpp                   |  18 ++---
 src/sort.cpp                    |  12 ++-
 src/util.cpp                    |  18 ++---
 test/col.t.cpp                  |   2 -
 test/dom.t.cpp                  |   6 +-
 test/eval.t.cpp                 |   3 -
 test/t.t.cpp                    |   2 -
 test/util.t.cpp                 |   2 -
 test/variant_add.t.cpp          |   3 -
 test/variant_and.t.cpp          |   3 -
 test/variant_cast.t.cpp         |   3 -
 test/variant_divide.t.cpp       |   3 -
 test/variant_equal.t.cpp        |   3 -
 test/variant_exp.t.cpp          |   3 -
 test/variant_gt.t.cpp           |   3 -
 test/variant_gte.t.cpp          |   3 -
 test/variant_inequal.t.cpp      |   3 -
 test/variant_lt.t.cpp           |   3 -
 test/variant_lte.t.cpp          |   3 -
 test/variant_match.t.cpp        |   2 -
 test/variant_math.t.cpp         |   3 -
 test/variant_modulo.t.cpp       |   3 -
 test/variant_multiply.t.cpp     |   3 -
 test/variant_nomatch.t.cpp      |   2 -
 test/variant_not.t.cpp          |   3 -
 test/variant_or.t.cpp           |   3 -
 test/variant_partial.t.cpp      |   3 -
 test/variant_subtract.t.cpp     |   4 -
 test/variant_xor.t.cpp          |   3 -
 110 files changed, 942 insertions(+), 1125 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5598ef1f2..dd53e279d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,6 +141,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Øyvind A. Holm
   Paul J. Fenwick
   Michael Neumann
+  Mark Scannell
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f70e672b7..6cb6da8a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,13 @@ project (task)
 set (PROJECT_VERSION "2.5.2")
 include (CXXSniffer)
 
+OPTION (ENABLE_WASM "Enable 'wasm' support" OFF)
+
+if (ENABLE_WASM)
+  message ("Enabling WASM support.")
+  set(CMAKE_EXECUTABLE_SUFFIX ".js")
+endif (ENABLE_WASM)
+
 OPTION (ENABLE_SYNC "Enable 'task sync' support" ON)
 
 if (ENABLE_SYNC)
diff --git a/INSTALL b/INSTALL
index 5893488ee..7aad45280 100644
--- a/INSTALL
+++ b/INSTALL
@@ -158,6 +158,14 @@ OpenBSD
 
   See: https://bug.tasktools.org/browse/TW-1579
 
+WASM
+  Using the Emscripten compiler, you can achieve it like this:
+
+    cmake -DCMAKE_CXX_COMPILER=emcc -DENABLE_SYNC=OFF -DCMAKE_BUILD_TYPE=release -DENABLE_WASM=ON \
+          -DCMAKE_EXE_LINKER_FLAGS="-m32 -s NO_DYNAMIC_EXECUTION=1 -s WASM=1 -s NO_EXIT_RUNTIME=1 -s INVOKE_RUN=0" \
+          -DCMAKE_CXX_FLAGS_RELEASE="-O2 -m32"
+
+  This will produce an optimized WASM with a main() that is callable multiple times.
 
 Troubleshooting
 ---------------
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index b5719f5a6..484527c34 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -35,8 +35,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 // Overridden by rc.abbreviation.minimum.
 int CLI2::minimumMatchLength = 3;
 
@@ -235,7 +233,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc
       if (last_slash != std::string::npos)
         home = rc.parent ();
 
-      context.header (format ("Using alternate .taskrc file {1}", rc._data));
+      Context::getContext ().header (format ("Using alternate .taskrc file {1}", rc._data));
 
       // Keep looping, because if there are multiple rc:file arguments, the last
       // one should dominate.
@@ -248,7 +246,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc
 // Static method.
 void CLI2::getDataLocation (int argc, const char** argv, Path& data)
 {
-  std::string location = context.config.get ("data.location");
+  std::string location = Context::getContext ().config.get ("data.location");
   if (location != "")
     data = location;
 
@@ -262,7 +260,7 @@ void CLI2::getDataLocation (int argc, const char** argv, Path& data)
         raw.substr (0, 16) == "rc.data.location")
     {
       data = Directory (raw.substr (17));
-      context.header (format ("Using alternate data.location {1}", (std::string) data));
+      Context::getContext ().header (format ("Using alternate data.location {1}", (std::string) data));
 
       // Keep looping, because if there are multiple rc:file arguments, the last
       // one should dominate.
@@ -297,10 +295,10 @@ void CLI2::applyOverrides (int argc, const char** argv)
       {
         std::string name  = raw.substr (3, sep - 3);
         std::string value = raw.substr (sep + 1);
-        context.config.set (name, value);
+        Context::getContext ().config.set (name, value);
 
-        if (context.verbose("override"))
-          context.footnote (format ("Configuration override rc.{1}:{2}", name, value));
+        if (Context::getContext ().verbose("override"))
+          Context::getContext ().footnote (format ("Configuration override rc.{1}:{2}", name, value));
       }
     }
   }
@@ -469,8 +467,8 @@ void CLI2::lexArguments ()
     }
   }
 
-  if (context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze lexArguments"));
+  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze lexArguments"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -500,7 +498,7 @@ void CLI2::demotion ()
     else if (a._lextype == Lexer::Type::pair &&
         canonicalize (canonical, "pseudo", a.attribute ("name")))
     {
-      context.config.set (canonical, a.attribute ("value"));
+      Context::getContext ().config.set (canonical, a.attribute ("value"));
       changes = true;
 
       // Equivalent to erasing 'a'.
@@ -511,16 +509,16 @@ void CLI2::demotion ()
   }
 
   if (changes &&
-      context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze demotion"));
+      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze demotion"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Intended to be called after ::add() to perform the final analysis.
 void CLI2::analyze ()
 {
-  if (context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze"));
+  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze"));
 
   // Process _original_args.
   _args.clear ();
@@ -577,10 +575,10 @@ void CLI2::addContextFilter ()
     return;
 
   // Detect if any context is set, and bail out if not
-  std::string contextName = context.config.get ("context");
+  std::string contextName = Context::getContext ().config.get ("context");
   if (contextName == "")
   {
-    context.debug ("No context.");
+    Context::getContext ().debug ("No context.");
     return;
   }
 
@@ -591,23 +589,23 @@ void CLI2::addContextFilter ()
         a._lextype == Lexer::Type::number ||
         a._lextype == Lexer::Type::set)
     {
-      context.debug (format ("UUID/ID argument found '{1}', not applying context.", a.attribute ("raw")));
+      Context::getContext ().debug (format ("UUID/ID argument found '{1}', not applying context.", a.attribute ("raw")));
       return;
     }
   }
 
   // Apply context
-  context.debug ("Applying context: " + contextName);
-  std::string contextFilter = context.config.get ("context." + contextName);
+  Context::getContext ().debug ("Applying context: " + contextName);
+  std::string contextFilter = Context::getContext ().config.get ("context." + contextName);
 
   if (contextFilter == "")
-    context.debug ("Context '" + contextName + "' not defined.");
+    Context::getContext ().debug ("Context '" + contextName + "' not defined.");
   else
   {
     _context_filter_added = true;
     addFilter (contextFilter);
-    if (context.verbose ("context"))
-      context.footnote (format ("Context '{1}' set. Use 'task context none' to remove.", contextName));
+    if (Context::getContext ().verbose ("context"))
+      Context::getContext ().footnote (format ("Context '{1}' set. Use 'task context none' to remove.", contextName));
   }
 }
 
@@ -633,7 +631,7 @@ void CLI2::prepareFilter ()
   desugarFilterPatterns ();
   insertJunctions ();                 // Deliberately after all desugar calls.
 
-  if (context.verbose ("filter"))
+  if (Context::getContext ().verbose ("filter"))
   {
     std::string combined;
     for (const auto& a : _args)
@@ -648,7 +646,7 @@ void CLI2::prepareFilter ()
     }
 
     if (combined.size ())
-      context.footnote (std::string ("Filter: ") + combined);
+      Context::getContext ().footnote (std::string ("Filter: ") + combined);
   }
 }
 
@@ -661,13 +659,13 @@ const std::vector <std::string> CLI2::getWords ()
     if (a.hasTag ("MISCELLANEOUS"))
       words.push_back (a.attribute ("raw"));
 
-  if (context.config.getInteger ("debug.parser") >= 2)
+  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
   {
     Color colorOrigArgs ("gray10 on gray4");
     std::string message = " ";
     for (const auto& word : words)
       message += colorOrigArgs.colorize (word) + ' ';
-    context.debug ("CLI2::getWords" + message);
+    Context::getContext ().debug ("CLI2::getWords" + message);
   }
 
   return words;
@@ -854,11 +852,11 @@ void CLI2::aliasExpansion ()
   while (action && counter++ < safetyValveDefault);
 
   if (counter >= safetyValveDefault)
-    context.debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
+    Context::getContext ().debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
 
   if (changes &&
-      context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze aliasExpansion"));
+      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze aliasExpansion"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -892,8 +890,8 @@ void CLI2::canonicalizeNames ()
   }
 
   if (changes &&
-      context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze canonicalizeNames"));
+      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze canonicalizeNames"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -902,7 +900,7 @@ void CLI2::categorizeArgs ()
 {
   // Context is only applied for commands that request it.
   std::string command = getCommand ();
-  Command* cmd = context.commands[command];
+  Command* cmd = Context::getContext ().commands[command];
   if (cmd && cmd->uses_context ())
     addContextFilter ();
 
@@ -1013,8 +1011,8 @@ void CLI2::categorizeArgs ()
   }
 
   if (changes &&
-      context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze categorizeArgs"));
+      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze categorizeArgs"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1082,8 +1080,8 @@ void CLI2::parenthesizeOriginalFilter ()
 
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::analyze parenthesizeOriginalFilter"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::analyze parenthesizeOriginalFilter"));
   }
 }
 
@@ -1114,7 +1112,7 @@ bool CLI2::findCommand ()
     a.tag ("CMD");
 
     // Apply command DNA as tags.
-    Command* command = context.commands[canonical];
+    Command* command = Context::getContext ().commands[canonical];
     if (command->read_only ())             a.tag ("READONLY");
     if (command->displays_id ())           a.tag ("SHOWSID");
     if (command->needs_gc ())              a.tag ("RUNSGC");
@@ -1123,8 +1121,8 @@ bool CLI2::findCommand ()
     if (command->accepts_modifications ()) a.tag ("ALLOWSMODIFICATIONS");
     if (command->accepts_miscellaneous ()) a.tag ("ALLOWSMISC");
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::analyze findCommand"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::analyze findCommand"));
 
     // Stop and indicate command found.
     return true;
@@ -1185,8 +1183,8 @@ void CLI2::desugarFilterTags ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter desugarFilterTags"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterTags"));
   }
 }
 
@@ -1211,8 +1209,8 @@ void CLI2::findStrayModifications ()
   }
 
   if (changes)
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter findStrayModifications"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter findStrayModifications"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1249,12 +1247,12 @@ void CLI2::desugarFilterAttributes ()
       //    )
       // Use this sequence in place of a single value.
       std::vector <A2> values = lexExpression (value);
-      if (context.config.getInteger ("debug.parser") >= 2)
+      if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
       {
-        context.debug ("CLI2::lexExpression " + name + ':' + value);
+        Context::getContext ().debug ("CLI2::lexExpression " + name + ':' + value);
         for (auto& v : values)
-          context.debug ("  " + v.dump ());
-        context.debug (" ");
+          Context::getContext ().debug ("  " + v.dump ());
+        Context::getContext ().debug (" ");
       }
 
       bool found = false;
@@ -1267,7 +1265,7 @@ void CLI2::desugarFilterAttributes ()
         //   date     --> yes
         //   duration --> yes
         bool evalSupported = true;
-        Column* col = context.columns[canonical];
+        Column* col = Context::getContext ().columns[canonical];
         if (col && col->type () == "string")
           evalSupported = false;
 
@@ -1413,8 +1411,8 @@ void CLI2::desugarFilterAttributes ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter desugarFilterAttributes"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterAttributes"));
   }
 }
 
@@ -1452,8 +1450,8 @@ void CLI2::desugarFilterPatterns ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter desugarFilterPatterns"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterPatterns"));
   }
 }
 
@@ -1470,7 +1468,7 @@ void CLI2::findIDs ()
 {
   bool changes = false;
 
-  if (context.config.getBoolean ("sugar"))
+  if (Context::getContext ().config.getBoolean ("sugar"))
   {
     bool previousFilterArgWasAnOperator = false;
     int filterCount = 0;
@@ -1590,8 +1588,8 @@ void CLI2::findIDs ()
   }
 
   if (changes)
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter findIDs"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter findIDs"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1599,7 +1597,7 @@ void CLI2::findUUIDs ()
 {
   bool changes = false;
 
-  if (context.config.getBoolean ("sugar"))
+  if (Context::getContext ().config.getBoolean ("sugar"))
   {
     for (const auto& a : _args)
     {
@@ -1651,8 +1649,8 @@ void CLI2::findUUIDs ()
   }
 
   if (changes)
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter findUUIDs"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter findUUIDs"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1798,8 +1796,8 @@ void CLI2::insertIDExpr ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter insertIDExpr"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter insertIDExpr"));
   }
 }
 
@@ -1835,8 +1833,8 @@ void CLI2::lexFilterArgs ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter lexFilterArgs"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter lexFilterArgs"));
   }
 }
 
@@ -1942,8 +1940,8 @@ void CLI2::desugarFilterPlainArgs ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter desugarFilterPlainArgs"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterPlainArgs"));
   }
 }
 
@@ -1996,8 +1994,8 @@ void CLI2::insertJunctions ()
   {
     _args = reconstructed;
 
-    if (context.config.getInteger ("debug.parser") >= 2)
-      context.debug (dump ("CLI2::prepareFilter insertJunctions"));
+    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      Context::getContext ().debug (dump ("CLI2::prepareFilter insertJunctions"));
   }
 }
 
@@ -2037,7 +2035,7 @@ void CLI2::defaultCommand ()
     if (! found_sequence)
     {
       // Apply overrides, if any.
-      std::string defaultCommand = context.config.get ("default.command");
+      std::string defaultCommand = Context::getContext ().config.get ("default.command");
       if (defaultCommand != "")
       {
         // Modify _args, _original_args to be:
@@ -2080,8 +2078,8 @@ void CLI2::defaultCommand ()
   }
 
   if (changes &&
-      context.config.getInteger ("debug.parser") >= 2)
-    context.debug (dump ("CLI2::analyze defaultCommand"));
+      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    Context::getContext ().debug (dump ("CLI2::analyze defaultCommand"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Context.cpp b/src/Context.cpp
index 4b8f4ff19..94f39eab4 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -414,6 +414,20 @@ static const char* modifierNames[] =
 
 #define NUM_MODIFIER_NAMES       (sizeof (modifierNames) / sizeof (modifierNames[0]))
 
+Context* Context::context;
+
+////////////////////////////////////////////////////////////////////////////////
+Context& Context::getContext ()
+{
+  return *Context::context;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Context::setContext (Context* context)
+{
+  Context::context = context;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 Context::~Context ()
 {
diff --git a/src/Context.h b/src/Context.h
index f83fe2057..9b9b7346c 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -47,6 +47,9 @@ public:
   Context (const Context&);
   Context& operator= (const Context&);
 
+  static Context& getContext ();
+  static void setContext (Context*);
+
   int initialize (int, const char**);  // all startup
   int run ();
   int dispatch (std::string&);         // command handler dispatch
@@ -76,6 +79,8 @@ private:
   void loadAliases ();
   void propagateDebug ();
 
+  static Context* context;
+
 public:
   CLI2                                cli2                {};
   std::string                         home_dir            {};
diff --git a/src/DOM.cpp b/src/DOM.cpp
index dd7b8c524..aa677de51 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -38,8 +38,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // DOM Supported References:
 //
@@ -75,8 +73,8 @@ bool getDOM (const std::string& name, Variant& value)
       ! name.compare (0, 3, "rc.", 3))
   {
     auto key = name.substr (3);
-    auto c = context.config.find (key);
-    if (c != context.config.end ())
+    auto c = Context::getContext ().config.find (key);
+    if (c != Context::getContext ().config.end ())
     {
       value = Variant (c->second);
       return true;
@@ -92,7 +90,7 @@ bool getDOM (const std::string& name, Variant& value)
     if (name == "tw.syncneeded")
     {
       value = Variant (0);
-      for (const auto& line : context.tdb2.backlog.get_lines ())
+      for (const auto& line : Context::getContext ().tdb2.backlog.get_lines ())
       {
         if (line[0] == '{')
         {
@@ -105,13 +103,13 @@ bool getDOM (const std::string& name, Variant& value)
     }
     else if (name == "tw.program")
     {
-      value = Variant (context.cli2.getBinary ());
+      value = Variant (Context::getContext ().cli2.getBinary ());
       return true;
     }
     else if (name == "tw.args")
     {
       std::string commandLine;
-      for (auto& arg : context.cli2._original_args)
+      for (auto& arg : Context::getContext ().cli2._original_args)
       {
         if (commandLine != "")
            commandLine += ' ';
@@ -124,16 +122,16 @@ bool getDOM (const std::string& name, Variant& value)
     }
     else if (name == "tw.width")
     {
-      value = Variant (static_cast<int> (context.terminal_width
-                                           ? context.terminal_width
-                                           : context.getWidth ()));
+      value = Variant (static_cast<int> (Context::getContext ().terminal_width
+                                           ? Context::getContext ().terminal_width
+                                           : Context::getContext ().getWidth ()));
       return true;
     }
     else if (name == "tw.height")
     {
-      value = Variant (static_cast<int> (context.terminal_height
-                                           ? context.terminal_height
-                                           : context.getHeight ()));
+      value = Variant (static_cast<int> (Context::getContext ().terminal_height
+                                           ? Context::getContext ().terminal_height
+                                           : Context::getContext ().getHeight ()));
       return true;
     }
 
@@ -152,13 +150,13 @@ bool getDOM (const std::string& name, Variant& value)
   {
     if (name == "context.program")
     {
-      value = Variant (context.cli2.getBinary ());
+      value = Variant (Context::getContext ().cli2.getBinary ());
       return true;
     }
     else if (name == "context.args")
     {
       std::string commandLine;
-      for (auto& arg : context.cli2._original_args)
+      for (auto& arg : Context::getContext ().cli2._original_args)
       {
         if (commandLine != "")
            commandLine += ' ';
@@ -171,16 +169,16 @@ bool getDOM (const std::string& name, Variant& value)
     }
     else if (name == "context.width")
     {
-      value = Variant (static_cast<int> (context.terminal_width
-                                           ? context.terminal_width
-                                           : context.getWidth ()));
+      value = Variant (static_cast<int> (Context::getContext ().terminal_width
+                                           ? Context::getContext ().terminal_width
+                                           : Context::getContext ().getWidth ()));
       return true;
     }
     else if (name == "context.height")
     {
-      value = Variant (static_cast<int> (context.terminal_height
-                                           ? context.terminal_height
-                                           : context.getHeight ()));
+      value = Variant (static_cast<int> (Context::getContext ().terminal_height
+                                           ? Context::getContext ().terminal_height
+                                           : Context::getContext ().getHeight ()));
       return true;
     }
 
@@ -273,7 +271,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
         token.length () == elements[0].length ())
     {
       if (token != ref.get ("uuid"))
-        context.tdb2.get (token, ref);
+        Context::getContext ().tdb2.get (token, ref);
 
       // Eat elements[0]/UUID.
       elements.erase (elements.begin ());
@@ -283,7 +281,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
     {
       auto id = strtol (token.c_str (), NULL, 10);
       if (id && id != ref.id)
-        context.tdb2.get (id, ref);
+        Context::getContext ().tdb2.get (id, ref);
 
       // Eat elements[0]/ID.
       elements.erase (elements.begin ());
@@ -293,7 +291,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
   auto size = elements.size ();
 
   std::string canonical;
-  if ((size == 1 || size == 2) && context.cli2.canonicalize (canonical, "attribute", elements[0]))
+  if ((size == 1 || size == 2) && Context::getContext ().cli2.canonicalize (canonical, "attribute", elements[0]))
   {
     // Now that 'ref' is the contextual task, and any ID/UUID is chopped off the
     // elements vector, DOM resolution is now simple.
@@ -309,7 +307,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
       return true;
     }
 
-    Column* column = context.columns[canonical];
+    Column* column = Context::getContext ().columns[canonical];
 
     if (ref.data.size () && size == 1 && column)
     {
diff --git a/src/Eval.cpp b/src/Eval.cpp
index bc9f62031..53013f46b 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -36,7 +36,6 @@
 
 #define STRING_EVAL_NO_EVAL "The expression could not be evaluated."
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -129,15 +128,15 @@ void Eval::evaluateInfixExpression (const std::string& e, Variant& v) const
 
   // Parse for syntax checking and operator replacement.
   if (_debug)
-    context.debug ("FILTER Infix        " + dump (tokens));
+    Context::getContext ().debug ("FILTER Infix        " + dump (tokens));
   infixParse (tokens);
   if (_debug)
-    context.debug ("FILTER Infix parsed " + dump (tokens));
+    Context::getContext ().debug ("FILTER Infix parsed " + dump (tokens));
 
   // Convert infix --> postfix.
   infixToPostfix (tokens);
   if (_debug)
-    context.debug ("FILTER Postfix      " + dump (tokens));
+    Context::getContext ().debug ("FILTER Postfix      " + dump (tokens));
 
   // Call the postfix evaluator.
   evaluatePostfixStack (tokens, v);
@@ -155,7 +154,7 @@ void Eval::evaluatePostfixExpression (const std::string& e, Variant& v) const
     tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
 
   if (_debug)
-    context.debug ("FILTER Postfix      " + dump (tokens));
+    Context::getContext ().debug ("FILTER Postfix      " + dump (tokens));
 
   // Call the postfix evaluator.
   evaluatePostfixStack (tokens, v);
@@ -169,15 +168,15 @@ void Eval::compileExpression (
 
   // Parse for syntax checking and operator replacement.
   if (_debug)
-    context.debug ("FILTER Infix        " + dump (_compiled));
+    Context::getContext ().debug ("FILTER Infix        " + dump (_compiled));
   infixParse (_compiled);
   if (_debug)
-    context.debug ("FILTER Infix parsed " + dump (_compiled));
+    Context::getContext ().debug ("FILTER Infix parsed " + dump (_compiled));
 
   // Convert infix --> postfix.
   infixToPostfix (_compiled);
   if (_debug)
-    context.debug ("FILTER Postfix      " + dump (_compiled));
+    Context::getContext ().debug ("FILTER Postfix      " + dump (_compiled));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -240,7 +239,7 @@ void Eval::evaluatePostfixStack (
       Variant result = ! right;
       values.push_back (result);
       if (_debug)
-        context.debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token.first, (std::string) right, (std::string) result));
+        Context::getContext ().debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token.first, (std::string) right, (std::string) result));
     }
     else if (token.second == Lexer::Type::op &&
              token.first == "_neg_")
@@ -256,14 +255,14 @@ void Eval::evaluatePostfixStack (
       values.push_back (result);
 
       if (_debug)
-        context.debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token.first, (std::string) right, (std::string) result));
+        Context::getContext ().debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token.first, (std::string) right, (std::string) result));
     }
     else if (token.second == Lexer::Type::op &&
              token.first == "_pos_")
     {
       // The _pos_ operator is a NOP.
       if (_debug)
-        context.debug (format ("[{1}] eval op {2} NOP", values.size (), token.first));
+        Context::getContext ().debug (format ("[{1}] eval op {2} NOP", values.size (), token.first));
     }
 
     // Binary operators.
@@ -309,7 +308,7 @@ void Eval::evaluatePostfixStack (
       values.push_back (result);
 
       if (_debug)
-        context.debug (format ("Eval ↓'{1}' {2} ↓'{3}' → ↑'{4}'", (std::string) left, token.first, (std::string) right, (std::string) result));
+        Context::getContext ().debug (format ("Eval ↓'{1}' {2} ↓'{3}' → ↑'{4}'", (std::string) left, token.first, (std::string) right, (std::string) result));
     }
 
     // Literals and identifiers.
@@ -323,13 +322,13 @@ void Eval::evaluatePostfixStack (
         {
           v.cast (Variant::type_integer);
           if (_debug)
-            context.debug (format ("Eval literal number ↑'{1}'", (std::string) v));
+            Context::getContext ().debug (format ("Eval literal number ↑'{1}'", (std::string) v));
         }
         else
         {
           v.cast (Variant::type_real);
           if (_debug)
-            context.debug (format ("Eval literal decimal ↑'{1}'", (std::string) v));
+            Context::getContext ().debug (format ("Eval literal decimal ↑'{1}'", (std::string) v));
         }
         break;
 
@@ -346,7 +345,7 @@ void Eval::evaluatePostfixStack (
             if ((*source) (token.first, v))
             {
               if (_debug)
-                context.debug (format ("Eval identifier source '{1}' → ↑'{2}'", token.first, (std::string) v));
+                Context::getContext ().debug (format ("Eval identifier source '{1}' → ↑'{2}'", token.first, (std::string) v));
               found = true;
               break;
             }
@@ -357,7 +356,7 @@ void Eval::evaluatePostfixStack (
           {
             v.cast (Variant::type_string);
             if (_debug)
-              context.debug (format ("Eval identifier source failed '{1}'", token.first));
+              Context::getContext ().debug (format ("Eval identifier source failed '{1}'", token.first));
           }
         }
         break;
@@ -365,20 +364,20 @@ void Eval::evaluatePostfixStack (
       case Lexer::Type::date:
         v.cast (Variant::type_date);
         if (_debug)
-          context.debug (format ("Eval literal date ↑'{1}'", (std::string) v));
+          Context::getContext ().debug (format ("Eval literal date ↑'{1}'", (std::string) v));
         break;
 
       case Lexer::Type::duration:
         v.cast (Variant::type_duration);
         if (_debug)
-          context.debug (format ("Eval literal duration ↑'{1}'", (std::string) v));
+          Context::getContext ().debug (format ("Eval literal duration ↑'{1}'", (std::string) v));
         break;
 
       // Nothing to do.
       case Lexer::Type::string:
       default:
         if (_debug)
-          context.debug (format ("Eval literal string ↑'{1}'", (std::string) v));
+          Context::getContext ().debug (format ("Eval literal string ↑'{1}'", (std::string) v));
         break;
       }
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 211d7defd..238dfea16 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -35,8 +35,6 @@
 #include <format.h>
 #include <shared.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // Const iterator that can be derefenced into a Task by domSource.
 static Task dummy;
@@ -61,10 +59,10 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
   Timer timer;
   _startCount = (int) input.size ();
 
-  context.cli2.prepareFilter ();
+  Context::getContext ().cli2.prepareFilter ();
 
   std::vector <std::pair <std::string, Lexer::Type>> precompiled;
-  for (auto& a : context.cli2._args)
+  for (auto& a : Context::getContext ().cli2._args)
     if (a.hasTag ("FILTER"))
       precompiled.push_back (std::pair <std::string, Lexer::Type> (a.getToken (), a._lextype));
 
@@ -75,7 +73,7 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
 
     // Debug output from Eval during compilation is useful.  During evaluation
     // it is mostly noise.
-    eval.debug (context.config.getInteger ("debug.parser") >= 3 ? true : false);
+    eval.debug (Context::getContext ().config.getInteger ("debug.parser") >= 3 ? true : false);
     eval.compileExpression (precompiled);
 
     for (auto& task : input)
@@ -95,8 +93,8 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
     output = input;
 
   _endCount = (int) output.size ();
-  context.debug (format ("Filtered {1} tasks --> {2} tasks [list subset]", _startCount, _endCount));
-  context.time_filter_us += timer.total_us ();
+  Context::getContext ().debug (format ("Filtered {1} tasks --> {2} tasks [list subset]", _startCount, _endCount));
+  Context::getContext ().time_filter_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -104,10 +102,10 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
 void Filter::subset (std::vector <Task>& output)
 {
   Timer timer;
-  context.cli2.prepareFilter ();
+  Context::getContext ().cli2.prepareFilter ();
 
   std::vector <std::pair <std::string, Lexer::Type>> precompiled;
-  for (auto& a : context.cli2._args)
+  for (auto& a : Context::getContext ().cli2._args)
     if (a.hasTag ("FILTER"))
       precompiled.push_back (std::pair <std::string, Lexer::Type> (a.getToken (), a._lextype));
 
@@ -117,8 +115,8 @@ void Filter::subset (std::vector <Task>& output)
   if (precompiled.size ())
   {
     Timer timer_pending;
-    auto pending = context.tdb2.pending.get_tasks ();
-    context.time_filter_us -= timer_pending.total_us ();
+    auto pending = Context::getContext ().tdb2.pending.get_tasks ();
+    Context::getContext ().time_filter_us -= timer_pending.total_us ();
     _startCount = (int) pending.size ();
 
     Eval eval;
@@ -126,7 +124,7 @@ void Filter::subset (std::vector <Task>& output)
 
     // Debug output from Eval during compilation is useful.  During evaluation
     // it is mostly noise.
-    eval.debug (context.config.getInteger ("debug.parser") >= 3 ? true : false);
+    eval.debug (Context::getContext ().config.getInteger ("debug.parser") >= 3 ? true : false);
     eval.compileExpression (precompiled);
 
     output.clear ();
@@ -145,8 +143,8 @@ void Filter::subset (std::vector <Task>& output)
     if (! shortcut)
     {
       Timer timer_completed;
-      auto completed = context.tdb2.completed.get_tasks ();
-      context.time_filter_us -= timer_completed.total_us ();
+      auto completed = Context::getContext ().tdb2.completed.get_tasks ();
+      Context::getContext ().time_filter_us -= timer_completed.total_us ();
       _startCount += (int) completed.size ();
 
       for (auto& task : completed)
@@ -168,23 +166,23 @@ void Filter::subset (std::vector <Task>& output)
     safety ();
 
     Timer pending_completed;
-    for (auto& task : context.tdb2.pending.get_tasks ())
+    for (auto& task : Context::getContext ().tdb2.pending.get_tasks ())
       output.push_back (task);
 
-    for (auto& task : context.tdb2.completed.get_tasks ())
+    for (auto& task : Context::getContext ().tdb2.completed.get_tasks ())
       output.push_back (task);
-    context.time_filter_us -= pending_completed.total_us ();
+    Context::getContext ().time_filter_us -= pending_completed.total_us ();
   }
 
   _endCount = (int) output.size ();
-  context.debug (format ("Filtered {1} tasks --> {2} tasks [{3}]", _startCount, _endCount, (shortcut ? "pending only" : "all tasks")));
-  context.time_filter_us += timer.total_us ();
+  Context::getContext ().debug (format ("Filtered {1} tasks --> {2} tasks [{3}]", _startCount, _endCount, (shortcut ? "pending only" : "all tasks")));
+  Context::getContext ().time_filter_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Filter::hasFilter () const
 {
-  for (const auto& a : context.cli2._args)
+  for (const auto& a : Context::getContext ().cli2._args)
     if (a.hasTag ("FILTER"))
       return true;
 
@@ -198,7 +196,7 @@ bool Filter::hasFilter () const
 bool Filter::pendingOnly () const
 {
   // When GC is off, there are no shortcuts.
-  if (! context.config.getBoolean ("gc"))
+  if (! Context::getContext ().config.getBoolean ("gc"))
     return false;
 
   // To skip loading completed.data, there should be:
@@ -211,13 +209,13 @@ bool Filter::pendingOnly () const
   int countPending   = 0;
   int countWaiting   = 0;
   int countRecurring = 0;
-  int countId        = (int) context.cli2._id_ranges.size ();
-  int countUUID      = (int) context.cli2._uuid_list.size ();
+  int countId        = (int) Context::getContext ().cli2._id_ranges.size ();
+  int countUUID      = (int) Context::getContext ().cli2._uuid_list.size ();
   int countOr        = 0;
   int countXor       = 0;
   int countNot       = 0;
 
-  for (const auto& a : context.cli2._args)
+  for (const auto& a : Context::getContext ().cli2._args)
   {
     if (a.hasTag ("FILTER"))
     {
@@ -263,7 +261,7 @@ void Filter::safety () const
   {
     bool readonly = true;
     bool filter = false;
-    for (const auto& a : context.cli2._args)
+    for (const auto& a : Context::getContext ().cli2._args)
     {
       if (a.hasTag ("CMD") &&
           ! a.hasTag ("READONLY"))
@@ -276,11 +274,11 @@ void Filter::safety () const
     if (! readonly &&
         ! filter)
     {
-      if (! context.config.getBoolean ("allow.empty.filter"))
+      if (! Context::getContext ().config.getBoolean ("allow.empty.filter"))
          throw std::string ("You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken.");
 
       // If user is willing to be asked, this can be avoided.
-      if (context.config.getBoolean ("confirmation") &&
+      if (Context::getContext ().config.getBoolean ("confirmation") &&
           confirm ("This command has no filter, and will modify all (including completed and deleted) tasks.  Are you sure?"))
         return;
 
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index e1adf364e..8c5f183d7 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -58,23 +58,21 @@
 #define STRING_HOOK_ERROR_SAME2      "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}"
 #define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 void Hooks::initialize ()
 {
-  _debug = context.config.getInteger ("debug.hooks");
+  _debug = Context::getContext ().config.getInteger ("debug.hooks");
 
   // Scan <rc.hooks.location>
   //      <rc.data.location>/hooks
   Directory d;
-  if (context.config.has ("hooks.location"))
+  if (Context::getContext ().config.has ("hooks.location"))
   {
-    d = Directory (context.config.get ("hooks.location"));
+    d = Directory (Context::getContext ().config.get ("hooks.location"));
   }
   else
   {
-    d = Directory (context.config.get ("data.location"));
+    d = Directory (Context::getContext ().config.get ("data.location"));
     d += "hooks";
   }
 
@@ -96,17 +94,17 @@ void Hooks::initialize ()
               name.substr (0, 9) == "on-modify" ||
               name.substr (0, 9) == "on-launch" ||
               name.substr (0, 7) == "on-exit")
-            context.debug ("Found hook script " + i);
+            Context::getContext ().debug ("Found hook script " + i);
           else
-            context.debug ("Found misnamed hook script " + i);
+            Context::getContext ().debug ("Found misnamed hook script " + i);
         }
       }
     }
   }
   else if (_debug >= 1)
-    context.debug ("Hook directory not readable: " + d._data);
+    Context::getContext ().debug ("Hook directory not readable: " + d._data);
 
-  _enabled = context.config.getBoolean ("hooks");
+  _enabled = Context::getContext ().config.getBoolean ("hooks");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -154,20 +152,20 @@ void Hooks::onLaunch () const
       if (status == 0)
       {
         for (auto& message : outputFeedback)
-          context.footnote (message);
+          Context::getContext ().footnote (message);
       }
       else
       {
         assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
-          context.error (message);
+          Context::getContext ().error (message);
 
         throw 0;  // This is how hooks silently terminate processing.
       }
     }
   }
 
-  context.time_hooks_us += timer.total_us ();
+  Context::getContext ().time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -194,7 +192,7 @@ void Hooks::onExit () const
   {
     // Get the set of changed tasks.
     std::vector <Task> tasks;
-    context.tdb2.get_changes (tasks);
+    Context::getContext ().tdb2.get_changes (tasks);
 
     // Convert to a vector of strings.
     std::vector <std::string> input;
@@ -216,20 +214,20 @@ void Hooks::onExit () const
       if (status == 0)
       {
         for (auto& message : outputFeedback)
-          context.footnote (message);
+          Context::getContext ().footnote (message);
       }
       else
       {
         assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
-          context.error (message);
+          Context::getContext ().error (message);
 
         throw 0;  // This is how hooks silently terminate processing.
       }
     }
   }
 
-  context.time_hooks_us += timer.total_us ();
+  Context::getContext ().time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -278,13 +276,13 @@ void Hooks::onAdd (Task& task) const
         input[0] = outputJSON[0];
 
         for (auto& message : outputFeedback)
-          context.footnote (message);
+          Context::getContext ().footnote (message);
       }
       else
       {
         assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
-          context.error (message);
+          Context::getContext ().error (message);
 
         throw 0;  // This is how hooks silently terminate processing.
       }
@@ -294,7 +292,7 @@ void Hooks::onAdd (Task& task) const
     task = Task (input[0]);
   }
 
-  context.time_hooks_us += timer.total_us ();
+  Context::getContext ().time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -345,13 +343,13 @@ void Hooks::onModify (const Task& before, Task& after) const
         input[1] = outputJSON[0];
 
         for (auto& message : outputFeedback)
-          context.footnote (message);
+          Context::getContext ().footnote (message);
       }
       else
       {
         assertFeedback (outputFeedback, script);
         for (auto& message : outputFeedback)
-          context.error (message);
+          Context::getContext ().error (message);
 
         throw 0;  // This is how hooks silently terminate processing.
       }
@@ -360,7 +358,7 @@ void Hooks::onModify (const Task& before, Task& after) const
     after = Task (input[1]);
   }
 
-  context.time_hooks_us += timer.total_us ();
+  Context::getContext ().time_hooks_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -420,7 +418,7 @@ void Hooks::assertValidJSON (
         i[0] != '{'     ||
         i[i.length () - 1] != '}')
     {
-      context.error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
+      Context::getContext ().error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
       throw 0;
     }
 
@@ -429,19 +427,19 @@ void Hooks::assertValidJSON (
       json::value* root = json::parse (i);
       if (root->type () != json::j_object)
       {
-        context.error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
+        Context::getContext ().error (format (STRING_HOOK_ERROR_OBJECT, Path (script).name ()));
         throw 0;
       }
 
       if (((json::object*)root)->_data.find ("description") == ((json::object*)root)->_data.end ())
       {
-        context.error (format (STRING_HOOK_ERROR_NODESC, Path (script).name ()));
+        Context::getContext ().error (format (STRING_HOOK_ERROR_NODESC, Path (script).name ()));
         throw 0;
       }
 
       if (((json::object*)root)->_data.find ("uuid") == ((json::object*)root)->_data.end ())
       {
-        context.error (format (STRING_HOOK_ERROR_NOUUID, Path (script).name ()));
+        Context::getContext ().error (format (STRING_HOOK_ERROR_NOUUID, Path (script).name ()));
         throw 0;
       }
 
@@ -450,15 +448,15 @@ void Hooks::assertValidJSON (
 
     catch (const std::string& e)
     {
-      context.error (format (STRING_HOOK_ERROR_SYNTAX, i));
+      Context::getContext ().error (format (STRING_HOOK_ERROR_SYNTAX, i));
       if (_debug)
-        context.error (STRING_HOOK_ERROR_JSON + e);
+        Context::getContext ().error (STRING_HOOK_ERROR_JSON + e);
       throw 0;
     }
 
     catch (...)
     {
-      context.error (STRING_HOOK_ERROR_NOPARSE + i);
+      Context::getContext ().error (STRING_HOOK_ERROR_NOPARSE + i);
       throw 0;
     }
   }
@@ -472,7 +470,7 @@ void Hooks::assertNTasks (
 {
   if (input.size () != n)
   {
-    context.error (format (STRING_HOOK_ERROR_BAD_NUM, n, (int) input.size (), Path (script).name ()));
+    Context::getContext ().error (format (STRING_HOOK_ERROR_BAD_NUM, n, (int) input.size (), Path (script).name ()));
     throw 0;
   }
 }
@@ -494,7 +492,7 @@ void Hooks::assertSameTask (
     if (u == root_obj->_data.end ()          ||
         u->second->type () != json::j_string)
     {
-      context.error (format (STRING_HOOK_ERROR_SAME1, uuid, Path (script).name ()));
+      Context::getContext ().error (format (STRING_HOOK_ERROR_SAME1, uuid, Path (script).name ()));
       throw 0;
     }
 
@@ -504,7 +502,7 @@ void Hooks::assertSameTask (
     std::string json_uuid = json::decode (text);
     if (json_uuid != uuid)
     {
-      context.error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid, Path (script).name ()));
+      Context::getContext ().error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid, Path (script).name ()));
       throw 0;
     }
 
@@ -524,7 +522,7 @@ void Hooks::assertFeedback (
 
   if (! foundSomething)
   {
-    context.error (format (STRING_HOOK_ERROR_NOFEEDBACK, Path (script).name ()));
+    Context::getContext ().error (format (STRING_HOOK_ERROR_NOFEEDBACK, Path (script).name ()));
     throw 0;
   }
 }
@@ -542,13 +540,13 @@ std::vector <std::string>& Hooks::buildHookScriptArgs (std::vector <std::string>
   args.push_back ("args:" + std::string (v));
 
   // Command to be executed.
-  args.push_back ("command:" + context.cli2.getCommand ());
+  args.push_back ("command:" + Context::getContext ().cli2.getCommand ());
 
   // rc file used after applying all overrides.
-  args.push_back ("rc:" + context.rc_file._data);
+  args.push_back ("rc:" + Context::getContext ().rc_file._data);
 
   // Directory containing *.data files.
-  args.push_back ("data:" + context.data_dir._data);
+  args.push_back ("data:" + Context::getContext ().data_dir._data);
 
   // Taskwarrior version, same as returned by "task --version"
   args.push_back ("version:" + std::string(VERSION));
@@ -563,13 +561,13 @@ int Hooks::callHookScript (
   std::vector <std::string>& output) const
 {
   if (_debug >= 1)
-    context.debug ("Hook: Calling " + script);
+    Context::getContext ().debug ("Hook: Calling " + script);
 
   if (_debug >= 2)
   {
-    context.debug ("Hook: input");
+    Context::getContext ().debug ("Hook: input");
     for (const auto& i : input)
-      context.debug ("  " + i);
+      Context::getContext ().debug ("  " + i);
   }
 
   std::string inputStr;
@@ -580,9 +578,9 @@ int Hooks::callHookScript (
   buildHookScriptArgs (args);
   if (_debug >= 2)
   {
-    context.debug ("Hooks: args");
+    Context::getContext ().debug ("Hooks: args");
     for (const auto& arg: args)
-      context.debug ("  " + arg);
+      Context::getContext ().debug ("  " + arg);
   }
 
   // Measure time for each hook if running in debug
@@ -592,7 +590,7 @@ int Hooks::callHookScript (
   {
     Timer timer;
     status = execute (script, args, inputStr, outputStr);
-    context.debugTiming (format ("Hooks::execute ({1})", script), timer);
+    Context::getContext ().debugTiming (format ("Hooks::execute ({1})", script), timer);
   }
   else
     status = execute (script, args, inputStr, outputStr);
@@ -601,13 +599,13 @@ int Hooks::callHookScript (
 
   if (_debug >= 2)
   {
-    context.debug ("Hook: output");
+    Context::getContext ().debug ("Hook: output");
     for (const auto& i : output)
       if (i != "")
-        context.debug ("  " + i);
+        Context::getContext ().debug ("  " + i);
 
-    context.debug (format ("Hook: Completed with status {1}", status));
-    context.debug (" "); // Blank line
+    Context::getContext ().debug (format ("Hook: Completed with status {1}", status));
+    Context::getContext ().debug (" "); // Blank line
   }
 
   return status;
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index e400216d5..ad3e80f6c 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -44,8 +44,6 @@
 
 #define STRING_TDB2_REVERTED         "Modified task reverted."
 
-extern Context context;
-
 bool TDB2::debug_mode = false;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -171,7 +169,7 @@ void TF2::add_task (Task& task)
   _added_tasks.push_back (task);     // For commit/synch
 
   // For faster lookup
-  if (context.cli2.getCommand () == "import")
+  if (Context::getContext ().cli2.getCommand () == "import")
     _tasks_map.insert (std::pair<std::string, Task> (task.get("uuid"), task));
 
   Task::status status = task.getStatus ();
@@ -180,7 +178,7 @@ void TF2::add_task (Task& task)
        status == Task::recurring ||
        status == Task::waiting))
   {
-    task.id = context.tdb2.next_id ();
+    task.id = Context::getContext ().tdb2.next_id ();
   }
 
   _I2U[task.id] = task.get ("uuid");
@@ -194,7 +192,7 @@ bool TF2::modify_task (const Task& task)
 {
   std::string uuid = task.get ("uuid");
 
-  if (context.cli2.getCommand () == "import")
+  if (Context::getContext ().cli2.getCommand () == "import")
   {
     // Update map used for faster lookup
     auto i = _tasks_map.find (uuid);
@@ -270,7 +268,7 @@ void TF2::commit ()
     {
       if (_file.open ())
       {
-        if (context.config.getBoolean ("locking"))
+        if (Context::getContext ().config.getBoolean ("locking"))
           _file.lock ();
 
         // Write out all the added tasks.
@@ -292,7 +290,7 @@ void TF2::commit ()
     {
       if (_file.open ())
       {
-        if (context.config.getBoolean ("locking"))
+        if (Context::getContext ().config.getBoolean ("locking"))
           _file.lock ();
 
         // Truncate the file and rewrite.
@@ -327,9 +325,9 @@ Task TF2::load_task (const std::string& line)
   {
     Task::status status = task.getStatus ();
     // Completed / deleted tasks in pending.data get an ID if GC is off.
-    if (! context.run_gc ||
+    if (! Context::getContext ().run_gc ||
         (status != Task::completed && status != Task::deleted))
-      task.id = context.tdb2.next_id ();
+      task.id = Context::getContext ().tdb2.next_id ();
   }
 
   // Maintain mapping for ease of link/dependency resolution.
@@ -355,7 +353,7 @@ void TF2::load_gc (Task& task)
   if (status == "pending" ||
       status == "recurring")
   {
-    context.tdb2.pending._tasks.push_back (task);
+    Context::getContext ().tdb2.pending._tasks.push_back (task);
   }
   else if (status == "waiting")
   {
@@ -366,17 +364,17 @@ void TF2::load_gc (Task& task)
       task.remove ("wait");
       // Unwaiting pending tasks is the only case not caught by the size()
       // checks in TDB2::gc(), so we need to signal it here.
-      context.tdb2.pending._dirty = true;
+      Context::getContext ().tdb2.pending._dirty = true;
 
-      if (context.verbose ("unwait"))
-        context.footnote (format ("Un-waiting task '{1}'", task.get ("description")));
+      if (Context::getContext ().verbose ("unwait"))
+        Context::getContext ().footnote (format ("Un-waiting task '{1}'", task.get ("description")));
     }
 
-    context.tdb2.pending._tasks.push_back (task);
+    Context::getContext ().tdb2.pending._tasks.push_back (task);
   }
   else
   {
-    context.tdb2.completed._tasks.push_back (task);
+    Context::getContext ().tdb2.completed._tasks.push_back (task);
   }
 }
 
@@ -411,7 +409,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
       else
         _tasks.push_back (task);
 
-      if (context.cli2.getCommand () == "import")  // For faster lookup only
+      if (Context::getContext ().cli2.getCommand () == "import")  // For faster lookup only
         _tasks_map.insert (std::pair<std::string, Task> (task.get("uuid"), task));
     }
 
@@ -427,7 +425,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
     throw e + format (" in {1} at line {2}", _file._data, line_number);
   }
 
-  context.time_load_us += timer.total_us ();
+  Context::getContext ().time_load_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -435,7 +433,7 @@ void TF2::load_lines ()
 {
   if (_file.open ())
   {
-    if (context.config.getBoolean ("locking"))
+    if (Context::getContext ().config.getBoolean ("locking"))
       _file.lock ();
 
     _file.read (_lines);
@@ -645,7 +643,7 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
   // Only locally-added tasks trigger hooks.  This means that tasks introduced
   // via 'sync' do not trigger hooks.
   if (add_to_backlog)
-    context.hooks.onAdd (task);
+    Context::getContext ().hooks.onAdd (task);
 
   update (task, add_to_backlog, true);
 }
@@ -662,7 +660,7 @@ void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
   {
     Task original;
     get (uuid, original);
-    context.hooks.onModify (original, task);
+    Context::getContext ().hooks.onModify (original, task);
   }
 
   update (task, add_to_backlog);
@@ -764,7 +762,7 @@ void TDB2::commit ()
   signal (SIGUSR1,   SIG_DFL);
   signal (SIGUSR2,   SIG_DFL);
 
-  context.time_commit_us += timer.total_us ();
+  Context::getContext ().time_commit_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -803,7 +801,7 @@ void TDB2::revert ()
 
   // Display diff and confirm.
   show_diff (current, prior, when);
-  if (! context.config.getBoolean ("confirmation") ||
+  if (! Context::getContext ().config.getBoolean ("confirmation") ||
       confirm ("The undo command is not reversible.  Are you sure you want to revert to the previous state?"))
   {
     // There are six kinds of change possible.  Determine which one, and act
@@ -914,7 +912,7 @@ void TDB2::revert_pending (
   {
     if (task->find (uuid_att) != std::string::npos)
     {
-      context.debug ("TDB::revert - task found in pending.data");
+      Context::getContext ().debug ("TDB::revert - task found in pending.data");
 
       // Either revert if there was a prior state, or remove the task.
       if (prior != "")
@@ -947,7 +945,7 @@ void TDB2::revert_completed (
   {
     if (task->find (uuid_att) != std::string::npos)
     {
-      context.debug ("TDB::revert_completed - task found in completed.data");
+      Context::getContext ().debug ("TDB::revert_completed - task found in completed.data");
 
       // Either revert if there was a prior state, or remove the task.
       if (prior != "")
@@ -960,12 +958,12 @@ void TDB2::revert_completed (
           c.erase (task);
           p.push_back (prior);
           std::cout << STRING_TDB2_REVERTED << '\n';
-          context.debug ("TDB::revert_completed - task belongs in pending.data");
+          Context::getContext ().debug ("TDB::revert_completed - task belongs in pending.data");
         }
         else
         {
           std::cout << STRING_TDB2_REVERTED << '\n';
-          context.debug ("TDB::revert_completed - task belongs in completed.data");
+          Context::getContext ().debug ("TDB::revert_completed - task belongs in completed.data");
         }
       }
       else
@@ -973,7 +971,7 @@ void TDB2::revert_completed (
         c.erase (task);
 
         std::cout << STRING_TDB2_REVERTED << '\n';
-        context.debug ("TDB::revert_completed - task removed");
+        Context::getContext ().debug ("TDB::revert_completed - task removed");
       }
 
       std::cout << "Undo complete.\n";
@@ -996,7 +994,7 @@ void TDB2::revert_backlog (
   {
     if (task->find (uuid_att) != std::string::npos)
     {
-      context.debug ("TDB::revert_backlog - task found in backlog.data");
+      Context::getContext ().debug ("TDB::revert_backlog - task found in backlog.data");
       found = true;
 
       // If this is a new task (no prior), then just remove it from the backlog.
@@ -1031,10 +1029,10 @@ void TDB2::show_diff (
   Datetime lastChange (strtol (when.c_str (), NULL, 10));
 
   // Set the colors.
-  Color color_red   (context.color () ? context.config.get ("color.undo.before") : "");
-  Color color_green (context.color () ? context.config.get ("color.undo.after") : "");
+  Color color_red   (Context::getContext ().color () ? Context::getContext ().config.get ("color.undo.before") : "");
+  Color color_green (Context::getContext ().color () ? Context::getContext ().config.get ("color.undo.after") : "");
 
-  if (context.config.get ("undo.style") == "side")
+  if (Context::getContext ().config.get ("undo.style") == "side")
   {
     std::cout << '\n'
               << format ("The last modification was made {1}", lastChange.toString ())
@@ -1043,7 +1041,7 @@ void TDB2::show_diff (
     // Attributes are all there is, so figure the different attribute names
     // between before and after.
     Table view;
-    view.width (context.getWidth ());
+    view.width (Context::getContext ().getWidth ());
     view.intraPadding (2);
     view.add ("");
     view.add ("Prior Values");
@@ -1128,7 +1126,7 @@ void TDB2::show_diff (
   // - name:
   // + name: new           // att added
   //
-  else if (context.config.get ("undo.style") == "diff")
+  else if (Context::getContext ().config.get ("undo.style") == "diff")
   {
     // Create reference tasks.
     Task before;
@@ -1139,7 +1137,7 @@ void TDB2::show_diff (
 
     // Generate table header.
     Table view;
-    view.width (context.getWidth ());
+    view.width (Context::getContext ().getWidth ());
     view.intraPadding (2);
     view.add ("");
     view.add ("");
@@ -1151,13 +1149,13 @@ void TDB2::show_diff (
     row = view.addRow ();
     view.set (row, 0, "+++ current state ", color_green);
     view.set (row, 1, format ("Change made {1}",
-                              lastChange.toString (context.config.get ("dateformat"))),
+                              lastChange.toString (Context::getContext ().config.get ("dateformat"))),
                       color_green);
 
     view.addRow ();
 
     // Add rows to table showing diffs.
-    std::vector <std::string> all = context.getColumns ();
+    std::vector <std::string> all = Context::getContext ().getColumns ();
 
     // Now factor in the annotation attributes.
     for (auto& it : before.data)
@@ -1252,7 +1250,7 @@ void TDB2::gc ()
   Timer timer;
 
   // Allowed as an override, but not recommended.
-  if (context.config.getBoolean ("gc"))
+  if (Context::getContext ().config.getBoolean ("gc"))
   {
     // Load pending, check whether completed changes size
     auto size_before = completed._tasks.size ();
@@ -1286,7 +1284,7 @@ void TDB2::gc ()
       completed.dependency_scan ();
   }
 
-  context.time_gc_us += timer.total_us ();
+  Context::getContext ().time_gc_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1463,13 +1461,13 @@ void TDB2::clear ()
 ////////////////////////////////////////////////////////////////////////////////
 void TDB2::dump ()
 {
-  if (context.config.getBoolean ("debug"))
+  if (Context::getContext ().config.getBoolean ("debug"))
   {
-    context.debug (pending.dump ());
-    context.debug (completed.dump ());
-    context.debug (undo.dump ());
-    context.debug (backlog.dump ());
-    context.debug (" ");
+    Context::getContext ().debug (pending.dump ());
+    Context::getContext ().debug (completed.dump ());
+    Context::getContext ().debug (undo.dump ());
+    Context::getContext ().debug (backlog.dump ());
+    Context::getContext ().debug (" ");
   }
 }
 
diff --git a/src/Task.cpp b/src/Task.cpp
index 9d2b5eed4..650079bc5 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -60,7 +60,6 @@
 
 #define APPROACHING_INFINITY 1000   // Close enough.  This isn't rocket surgery.
 
-extern Context context;
 extern Task& contextTask;
 
 static const float epsilon = 0.000001;
@@ -336,7 +335,7 @@ Task::dateState Task::getDateState (const std::string& name) const
         return dateLaterToday;
     }
 
-    int imminentperiod = context.config.getInteger ("due");
+    int imminentperiod = Context::getContext ().config.getInteger ("due");
     if (imminentperiod == 0)
       return dateAfterToday;
 
@@ -519,7 +518,7 @@ bool Task::is_dueyear () const
 ////////////////////////////////////////////////////////////////////////////////
 bool Task::is_udaPresent () const
 {
-  for (auto& col : context.columns)
+  for (auto& col : Context::getContext ().columns)
     if (col.second->is_uda () &&
         has (col.first))
       return true;
@@ -532,7 +531,7 @@ bool Task::is_orphanPresent () const
 {
   for (auto& att : data)
     if (att.first.compare (0, 11, "annotation_", 11) != 0)
-      if (context.columns.find (att.first) == context.columns.end ())
+      if (Context::getContext ().columns.find (att.first) == Context::getContext ().columns.end ())
         return true;
 
   return false;
@@ -783,7 +782,7 @@ void Task::parseJSON (const json::object* root_obj)
                 << "' with value '"
                 << i.second
                 << "' --> preserved\n";
-        context.debug (message.str ());
+        Context::getContext ().debug (message.str ());
 #endif
         auto text = i.second->dump ();
         Lexer::dequote (text);
@@ -818,7 +817,7 @@ void Task::parseLegacy (const std::string& line)
     message << "Invalid fileformat at line '"
             << line
             << '\'';
-    context.debug (message.str ());
+    Context::getContext ().debug (message.str ());
 #endif
     throw std::string ("Unrecognized Taskwarrior file format or blank line in data.");
     break;
@@ -962,7 +961,7 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
     //             and Taskserver 1.2.0 is released, the default for
     //             'json.depends.array' can revert to 'on'.
 
-             && context.config.getBoolean ("json.depends.array")
+             && Context::getContext ().config.getBoolean ("json.depends.array")
 #endif
             )
     {
@@ -1124,14 +1123,14 @@ void Task::setAnnotations (const std::map <std::string, std::string>& annotation
 void Task::addDependency (int depid)
 {
   // Check that id is resolvable.
-  std::string uuid = context.tdb2.pending.uuid (depid);
+  std::string uuid = Context::getContext ().tdb2.pending.uuid (depid);
   if (uuid == "")
     throw format ("Could not create a dependency on task {1} - not found.", depid);
 
   std::string depends = get ("depends");
   if (depends.find (uuid) != std::string::npos)
   {
-    context.footnote (format ("Task {1} already depends on task {2}.", id, depid));
+    Context::getContext ().footnote (format ("Task {1} already depends on task {2}.", id, depid));
     return;
   }
 
@@ -1155,7 +1154,7 @@ void Task::addDependency (const std::string& uuid)
     else
     {
 #ifdef PRODUCT_TASKWARRIOR
-      context.footnote (format ("Task {1} already depends on task {2}.", get ("uuid"), uuid));
+      Context::getContext ().footnote (format ("Task {1} already depends on task {2}.", get ("uuid"), uuid));
 #endif
       return;
     }
@@ -1193,7 +1192,7 @@ void Task::removeDependency (const std::string& uuid)
 void Task::removeDependency (int id)
 {
   std::string depends = get ("depends");
-  std::string uuid = context.tdb2.pending.uuid (id);
+  std::string uuid = Context::getContext ().tdb2.pending.uuid (id);
   if (uuid != "" && depends.find (uuid) != std::string::npos)
     removeDependency (uuid);
   else
@@ -1205,7 +1204,7 @@ std::vector <int> Task::getDependencyIDs () const
 {
   std::vector <int> all;
   for (auto& dep : split (get ("depends"), ','))
-    all.push_back (context.tdb2.pending.id (dep));
+    all.push_back (Context::getContext ().tdb2.pending.id (dep));
 
   return all;
 }
@@ -1223,7 +1222,7 @@ std::vector <Task> Task::getDependencyTasks () const
   for (auto& dep : split (get ("depends"), ','))
   {
     Task task;
-    context.tdb2.get (dep, task);
+    Context::getContext ().tdb2.get (dep, task);
     all.push_back (task);
   }
 
@@ -1286,7 +1285,7 @@ bool Task::hasTag (const std::string& tag) const
 #ifdef PRODUCT_TASKWARRIOR
     if (tag == "UDA")       return is_udaPresent ();
     if (tag == "ORPHAN")    return is_orphanPresent ();
-    if (tag == "LATEST")    return id == context.tdb2.latest_id ();
+    if (tag == "LATEST")    return id == Context::getContext ().tdb2.latest_id ();
 #endif
     if (tag == "PROJECT")   return has ("project");
     if (tag == "PRIORITY")  return has ("priority");
@@ -1355,7 +1354,7 @@ std::vector <std::string> Task::getUDAOrphanUUIDs () const
   std::vector <std::string> orphans;
   for (auto& it : data)
     if (it.first.compare (0, 11, "annotation_", 11) != 0)
-      if (context.columns.find (it.first) == context.columns.end ())
+      if (Context::getContext ().columns.find (it.first) == Context::getContext ().columns.end ())
         orphans.push_back (it.first);
 
   return orphans;
@@ -1551,7 +1550,7 @@ void Task::validate (bool applyDefault /* = true */)
     if (Task::defaultProject != "" &&
         ! has ("project"))
     {
-      if (context.columns["project"]->validate (Task::defaultProject))
+      if (Context::getContext ().columns["project"]->validate (Task::defaultProject))
         set ("project", Task::defaultProject);
     }
 
@@ -1559,7 +1558,7 @@ void Task::validate (bool applyDefault /* = true */)
     if (Task::defaultDue != "" &&
         ! has ("due"))
     {
-      if (context.columns["due"]->validate (Task::defaultDue))
+      if (Context::getContext ().columns["due"]->validate (Task::defaultDue))
       {
         Duration dur (Task::defaultDue);
         if (dur.toTime_t () != 0)
@@ -1573,7 +1572,7 @@ void Task::validate (bool applyDefault /* = true */)
     if (Task::defaultScheduled != "" &&
         ! has ("scheduled"))
     {
-      if (context.columns["scheduled"]->validate (Task::defaultScheduled))
+      if (Context::getContext ().columns["scheduled"]->validate (Task::defaultScheduled))
       {
         Duration dur (Task::defaultScheduled);
         if (dur.toTime_t () != 0)
@@ -1587,7 +1586,7 @@ void Task::validate (bool applyDefault /* = true */)
     // override with uda.(uda).default, if not specified.
     // Gather a list of all UDAs with a .default value
     std::vector <std::string> udas;
-    for (auto& var : context.config)
+    for (auto& var : Context::getContext ().config)
     {
       if (! var.first.compare (0, 4, "uda.", 4) &&
           var.first.find (".default") != std::string::npos)
@@ -1604,7 +1603,7 @@ void Task::validate (bool applyDefault /* = true */)
       // of course only if we don't have one on the command line already
       for (auto& uda : udas)
       {
-        std::string defVal= context.config.get ("uda." + uda + ".default");
+        std::string defVal= Context::getContext ().config.get ("uda." + uda + ".default");
 
         // If the default is empty, or we already have a value, skip it
         if (defVal != "" && get (uda) == "")
@@ -1664,7 +1663,7 @@ void Task::validate_before (const std::string& left, const std::string& right)
 
     // if date is zero, then it is being removed (e.g. "due: wait:1day")
     if (date_left > date_right && date_right.toEpoch () != 0)
-      context.footnote (format ("Warning: You have specified that the '{1}' date is after the '{2}' date.", left, right));
+      Context::getContext ().footnote (format ("Warning: You have specified that the '{1}' date is after the '{2}' date.", left, right));
   }
 #endif
 }
@@ -1863,7 +1862,7 @@ float Task::urgency_c () const
     }
   }
 
-  if (is_blocking && context.config.getBoolean ("urgency.inherit"))
+  if (is_blocking && Context::getContext ().config.getBoolean ("urgency.inherit"))
   {
     float prev = value;
     value = std::max (value, urgency_inherit ());
@@ -2046,7 +2045,7 @@ void Task::modify (modType type, bool text_required /* = false */)
 
   std::string text = "";
   bool mods = false;
-  for (auto& a : context.cli2._args)
+  for (auto& a : Context::getContext ().cli2._args)
   {
     if (a.hasTag ("MODIFICATION"))
     {
@@ -2063,22 +2062,22 @@ void Task::modify (modType type, bool text_required /* = false */)
           // ::composeF4 will skip if the value is blank, but the presence of
           // the attribute will prevent ::validate from applying defaults.
           if ((has (name) && get (name) != "") ||
-              (name == "due"       && context.config.has ("default.due")) ||
-              (name == "scheduled" && context.config.has ("default.scheduled")) ||
-              (name == "project"   && context.config.has ("default.project")))
+              (name == "due"       && Context::getContext ().config.has ("default.due")) ||
+              (name == "scheduled" && Context::getContext ().config.has ("default.scheduled")) ||
+              (name == "project"   && Context::getContext ().config.has ("default.project")))
           {
             mods = true;
             set (name, "");
           }
 
-          context.debug (label + name + " <-- ''");
+          Context::getContext ().debug (label + name + " <-- ''");
         }
         else
         {
           Lexer::dequote (value);
 
           // Get the column info. Some columns are not modifiable.
-          Column* column = context.columns[name];
+          Column* column = Context::getContext ().columns[name];
           if (! column ||
               ! column->modifiable ())
             throw format ("The '{1}' attribute does not allow a value of '{2}'.", name, value);
@@ -2104,7 +2103,7 @@ void Task::modify (modType type, bool text_required /* = false */)
       // Perform description/annotation substitution.
       else if (a._lextype == Lexer::Type::substitution)
       {
-        context.debug (label + "substitute " + a.attribute ("raw"));
+        Context::getContext ().debug (label + "substitute " + a.attribute ("raw"));
         substitute (a.attribute ("from"),
                     a.attribute ("to"),
                     a.attribute ("flags"));
@@ -2121,13 +2120,13 @@ void Task::modify (modType type, bool text_required /* = false */)
 
         if (a.attribute ("sign") == "+")
         {
-          context.debug (label + "tags <-- add '" + tag + '\'');
+          Context::getContext ().debug (label + "tags <-- add '" + tag + '\'');
           addTag (tag);
           feedback_special_tags (*this, tag);
         }
         else
         {
-          context.debug (label + "tags <-- remove '" + tag + '\'');
+          Context::getContext ().debug (label + "tags <-- remove '" + tag + '\'');
           removeTag (tag);
         }
 
@@ -2153,22 +2152,22 @@ void Task::modify (modType type, bool text_required /* = false */)
     switch (type)
     {
     case modReplace:
-      context.debug (label + "description <-- '" + text + '\'');
+      Context::getContext ().debug (label + "description <-- '" + text + '\'');
       set ("description", text);
       break;
 
     case modPrepend:
-      context.debug (label + "description <-- '" + text + "' + description");
+      Context::getContext ().debug (label + "description <-- '" + text + "' + description");
       set ("description", text + ' ' + get ("description"));
       break;
 
     case modAppend:
-      context.debug (label + "description <-- description + '" + text + '\'');
+      Context::getContext ().debug (label + "description <-- description + '" + text + '\'');
       set ("description", get ("description") + ' ' + text);
       break;
 
     case modAnnotate:
-      context.debug (label + "new annotation <-- '" + text + '\'');
+      Context::getContext ().debug (label + "new annotation <-- '" + text + '\'');
       addAnnotation (text);
       break;
     }
@@ -2182,7 +2181,7 @@ void Task::modify (modType type, bool text_required /* = false */)
       getStatus () == originalStatus)
   {
     auto uuid = get ("uuid").substr (0, 8);
-    context.footnote (format ("Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending", uuid, get ("status"), uuid));
+    Context::getContext ().footnote (format ("Note: Modified task {1} is {2}.  You may wish to make this task pending with: task {3} modify status:pending", uuid, get ("status"), uuid));
   }
 }
 #endif
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 9ef8ba3fa..1ae01d711 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -33,8 +33,6 @@
 #include <utf8.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 ViewTask::ViewTask ()
 : _width (0)
@@ -112,8 +110,8 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
 {
   Timer timer;
 
-  bool const obfuscate           = context.config.getBoolean ("obfuscate");
-  bool const print_empty_columns = context.config.getBoolean ("print.empty.columns");
+  bool const obfuscate           = Context::getContext ().config.getBoolean ("obfuscate");
+  bool const print_empty_columns = Context::getContext ().config.getBoolean ("print.empty.columns");
   std::vector <Column*> nonempty_columns;
   std::vector <bool> nonempty_sort;
 
@@ -190,11 +188,11 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
 
   // Calculate final column widths.
   int overage = _width - sum_minimal - all_extra;
-  context.debug (format ("ViewTask::render min={1} ideal={2} overage={3} width={4}", 
-                         sum_minimal + all_extra,
-                         sum_ideal + all_extra,
-                         overage,
-                         _width));
+  Context::getContext ().debug (format ("ViewTask::render min={1} ideal={2} overage={3} width={4}", 
+                                        sum_minimal + all_extra,
+                                        sum_ideal + all_extra,
+                                        overage,
+                                        _width));
 
   std::vector <int> widths;
 
@@ -207,7 +205,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
   // Not enough for minimum.
   else if (overage < 0)
   {
-    context.error (format ("The report has a minimum width of {1} and does not fit in the available width of {2}.", sum_minimal + all_extra, _width));
+    Context::getContext ().error (format ("The report has a minimum width of {1} and does not fit in the available width of {2}.", sum_minimal + all_extra, _width));
     widths = minimal;
   }
 
@@ -256,10 +254,10 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
   std::string extra       = std::string (_extra_padding, ' ');
   std::string intra       = std::string (_intra_padding, ' ');
 
-  std::string extra_odd   = context.color () ? _extra_odd.colorize  (extra) : extra;
-  std::string extra_even  = context.color () ? _extra_even.colorize (extra) : extra;
-  std::string intra_odd   = context.color () ? _intra_odd.colorize  (intra) : intra;
-  std::string intra_even  = context.color () ? _intra_even.colorize (intra) : intra;
+  std::string extra_odd   = Context::getContext ().color () ? _extra_odd.colorize  (extra) : extra;
+  std::string extra_even  = Context::getContext ().color () ? _extra_even.colorize (extra) : extra;
+  std::string intra_odd   = Context::getContext ().color () ? _intra_odd.colorize  (intra) : intra;
+  std::string intra_even  = Context::getContext ().color () ? _intra_even.colorize (intra) : intra;
 
   std::string out;
   _lines = 0;
@@ -287,7 +285,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
     // Stop if the line limit is exceeded.
     if (++_lines >= _truncate_lines && _truncate_lines != 0)
     {
-      context.time_render_us += timer.total_us ();
+      Context::getContext ().time_render_us += timer.total_us ();
       return out;
     }
   }
@@ -306,7 +304,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
     // Alternate rows based on |s % 2|
     bool odd = (s % 2) ? true : false;
     Color row_color;
-    if (context.color ())
+    if (Context::getContext ().color ())
     {
       row_color = odd ? _odd : _even;
       row_color.blend (rule_color);
@@ -373,7 +371,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
       // Stop if the line limit is exceeded.
       if (++_lines >= _truncate_lines && _truncate_lines != 0)
       {
-        context.time_render_us += timer.total_us ();
+        Context::getContext ().time_render_us += timer.total_us ();
         return out;
       }
     }
@@ -383,12 +381,12 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
     // Stop if the row limit is exceeded.
     if (++_rows >= _truncate_rows && _truncate_rows != 0)
     {
-      context.time_render_us += timer.total_us ();
+      Context::getContext ().time_render_us += timer.total_us ();
       return out;
     }
   }
 
-  context.time_render_us += timer.total_us ();
+  Context::getContext ().time_render_us += timer.total_us ();
   return out;
 }
 
diff --git a/src/calc.cpp b/src/calc.cpp
index 837cced10..919764e55 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -37,8 +37,6 @@
 #include <shared.h>
 #include <format.h>
 
-Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // Constants.
 bool get (const std::string&, Variant&)
@@ -58,6 +56,9 @@ int main (int argc, char** argv)
 
   try
   {
+    Context globalContext;
+    Context::setContext (&globalContext);
+
     // Same operating parameters as Context::staticInitialization.
     Datetime::standaloneDateEnabled    = false;
     Datetime::standaloneTimeEnabled    = false;
@@ -118,7 +119,7 @@ int main (int argc, char** argv)
       e.evaluatePostfixExpression (expression, result);
 
     // Show any debug output.
-    for (const auto& i : context.debugMessages)
+    for (const auto& i : Context::getContext ().debugMessages)
       std::cout << i << '\n';
 
     // Show the result in string form.
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index c74fdb2b9..91d243910 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -36,8 +36,6 @@
 
 #define STRING_COLUMN_LABEL_DEP "Depends"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDepends::ColumnDepends ()
 {
@@ -49,7 +47,7 @@ ColumnDepends::ColumnDepends ()
                 "indicator"};
   _examples  = {"1 2 10",
                 "[3]",
-                context.config.get ("dependency.indicator")};
+                Context::getContext ().config.get ("dependency.indicator")};
 
   _hyphenate = false;
 }
@@ -61,7 +59,7 @@ void ColumnDepends::setStyle (const std::string& value)
 {
   Column::setStyle (value);
 
-       if (_style == "indicator" && _label == STRING_COLUMN_LABEL_DEP) _label = _label.substr (0, context.config.get ("dependency.indicator").length ());
+       if (_style == "indicator" && _label == STRING_COLUMN_LABEL_DEP) _label = _label.substr (0, Context::getContext ().config.get ("dependency.indicator").length ());
   else if (_style == "count"     && _label == STRING_COLUMN_LABEL_DEP) _label = "Dep";
 }
 
@@ -74,7 +72,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
   {
     if (_style == "indicator")
     {
-      minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
+      minimum = maximum = utf8_width (Context::getContext ().config.get ("dependency.indicator"));
     }
 
     else if (_style == "count")
@@ -117,7 +115,7 @@ void ColumnDepends::render (
   {
     if (_style == "indicator")
     {
-      renderStringRight (lines, width, color, context.config.get ("dependency.indicator"));
+      renderStringRight (lines, width, color, Context::getContext ().config.get ("dependency.indicator"));
     }
 
     else if (_style == "count")
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 98187b798..c26a97308 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -34,8 +34,6 @@
 #include <utf8.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 ColumnDescription::ColumnDescription ()
 {
@@ -51,9 +49,9 @@ ColumnDescription::ColumnDescription ()
                  "count",
                  "truncated_count"};
 
-  _dateformat = context.config.get ("dateformat.annotation");
+  _dateformat = Context::getContext ().config.get ("dateformat.annotation");
   if (_dateformat == "")
-    _dateformat = context.config.get ("dateformat");
+    _dateformat = Context::getContext ().config.get ("dateformat");
 
   std::string t  = Datetime ().toString (_dateformat);
   std::string d  = "Move your clothes down on to the lower peg";
@@ -75,9 +73,9 @@ ColumnDescription::ColumnDescription ()
                d + " [4]",
                d.substr (0, 20) + "... [4]"};
 
-  _hyphenate = context.config.getBoolean ("hyphenate");
+  _hyphenate = Context::getContext ().config.getBoolean ("hyphenate");
 
-  _indent = context.config.getInteger ("indent.annotation");
+  _indent = Context::getContext ().config.getInteger ("indent.annotation");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index b29d9309c..af011ea42 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -36,7 +36,6 @@
 #include <utf8.h>
 #include <util.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +48,7 @@ ColumnProject::ColumnProject ()
   _examples  = {"home.garden",
                 "home",
                 "  home.garden"};
-  _hyphenate = context.config.getBoolean ("hyphenate");
+  _hyphenate = Context::getContext ().config.getBoolean ("hyphenate");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -127,7 +126,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
       Variant v;
       e.evaluateInfixExpression (value, v);
       task.set (_name, (std::string) v);
-      context.debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + '\'');
+      Context::getContext ().debug (label + _name + " <-- '" + (std::string) v + "' <-- '" + value + '\'');
     }
     catch (const std::string& e)
     {
@@ -136,7 +135,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
       if (e == "The value is not an expression.")
       {
         task.set (_name, value);
-        context.debug (label + _name + " <-- '" + value + '\'');
+        Context::getContext ().debug (label + _name + " <-- '" + value + '\'');
       }
       else
         throw;
@@ -145,7 +144,7 @@ void ColumnProject::modify (Task& task, const std::string& value)
   else
   {
     task.set (_name, value);
-    context.debug (label + _name + " <-- '" + value + '\'');
+    Context::getContext ().debug (label + _name + " <-- '" + value + '\'');
   }
 }
 
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 28ac58e79..a70a9cb5d 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -36,7 +36,6 @@
 #include <format.h>
 #include <utf8.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -47,7 +46,7 @@ ColumnRecur::ColumnRecur ()
   _label      = "Recur";
   _modifiable = true;
   _styles     = {"duration", "indicator"};
-  _examples   = {"weekly", context.config.get ("recurrence.indicator")};
+  _examples   = {"weekly", Context::getContext ().config.get ("recurrence.indicator")};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -58,7 +57,7 @@ void ColumnRecur::setStyle (const std::string& value)
   Column::setStyle (value);
 
   if (_style == "indicator" && _label == "Recur")
-    _label = _label.substr (0, context.config.get ("recurrence.indicator").length ());
+    _label = _label.substr (0, Context::getContext ().config.get ("recurrence.indicator").length ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -75,7 +74,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     }
     else if (_style == "indicator")
     {
-      minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
+      minimum = maximum = utf8_width (Context::getContext ().config.get ("recurrence.indicator"));
     }
   }
 }
@@ -94,7 +93,7 @@ void ColumnRecur::render (
       renderStringRight (lines, width, color, Duration (task.get (_name)).formatISO ());
 
     else if (_style == "indicator")
-      renderStringRight (lines, width, color, context.config.get ("recurrence.indicator"));
+      renderStringRight (lines, width, color, Context::getContext ().config.get ("recurrence.indicator"));
   }
 }
 
@@ -122,7 +121,7 @@ void ColumnRecur::modify (Task& task, const std::string& value)
   {
     // Store the raw value, for 'recur'.
     std::string label = "  MODIFICATION ";
-    context.debug (label + _name + " <-- '" + value + '\'');
+    Context::getContext ().debug (label + _name + " <-- '" + value + '\'');
     task.set (_name, value);
   }
   else
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 056873790..833b59448 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -29,8 +29,6 @@
 #include <Context.h>
 #include <utf8.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 ColumnStart::ColumnStart ()
 {
@@ -38,7 +36,7 @@ ColumnStart::ColumnStart ()
   _label = "Started";
 
   _styles.push_back ("active");
-  _examples.push_back (context.config.get ("active.indicator"));
+  _examples.push_back (Context::getContext ().config.get ("active.indicator"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -60,7 +58,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
   if (task.has (_name))
   {
     if (_style == "active")
-      minimum = maximum = utf8_width (context.config.get ("active.indicator"));
+      minimum = maximum = utf8_width (Context::getContext ().config.get ("active.indicator"));
     else
       ColumnTypeDate::measure (task, minimum, maximum);
 
@@ -80,7 +78,7 @@ void ColumnStart::render (
     if (_style == "active")
     {
       if (! task.has ("end"))
-        renderStringRight (lines, width, color, context.config.get ("active.indicator"));
+        renderStringRight (lines, width, color, Context::getContext ().config.get ("active.indicator"));
     }
     else
       ColumnTypeDate::render (lines, task, width, color);
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index d4a654517..185c83316 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -36,7 +36,6 @@
 #include <utf8.h>
 #include <main.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -47,7 +46,7 @@ ColumnTags::ColumnTags ()
   _label     = "Tags";
   _styles    = {"list", "indicator", "count"};
   _examples  = {"home @chore next",
-                context.config.get ("tag.indicator"),
+                Context::getContext ().config.get ("tag.indicator"),
                 "[2]"};
   _hyphenate = false;
 }
@@ -61,7 +60,7 @@ void ColumnTags::setStyle (const std::string& value)
 
   if (_style == "indicator" &&
       _label == "Tags")
-    _label = _label.substr (0, context.config.get ("tag.indicator").length ());
+    _label = _label.substr (0, Context::getContext ().config.get ("tag.indicator").length ());
 
   else if (_style == "count" &&
             _label == "Tags")
@@ -77,7 +76,7 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
   {
     if (_style == "indicator")
     {
-      minimum = maximum = utf8_width (context.config.get ("tag.indicator"));
+      minimum = maximum = utf8_width (Context::getContext ().config.get ("tag.indicator"));
     }
     else if (_style == "count")
     {
@@ -139,7 +138,7 @@ void ColumnTags::render (
     }
     else if (_style == "indicator")
     {
-      renderStringRight (lines, width, color, context.config.get ("tag.indicator"));
+      renderStringRight (lines, width, color, Context::getContext ().config.get ("tag.indicator"));
     }
     else if (_style == "count")
     {
@@ -173,12 +172,12 @@ void ColumnTags::modify (Task& task, const std::string& value)
       Variant v;
       e.evaluateInfixExpression (value, v);
       task.addTag ((std::string) v);
-      context.debug (label + "tags <-- '" + (std::string) v + "' <-- '" + tag + '\'');
+      Context::getContext ().debug (label + "tags <-- '" + (std::string) v + "' <-- '" + tag + '\'');
     }
     else
     {
       task.addTag (tag);
-      context.debug (label + "tags <-- '" + tag + '\'');
+      Context::getContext ().debug (label + "tags <-- '" + tag + '\'');
     }
 
     feedback_special_tags (task, tag);
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 2502784a7..4aeaa0db1 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -34,7 +34,6 @@
 #include <Filter.h>
 #include <format.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,7 +54,7 @@ ColumnTypeDate::ColumnTypeDate ()
 
   Datetime now;
   now -= 125; // So that "age" is non-zero.
-  _examples = {now.toString (context.config.get ("dateformat")),
+  _examples = {now.toString (Context::getContext ().config.get ("dateformat")),
                format (now.toJulian (), 13, 12),
                now.toEpochString (),
                now.toISO (),
@@ -81,11 +80,11 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m
       //   rc.report.<report>.dateformat
       //   rc.dateformat.report
       //   rc.dateformat.
-      std::string format = context.config.get ("report." + _report + ".dateformat");
+      std::string format = Context::getContext ().config.get ("report." + _report + ".dateformat");
       if (format == "")
-        format = context.config.get ("dateformat.report");
+        format = Context::getContext ().config.get ("dateformat.report");
       if (format == "")
-        format = context.config.get ("dateformat");
+        format = Context::getContext ().config.get ("dateformat");
 
       minimum = maximum = Datetime::length (format);
     }
@@ -149,12 +148,12 @@ void ColumnTypeDate::render (
       //   rc.report.<report>.dateformat
       //   rc.dateformat.report
       //   rc.dateformat
-      std::string format = context.config.get ("report." + _report + ".dateformat");
+      std::string format = Context::getContext ().config.get ("report." + _report + ".dateformat");
       if (format == "")
       {
-        format = context.config.get ("dateformat.report");
+        format = Context::getContext ().config.get ("dateformat.report");
         if (format == "")
-          format = context.config.get ("dateformat");
+          format = Context::getContext ().config.get ("dateformat");
       }
 
       renderStringLeft (lines, width, color, date.toString (format));
@@ -227,7 +226,7 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   std::string label = "  MODIFICATION ";
   if (evaluatedValue.type () == Variant::type_duration)
   {
-    context.debug (label + _name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
+    Context::getContext ().debug (label + _name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
     Datetime date_now;
     Variant now (date_now.toEpoch (), Variant::type_date);
     evaluatedValue += now;
@@ -235,7 +234,7 @@ void ColumnTypeDate::modify (Task& task, const std::string& value)
   else
   {
     evaluatedValue.cast (Variant::type_date);
-    context.debug (label + _name + " <-- '" + format ("{1}", evaluatedValue.get_date ()) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
+    Context::getContext ().debug (label + _name + " <-- '" + format ("{1}", evaluatedValue.get_date ()) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + '\'');
   }
 
   // If a date doesn't parse (2/29/2014) then it evaluates to zero.
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index a869dcfc5..bfd2d2051 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -32,7 +32,6 @@
 #include <Filter.h>
 #include <format.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -71,7 +70,7 @@ void ColumnTypeDuration::modify (Task& task, const std::string& value)
   if (evaluatedValue.type () == Variant::type_duration)
   {
     // Store the raw value, for 'recur'.
-    context.debug (label + _name + " <-- " + (std::string) evaluatedValue + " <-- '" + value + '\'');
+    Context::getContext ().debug (label + _name + " <-- " + (std::string) evaluatedValue + " <-- '" + value + '\'');
     task.set (_name, evaluatedValue);
   }
   else
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 5d72a269f..033381ca5 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -32,7 +32,6 @@
 #include <Filter.h>
 #include <format.h>
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -66,7 +65,7 @@ void ColumnTypeNumeric::modify (Task& task, const std::string& value)
   }
 
   std::string label = "  MODIFICATION ";
-  context.debug (label + _name + " <-- '" + evaluatedValue.get_string () + "' <-- '" + value + '\'');
+  Context::getContext ().debug (label + _name + " <-- '" + evaluatedValue.get_string () + "' <-- '" + value + '\'');
 
   // If the result is not readily convertible to a numeric value, then this is
   // an error.
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 0b1a79771..f6d5e8933 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -34,7 +34,6 @@
 
 #define STRING_INVALID_MOD           "The '{1}' attribute does not allow a value of '{2}'."
 
-extern Context context;
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -71,7 +70,7 @@ void ColumnTypeString::modify (Task& task, const std::string& value)
     if (validate (strValue))
     {
       task.set (_name, strValue);
-      context.debug (label + _name + " <-- '" + strValue + "' <-- '" + value + '\'');
+      Context::getContext ().debug (label + _name + " <-- '" + strValue + "' <-- '" + value + '\'');
     }
     else
       throw format (STRING_INVALID_MOD, _name, value);
@@ -81,7 +80,7 @@ void ColumnTypeString::modify (Task& task, const std::string& value)
     if (validate (value))
     {
       task.set (_name, value);
-      context.debug (label + _name + " <-- '" + value + '\'');
+      Context::getContext ().debug (label + _name + " <-- '" + value + '\'');
     }
     else
       throw format (STRING_INVALID_MOD, _name, value);
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 463b3ef9d..7a36812e7 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -34,8 +34,6 @@
 #include <utf8.h>
 #include <stdlib.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 ColumnUDAString::ColumnUDAString ()
 {
@@ -84,7 +82,7 @@ void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int&
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -113,7 +111,7 @@ void ColumnUDAString::render (
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -165,7 +163,7 @@ void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int&
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -190,7 +188,7 @@ void ColumnUDANumeric::render (
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -244,18 +242,18 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
         //   rc.dateformat.report
         //   rc.dateformat
         Datetime date ((time_t) strtol (value.c_str (), NULL, 10));
-        auto format = context.config.get ("report." + _report + ".dateformat");
+        auto format = Context::getContext ().config.get ("report." + _report + ".dateformat");
         if (format == "")
-          format = context.config.get ("dateformat.report");
+          format = Context::getContext ().config.get ("dateformat.report");
         if (format == "")
-          format = context.config.get ("dateformat");
+          format = Context::getContext ().config.get ("dateformat");
 
         minimum = maximum = Datetime::length (format);
       }
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -281,19 +279,19 @@ void ColumnUDADate::render (
       //   rc.report.<report>.dateformat
       //   rc.dateformat.report
       //   rc.dateformat.
-      auto format = context.config.get ("report." + _report + ".dateformat");
+      auto format = Context::getContext ().config.get ("report." + _report + ".dateformat");
       if (format == "")
       {
-        format = context.config.get ("dateformat.report");
+        format = Context::getContext ().config.get ("dateformat.report");
         if (format == "")
-          format = context.config.get ("dateformat");
+          format = Context::getContext ().config.get ("dateformat");
       }
 
       renderStringLeft (lines, width, color, Datetime ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
@@ -347,7 +345,7 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int
     {
       if (task.has (_name))
       {
-        auto indicator = context.config.get ("uda." + _name + ".indicator");
+        auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
         if (indicator == "")
           indicator = "U";
 
@@ -375,7 +373,7 @@ void ColumnUDADuration::render (
     }
     else if (_style == "indicator")
     {
-      auto indicator = context.config.get ("uda." + _name + ".indicator");
+      auto indicator = Context::getContext ().config.get ("uda." + _name + ".indicator");
       if (indicator == "")
         indicator = "U";
 
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 04f0e7f94..7fee381e6 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -53,8 +53,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // Supports the complete column definition:
 //
@@ -100,7 +98,7 @@ Column* Column::factory (const std::string& name, const std::string& report)
   else if (column_name == "wait")        c = new ColumnWait ();
 
   // UDA.
-  else if (context.config.has ("uda." + column_name + ".type"))
+  else if (Context::getContext ().config.has ("uda." + column_name + ".type"))
     c = Column::uda (column_name);
 
   else
@@ -147,7 +145,7 @@ void Column::uda (std::map <std::string, Column*>& all)
   // For each UDA, instantiate and initialize ColumnUDA.
   std::set <std::string> udas;
 
-  for (const auto& i : context.config)
+  for (const auto& i : Context::getContext ().config)
   {
     if (i.first.substr (0, 4) == "uda.")
     {
@@ -172,9 +170,9 @@ void Column::uda (std::map <std::string, Column*>& all)
 ////////////////////////////////////////////////////////////////////////////////
 Column* Column::uda (const std::string& name)
 {
-  auto type   = context.config.get ("uda." + name + ".type");
-  auto label  = context.config.get ("uda." + name + ".label");
-  auto values = context.config.get ("uda." + name + ".values");
+  auto type   = Context::getContext ().config.get ("uda." + name + ".type");
+  auto label  = Context::getContext ().config.get ("uda." + name + ".label");
+  auto values = Context::getContext ().config.get ("uda." + name + ".values");
 
   if (type == "string")
   {
@@ -242,7 +240,7 @@ void Column::renderHeader (
   int width,
   Color& color)
 {
-  if (context.verbose ("label") &&
+  if (Context::getContext ().verbose ("label") &&
       _label != "")
   {
     // Create a basic label.
@@ -254,8 +252,8 @@ void Column::renderHeader (
     Color c = color;
 
     // Now underline the header, or add a dashed line.
-    if (context.color () &&
-        context.config.getBoolean ("fontunderline"))
+    if (Context::getContext ().color () &&
+        Context::getContext ().config.getBoolean ("fontunderline"))
     {
       c.blend (Color (Color::nocolor, Color::nocolor, true, false, false));
       lines.push_back (c.colorize (leftJustify (header, width)));
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 394f0cfbb..9f3335a0f 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -30,8 +30,6 @@
 #include <format.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdAdd::CmdAdd ()
 {
@@ -54,7 +52,7 @@ int CmdAdd::execute (std::string& output)
   // Apply the command line modifications to the new task.
   Task task;
   task.modify (Task::modReplace, true);
-  context.tdb2.add (task);
+  Context::getContext ().tdb2.add (task);
 
   // Do not display ID 0, users cannot query by that
   auto status = task.getStatus ();
@@ -64,25 +62,25 @@ int CmdAdd::execute (std::string& output)
   // it's enduring and never changes, and it's unlikely the caller
   // asked for this if they just wanted a human-friendly number.
 
-  if (context.verbose ("new-uuid") &&
+  if (Context::getContext ().verbose ("new-uuid") &&
            status != Task::recurring)
     output += format ("Created task {1}.\n", task.get ("uuid"));
 
-  else if (context.verbose ("new-uuid") &&
+  else if (Context::getContext ().verbose ("new-uuid") &&
            status == Task::recurring)
     output += format ("Created task {1} (recurrence template).\n", task.get ("uuid"));
 
-  else if (context.verbose ("new-id") &&
+  else if (Context::getContext ().verbose ("new-id") &&
       (status == Task::pending ||
        status == Task::waiting))
     output += format ("Created task {1}.\n", task.id);
 
-  else if (context.verbose ("new-id") &&
+  else if (Context::getContext ().verbose ("new-id") &&
            status == Task::recurring)
     output += format ("Created task {1} (recurrence template).\n", task.id);
 
-  if (context.verbose ("project"))
-    context.footnote (onProjectChange (task));
+  if (Context::getContext ().verbose ("project"))
+    Context::getContext ().footnote (onProjectChange (task));
 
   return 0;
 }
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 32985fa06..b6004e3df 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -29,8 +29,6 @@
 #include <Context.h>
 #include <Command.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdCompletionAliases::CmdCompletionAliases ()
 {
@@ -50,7 +48,7 @@ CmdCompletionAliases::CmdCompletionAliases ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionAliases::execute (std::string& output)
 {
-  for (const auto& alias : context.config)
+  for (const auto& alias : Context::getContext ().config)
     if (alias.first.substr (0, 6) == "alias.")
       output += alias.first.substr (6) + '\n';
 
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 40b5ba1a0..0c27f02bb 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -33,8 +33,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdAnnotate::CmdAnnotate ()
 {
@@ -63,7 +61,7 @@ int CmdAnnotate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -85,33 +83,33 @@ int CmdAnnotate::execute (std::string&)
 
     if (permission (taskDifferences (before, task) + question, filtered.size ()))
     {
-      context.tdb2.modify (task);
+      Context::getContext ().tdb2.modify (task);
       ++count;
       feedback_affected ("Annotating task {1} '{2}'.", task);
-      if (context.verbose ("project"))
+      if (Context::getContext ().verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
       // Annotate siblings.
       if (task.has ("parent"))
       {
-        if ((context.config.get ("recurrence.confirmation") == "prompt"
+        if ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
              && confirm ("This is a recurring task.  Do you want to annotate all pending recurrences of this same task?")) ||
-            context.config.getBoolean ("recurrence.confirmation"))
+            Context::getContext ().config.getBoolean ("recurrence.confirmation"))
         {
-          auto siblings = context.tdb2.siblings (task);
+          auto siblings = Context::getContext ().tdb2.siblings (task);
           for (auto& sibling : siblings)
           {
             sibling.modify (Task::modAnnotate, true);
-            context.tdb2.modify (sibling);
+            Context::getContext ().tdb2.modify (sibling);
             ++count;
             feedback_affected ("Annotating recurring task {1} '{2}'.", sibling);
           }
 
           // Annotate the parent
           Task parent;
-          context.tdb2.get (task.get ("parent"), parent);
+          Context::getContext ().tdb2.get (task.get ("parent"), parent);
           parent.modify (Task::modAnnotate, true);
-          context.tdb2.modify (parent);
+          Context::getContext ().tdb2.modify (parent);
         }
       }
     }
@@ -127,7 +125,7 @@ int CmdAnnotate::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Annotated {1} task." : "Annotated {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 1579114fb..93f7369c5 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -33,8 +33,6 @@
 #include <format.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdAppend::CmdAppend ()
 {
@@ -63,7 +61,7 @@ int CmdAppend::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -85,33 +83,33 @@ int CmdAppend::execute (std::string&)
 
     if (permission (taskDifferences (before, task) + question, filtered.size ()))
     {
-      context.tdb2.modify (task);
+      Context::getContext ().tdb2.modify (task);
       ++count;
       feedback_affected ("Appending to task {1} '{2}'.", task);
-      if (context.verbose ("project"))
+      if (Context::getContext ().verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
       // Append to siblings.
       if (task.has ("parent"))
       {
-        if ((context.config.get ("recurrence.confirmation") == "prompt"
+        if ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
              && confirm ("This is a recurring task.  Do you want to append to all pending recurrences of this same task?")) ||
-            context.config.getBoolean ("recurrence.confirmation"))
+            Context::getContext ().config.getBoolean ("recurrence.confirmation"))
         {
-          std::vector <Task> siblings = context.tdb2.siblings (task);
+          std::vector <Task> siblings = Context::getContext ().tdb2.siblings (task);
           for (auto& sibling : siblings)
           {
             sibling.modify (Task::modAppend, true);
-            context.tdb2.modify (sibling);
+            Context::getContext ().tdb2.modify (sibling);
             ++count;
             feedback_affected ("Appending to recurring task {1} '{2}'.", sibling);
           }
 
           // Append to the parent
           Task parent;
-          context.tdb2.get (task.get ("parent"), parent);
+          Context::getContext ().tdb2.get (task.get ("parent"), parent);
           parent.modify (Task::modAppend, true);
-          context.tdb2.modify (parent);
+          Context::getContext ().tdb2.modify (parent);
         }
       }
     }
@@ -127,7 +125,7 @@ int CmdAppend::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Appended {1} task." : "Appended {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 4abc53a9d..b50bd221f 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -31,8 +31,6 @@
 #include <Context.h>
 #include <Command.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdZshAttributes::CmdZshAttributes ()
 {
@@ -53,7 +51,7 @@ CmdZshAttributes::CmdZshAttributes ()
 int CmdZshAttributes::execute (std::string& output)
 {
   // Get a list of all columns, sort them.
-  auto columns = context.getColumns ();
+  auto columns = Context::getContext ().getColumns ();
   std::sort (columns.begin (), columns.end ());
 
   std::stringstream out;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index eb70b22b3..6dfafa1e2 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -40,8 +40,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 // Helper macro.
 #define LOC(y,x) (((y) * (_width + 1)) + (x))
 
@@ -174,8 +172,8 @@ Chart::Chart (char type)
 {
   // How much space is there to render in?  This chart will occupy the
   // maximum space, and the width drives various other parameters.
-  _width = context.getWidth ();
-  _height = context.getHeight () - 1;  // Allow for new line with prompt.
+  _width = Context::getContext ().getWidth ();
+  _height = Context::getContext ().getHeight () - 1;  // Allow for new line with prompt.
   _max_value = 0;
   _max_label = 1;
   _graph_height = _height - 7;
@@ -193,7 +191,7 @@ Chart::Chart (char type)
   _net_fix_rate = 0.0;
 
   // Set the title.
-  std::vector <std::string> words = context.cli2.getWords ();
+  std::vector <std::string> words = Context::getContext ().cli2.getWords ();
   auto filter = join (" ", words);
   _title = '(' + filter + ')';
 }
@@ -396,7 +394,7 @@ std::string Chart::render ()
   }
 
   if (_max_value == 0)
-    context.footnote ("No matches.");
+    Context::getContext ().footnote ("No matches.");
 
   // Create a grid, folded into a string.
   _grid = "";
@@ -520,12 +518,12 @@ std::string Chart::render ()
 
   optimizeGrid ();
 
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
     // Colorize the grid.
-    Color color_pending (context.config.get ("color.burndown.pending"));
-    Color color_done    (context.config.get ("color.burndown.done"));
-    Color color_started (context.config.get ("color.burndown.started"));
+    Color color_pending (Context::getContext ().config.get ("color.burndown.pending"));
+    Color color_done    (Context::getContext ().config.get ("color.burndown.done"));
+    Color color_started (Context::getContext ().config.get ("color.burndown.started"));
 
     // Replace DD, SS, PP with colored strings.
     std::string::size_type i;
@@ -799,7 +797,7 @@ void Chart::calculateRates ()
                << ", with currently "
                << _current_count
                << " pending tasks";
-  context.debug (peak_message.str ());
+  Context::getContext ().debug (peak_message.str ());
 
   // If there are no current pending tasks, then it is meaningless to find
   // rates or estimated completion date.
@@ -824,16 +822,16 @@ void Chart::calculateRates ()
                  << " = "
                  << _net_fix_rate
                  << " tasks/d";
-    context.debug (rate_message.str ());
+    Context::getContext ().debug (rate_message.str ());
 
     Duration delta (static_cast <time_t> (_current_count / fix_rate));
     Datetime end = now + delta.toTime_t ();
 
     // Prefer dateformat.report over dateformat.
-    std::string format = context.config.get ("dateformat.report");
+    std::string format = Context::getContext ().config.get ("dateformat.report");
     if (format == "")
     {
-      format = context.config.get ("dateformat");
+      format = Context::getContext ().config.get ("dateformat");
       if (format == "")
         format = "Y-M-D";
     }
@@ -852,7 +850,7 @@ void Chart::calculateRates ()
                        << delta.format ()
                        << " --> "
                        << end.toISO ();
-    context.debug (completion_message.str ());
+    Context::getContext ().debug (completion_message.str ());
   }
   else
   {
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 59d8b7288..52f7b5b4c 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -29,8 +29,6 @@
 #include <Filter.h>
 #include <Eval.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdCalc::CmdCalc ()
 {
@@ -52,17 +50,17 @@ int CmdCalc::execute (std::string& output)
 {
   // Configurable infix/postfix
   bool infix {true};
-  if (context.config.get ("expressions") == "postfix")
+  if (Context::getContext ().config.get ("expressions") == "postfix")
     infix = false;
 
   // Create an evaluator with DOM access.
   Eval e;
   e.addSource (domSource);
-  e.debug (context.config.getBoolean ("debug"));
+  e.debug (Context::getContext ().config.getBoolean ("debug"));
 
   // Compile all the args into one expression.
   std::string expression;
-  for (const auto& word : context.cli2.getWords ())
+  for (const auto& word : Context::getContext ().cli2.getWords ())
     expression += word + ' ';
 
   // Evaluate according to preference.
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 2898e510f..284842754 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -38,8 +38,6 @@
 #include <utf8.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdCalendar::CmdCalendar ()
 {
@@ -63,8 +61,8 @@ int CmdCalendar::execute (std::string& output)
 
   // Each month requires 28 text columns width.  See how many will actually
   // fit.  But if a preference is specified, and it fits, use it.
-  auto width = context.getWidth ();
-  auto preferredMonthsPerLine = context.config.getInteger ("monthsperline");
+  auto width = Context::getContext ().getWidth ();
+  auto preferredMonthsPerLine = Context::getContext ().config.getInteger ("monthsperline");
   auto monthsThatFit = width / 26;
 
   auto monthsPerLine = monthsThatFit;
@@ -73,7 +71,7 @@ int CmdCalendar::execute (std::string& output)
 
   // Load the pending tasks.
   handleRecurrence ();
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
 
   Datetime today;
   auto getPendingDate = false;
@@ -107,14 +105,14 @@ int CmdCalendar::execute (std::string& output)
   auto argYear = 0;
   auto argWholeYear = false;
 
-  for (auto& arg : context.cli2.getWords ())
+  for (auto& arg : Context::getContext ().cli2.getWords ())
   {
     // Some version of "calendar".
-    if (autoComplete (Lexer::lowerCase (arg), commandNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
+    if (autoComplete (Lexer::lowerCase (arg), commandNames, matches, Context::getContext ().config.getInteger ("abbreviation.minimum")) == 1)
       continue;
 
     // "due".
-    else if (autoComplete (Lexer::lowerCase (arg), keywordNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
+    else if (autoComplete (Lexer::lowerCase (arg), keywordNames, matches, Context::getContext ().config.getInteger ("abbreviation.minimum")) == 1)
       getPendingDate = true;
 
     // "y".
@@ -134,7 +132,7 @@ int CmdCalendar::execute (std::string& output)
     }
 
     // "January" etc.
-    else if (autoComplete (Lexer::lowerCase (arg), monthNames, matches, context.config.getInteger ("abbreviation.minimum")) == 1)
+    else if (autoComplete (Lexer::lowerCase (arg), monthNames, matches, Context::getContext ().config.getInteger ("abbreviation.minimum")) == 1)
     {
       argMonth = Datetime::monthOfYear (matches[0]);
       if (argMonth == -1)
@@ -191,10 +189,10 @@ int CmdCalendar::execute (std::string& output)
     yFrom = oldest.year();
   }
 
-  if (context.config.getBoolean ("calendar.offset"))
+  if (Context::getContext ().config.getBoolean ("calendar.offset"))
   {
-    auto moffset = context.config.getInteger ("calendar.offset.value") % 12;
-    auto yoffset = context.config.getInteger ("calendar.offset.value") / 12;
+    auto moffset = Context::getContext ().config.getInteger ("calendar.offset.value") % 12;
+    auto yoffset = Context::getContext ().config.getInteger ("calendar.offset.value") / 12;
     mFrom += moffset;
     yFrom += yoffset;
     if (mFrom < 1)
@@ -278,15 +276,15 @@ int CmdCalendar::execute (std::string& output)
     }
   }
 
-  Color color_today      (context.config.get ("color.calendar.today"));
-  Color color_due        (context.config.get ("color.calendar.due"));
-  Color color_duetoday   (context.config.get ("color.calendar.due.today"));
-  Color color_overdue    (context.config.get ("color.calendar.overdue"));
-  Color color_weekend    (context.config.get ("color.calendar.weekend"));
-  Color color_holiday    (context.config.get ("color.calendar.holiday"));
-  Color color_weeknumber (context.config.get ("color.calendar.weeknumber"));
+  Color color_today      (Context::getContext ().config.get ("color.calendar.today"));
+  Color color_due        (Context::getContext ().config.get ("color.calendar.due"));
+  Color color_duetoday   (Context::getContext ().config.get ("color.calendar.due.today"));
+  Color color_overdue    (Context::getContext ().config.get ("color.calendar.overdue"));
+  Color color_weekend    (Context::getContext ().config.get ("color.calendar.weekend"));
+  Color color_holiday    (Context::getContext ().config.get ("color.calendar.holiday"));
+  Color color_weeknumber (Context::getContext ().config.get ("color.calendar.weeknumber"));
 
-  if (context.color () && context.config.getBoolean ("calendar.legend"))
+  if (Context::getContext ().color () && Context::getContext ().config.getBoolean ("calendar.legend"))
     out << "Legend: "
         << color_today.colorize ("today")
         << ", "
@@ -305,7 +303,7 @@ int CmdCalendar::execute (std::string& output)
         << optionalBlankLine ()
         << '\n';
 
-  if (context.config.get ("calendar.details") == "full" || context.config.get ("calendar.holidays") == "full")
+  if (Context::getContext ().config.get ("calendar.details") == "full" || Context::getContext ().config.get ("calendar.holidays") == "full")
   {
     --details_mFrom;
     if (details_mFrom == 0)
@@ -323,30 +321,30 @@ int CmdCalendar::execute (std::string& output)
     }
 
     Datetime date_after (details_yFrom, details_mFrom, details_dFrom);
-    auto after = date_after.toString (context.config.get ("dateformat"));
+    auto after = date_after.toString (Context::getContext ().config.get ("dateformat"));
 
     Datetime date_before (yTo, mTo, 1);
-    auto before = date_before.toString (context.config.get ("dateformat"));
+    auto before = date_before.toString (Context::getContext ().config.get ("dateformat"));
 
     // Table with due date information
-    if (context.config.get ("calendar.details") == "full")
+    if (Context::getContext ().config.get ("calendar.details") == "full")
     {
       // Assert that 'report' is a valid report.
-      auto report = context.config.get ("calendar.details.report");
-      if (context.commands.find (report) == context.commands.end ())
+      auto report = Context::getContext ().config.get ("calendar.details.report");
+      if (Context::getContext ().commands.find (report) == Context::getContext ().commands.end ())
         throw std::string ("The setting 'calendar.details.report' must contain a single report name.");
 
       // TODO Fix this:  cal      --> task
       //                 calendar --> taskendar
 
       // If the executable was "cal" or equivalent, replace it with "task".
-      auto executable = context.cli2._original_args[0].attribute ("raw");
+      auto executable = Context::getContext ().cli2._original_args[0].attribute ("raw");
       auto cal = executable.find ("cal");
       if (cal != std::string::npos)
         executable = executable.substr (0, cal) + PACKAGE;
 
       std::vector <std::string> args;
-      args.push_back ("rc:" + context.rc_file._data);
+      args.push_back ("rc:" + Context::getContext ().rc_file._data);
       args.push_back ("rc.due:0");
       args.push_back ("rc.verbose:label,affected,blank");
       args.push_back ("due.after:" + after);
@@ -360,34 +358,34 @@ int CmdCalendar::execute (std::string& output)
     }
 
     // Table with holiday information
-    if (context.config.get ("calendar.holidays") == "full")
+    if (Context::getContext ().config.get ("calendar.holidays") == "full")
     {
       Table holTable;
-      holTable.width (context.getWidth ());
+      holTable.width (Context::getContext ().getWidth ());
       holTable.add ("Date");
       holTable.add ("Holiday");
       setHeaderUnderline (holTable);
 
       std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
-      for (auto& it : context.config)
+      for (auto& it : Context::getContext ().config)
         if (it.first.substr (0, 8) == "holiday.")
           if (it.first.substr (it.first.size () - 4) == "name")
           {
-            auto holName = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".name");
-            auto holDate = context.config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".date");
-            Datetime hDate (holDate.c_str (), context.config.get ("dateformat.holiday"));
+            auto holName = Context::getContext ().config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".name");
+            auto holDate = Context::getContext ().config.get ("holiday." + it.first.substr (8, it.first.size () - 13) + ".date");
+            Datetime hDate (holDate.c_str (), Context::getContext ().config.get ("dateformat.holiday"));
 
             if (date_after < hDate && hDate < date_before)
               hm[hDate.toEpoch()].push_back (holName);
           }
 
-      auto format = context.config.get ("report." +
-                                        context.config.get ("calendar.details.report") +
+      auto format = Context::getContext ().config.get ("report." +
+                                        Context::getContext ().config.get ("calendar.details.report") +
                                         ".dateformat");
       if (format == "")
-        format = context.config.get ("dateformat.report");
+        format = Context::getContext ().config.get ("dateformat.report");
       if (format == "")
-        format = context.config.get ("dateformat");
+        format = Context::getContext ().config.get ("dateformat");
 
       for (auto& hm_it : hm)
       {
@@ -421,14 +419,14 @@ std::string CmdCalendar::renderMonths (
   int monthsPerLine)
 {
   // What day of the week does the user consider the first?
-  auto weekStart = Datetime::dayOfWeek (context.config.get ("weekstart"));
+  auto weekStart = Datetime::dayOfWeek (Context::getContext ().config.get ("weekstart"));
   if (weekStart != 0 && weekStart != 1)
     throw std::string ("The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'.");
 
   // Build table for the number of months to be displayed.
   Table view;
   setHeaderUnderline (view);
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
   {
     if (weekStart == 1)
@@ -486,13 +484,13 @@ std::string CmdCalendar::renderMonths (
 
   auto row = 0;
 
-  Color color_today      (context.config.get ("color.calendar.today"));
-  Color color_due        (context.config.get ("color.calendar.due"));
-  Color color_duetoday   (context.config.get ("color.calendar.due.today"));
-  Color color_overdue    (context.config.get ("color.calendar.overdue"));
-  Color color_weekend    (context.config.get ("color.calendar.weekend"));
-  Color color_holiday    (context.config.get ("color.calendar.holiday"));
-  Color color_weeknumber (context.config.get ("color.calendar.weeknumber"));
+  Color color_today      (Context::getContext ().config.get ("color.calendar.today"));
+  Color color_due        (Context::getContext ().config.get ("color.calendar.due"));
+  Color color_duetoday   (Context::getContext ().config.get ("color.calendar.due.today"));
+  Color color_overdue    (Context::getContext ().config.get ("color.calendar.overdue"));
+  Color color_weekend    (Context::getContext ().config.get ("color.calendar.weekend"));
+  Color color_holiday    (Context::getContext ().config.get ("color.calendar.holiday"));
+  Color color_weeknumber (Context::getContext ().config.get ("color.calendar.weeknumber"));
 
   // Loop through months to be added on this line.
   for (int mpl = 0; mpl < monthsPerLine ; mpl++)
@@ -508,7 +506,7 @@ std::string CmdCalendar::renderMonths (
       auto dow = temp.dayOfWeek ();
       auto woy = temp.week ();
 
-      if (context.config.getBoolean ("displayweeknumber"))
+      if (Context::getContext ().config.getBoolean ("displayweeknumber"))
         view.set (row,
                   (8 * mpl),
                   // Make sure the week number is always 4 columns, space-padded.
@@ -525,7 +523,7 @@ std::string CmdCalendar::renderMonths (
 
       view.set (row, thisCol, d);
 
-      if (context.color ())
+      if (Context::getContext ().color ())
       {
         Color cellColor;
 
@@ -534,14 +532,14 @@ std::string CmdCalendar::renderMonths (
           cellColor.blend (color_weekend);
 
         // colorize holidays
-        if (context.config.get ("calendar.holidays") != "none")
+        if (Context::getContext ().config.get ("calendar.holidays") != "none")
         {
-          for (auto& hol : context.config)
+          for (auto& hol : Context::getContext ().config)
             if (hol.first.substr (0, 8) == "holiday.")
               if (hol.first.substr (hol.first.size () - 4) == "date")
               {
                 std::string value = hol.second;
-                Datetime holDate (value.c_str (), context.config.get ("dateformat.holiday"));
+                Datetime holDate (value.c_str (), Context::getContext ().config.get ("dateformat.holiday"));
                 if (holDate.day   () == d           &&
                     holDate.month () == months[mpl] &&
                     holDate.year  () == years[mpl])
@@ -556,9 +554,9 @@ std::string CmdCalendar::renderMonths (
           cellColor.blend (color_today);
 
         // colorize due tasks
-        if (context.config.get ("calendar.details") != "none")
+        if (Context::getContext ().config.get ("calendar.details") != "none")
         {
-          context.config.set ("due", 0);
+          Context::getContext ().config.set ("due", 0);
           for (auto& task : all)
           {
             if (task.getStatus () == Task::pending &&
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 23c9cd4e8..2bc4ea388 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -34,8 +34,6 @@
 #include <format.h>
 #include <shared.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdColor::CmdColor ()
 {
@@ -59,13 +57,13 @@ int CmdColor::execute (std::string& output)
 
   // Get the non-attribute, non-fancy command line arguments.
   auto legend = false;
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   for (auto& word : words)
     if (closeEnough ("legend", word))
       legend = true;
 
   std::stringstream out;
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
     // If the description contains 'legend', show all the colors currently in
     // use.
@@ -74,13 +72,13 @@ int CmdColor::execute (std::string& output)
       out << "\nHere are the colors currently in use:\n";
 
       Table view;
-      view.width (context.getWidth ());
-      if (context.config.getBoolean ("color"))
+      view.width (Context::getContext ().getWidth ());
+      if (Context::getContext ().config.getBoolean ("color"))
         view.forceColor ();
       view.add ("Color");
       view.add ("Definition");
 
-      for (auto& item : context.config)
+      for (auto& item : Context::getContext ().config)
       {
         // Skip items with 'color' in their name, that are not referring to
         // actual colors.
@@ -88,7 +86,7 @@ int CmdColor::execute (std::string& output)
             item.first != "color"       &&
             item.first.find ("color") == 0)
         {
-          Color color (context.config.get (item.first));
+          Color color (Context::getContext ().config.get (item.first));
           int row = view.addRow ();
           view.set (row, 0, item.first, color);
           view.set (row, 1, item.second, color);
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 1d7b0c076..941096505 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -34,8 +34,6 @@
 #include <util.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdColumns::CmdColumns ()
 {
@@ -57,20 +55,20 @@ int CmdColumns::execute (std::string& output)
 {
   // Obtain the arguments from the description.  That way, things like '--'
   // have already been handled.
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   if (words.size () > 1)
     throw std::string ("You can only specify one search string.");
 
   // Include all columns in the table.
   std::vector <std::string> names;
-  for (const auto& col : context.columns)
+  for (const auto& col : Context::getContext ().columns)
     names.push_back (col.first);
 
   std::sort (names.begin (), names.end ());
 
   // Render a list of column names, formats and examples.
   Table formats;
-  formats.width (context.getWidth ());
+  formats.width (Context::getContext ().getWidth ());
   formats.add ("Columns");
   formats.add ("Type");
   formats.add ("Modifiable");
@@ -83,15 +81,15 @@ int CmdColumns::execute (std::string& output)
     if (words.size () == 0 ||
         find (name, words[0], false) != std::string::npos)
     {
-      auto styles   = context.columns[name]->styles ();
-      auto examples = context.columns[name]->examples ();
+      auto styles   = Context::getContext ().columns[name]->styles ();
+      auto examples = Context::getContext ().columns[name]->examples ();
 
       for (unsigned int i = 0; i < styles.size (); ++i)
       {
         auto row = formats.addRow ();
         formats.set (row, 0, i == 0 ? name : "");
-        formats.set (row, 1, i == 0 ? context.columns[name]->type () : "");
-        formats.set (row, 2, i == 0 ? (context.columns[name]->modifiable () ? "Modifiable" : "Read Only") : "");
+        formats.set (row, 1, i == 0 ? Context::getContext ().columns[name]->type () : "");
+        formats.set (row, 2, i == 0 ? (Context::getContext ().columns[name]->modifiable () ? "Modifiable" : "Read Only") : "");
         formats.set (row, 3, styles[i] + (i == 0 ? "*" : ""));
         formats.set (row, 4, i < examples.size () ? examples[i] : "");
       }
@@ -137,7 +135,7 @@ int CmdCompletionColumns::execute (std::string& output)
 {
   // Include all columns.
   std::vector <std::string> names;
-  for (const auto& col : context.columns)
+  for (const auto& col : Context::getContext ().columns)
     names.push_back (col.first);
 
   std::sort (names.begin (), names.end ());
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 87b0de63b..fa623cb11 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -34,8 +34,6 @@
 #include <Command.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdCommands::CmdCommands ()
 {
@@ -56,7 +54,7 @@ CmdCommands::CmdCommands ()
 int CmdCommands::execute (std::string& output)
 {
   Table view;
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   view.add ("Command");
   view.add ("Category");
   view.add ("R/W",     false);
@@ -67,12 +65,12 @@ int CmdCommands::execute (std::string& output)
   view.add ("Mods",    false);
   view.add ("Misc",    false);
   view.add ("Description");
-  view.leftMargin (context.config.getInteger ("indent.report"));
-  view.extraPadding (context.config.getInteger ("row.padding"));
-  view.intraPadding (context.config.getInteger ("column.padding"));
+  view.leftMargin (Context::getContext ().config.getInteger ("indent.report"));
+  view.extraPadding (Context::getContext ().config.getInteger ("row.padding"));
+  view.intraPadding (Context::getContext ().config.getInteger ("column.padding"));
   setHeaderUnderline (view);
 
-  for (auto& command : context.commands)
+  for (auto& command : Context::getContext ().commands)
   {
     auto row = view.addRow ();
     view.set (row, 0, command.first);
@@ -133,7 +131,7 @@ int CmdCompletionCommands::execute (std::string& output)
 {
   // Get a list of all commands.
   std::vector <std::string> commands;
-  for (const auto& command : context.commands)
+  for (const auto& command : Context::getContext ().commands)
     commands.push_back (command.first);
 
   // Sort alphabetically.
@@ -199,7 +197,7 @@ int CmdZshCommands::execute (std::string& output)
   // denominator alternative: a custom struct type.
 
   std::vector <ZshCommand> commands;
-  for (auto& command : context.commands)
+  for (auto& command : Context::getContext ().commands)
   {
     ZshCommand zshCommand {command.second->category (),
                            command.first,
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 2e6dd61d3..bb6edf444 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -33,8 +33,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdConfig::CmdConfig ()
 {
@@ -59,7 +57,7 @@ bool CmdConfig::setConfigVariable (
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
-  File::read (context.config.file (), contents);
+  File::read (Context::getContext ().config.file (), contents);
 
   auto found = false;
   auto change = false;
@@ -76,7 +74,7 @@ bool CmdConfig::setConfigVariable (
     {
       found = true;
       if (!confirmation ||
-          confirm (format ("Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?", name, context.config.get (name), value)))
+          confirm (format ("Are you sure you want to change the value of '{1}' from '{2}' to '{3}'?", name, Context::getContext ().config.get (name), value)))
       {
         line = name + '=' + json::encode (value);
 
@@ -98,7 +96,7 @@ bool CmdConfig::setConfigVariable (
   }
 
   if (change)
-    File::write (context.config.file (), contents);
+    File::write (Context::getContext ().config.file (), contents);
 
   return change;
 }
@@ -108,7 +106,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
 {
   // Read .taskrc (or equivalent)
   std::vector <std::string> contents;
-  File::read (context.config.file (), contents);
+  File::read (Context::getContext ().config.file (), contents);
 
   auto found = false;
   auto change = false;
@@ -143,7 +141,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
   }
 
   if (change)
-    File::write (context.config.file (), contents);
+    File::write (Context::getContext ().config.file (), contents);
 
   if (change && found)
     return 0;
@@ -160,7 +158,7 @@ int CmdConfig::execute (std::string& output)
   std::stringstream out;
 
   // Get the non-attribute, non-fancy command line arguments.
-  std::vector <std::string> words = context.cli2.getWords ();
+  std::vector <std::string> words = Context::getContext ().cli2.getWords ();
 
   // Support:
   //   task config name value    # set name to value
@@ -168,7 +166,7 @@ int CmdConfig::execute (std::string& output)
   //   task config name          # remove name
   if (words.size ())
   {
-    auto confirmation = context.config.getBoolean ("confirmation");
+    auto confirmation = Context::getContext ().config.getBoolean ("confirmation");
     auto found = false;
 
     auto name = words[0];
@@ -214,7 +212,7 @@ int CmdConfig::execute (std::string& output)
       // Show feedback depending on whether .taskrc has been rewritten
       if (change)
       {
-        out << format ("Config file {1} modified.", context.config.file ())
+        out << format ("Config file {1} modified.", Context::getContext ().config.file ())
             << '\n';
       }
       else
@@ -250,7 +248,7 @@ CmdCompletionConfig::CmdCompletionConfig ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionConfig::execute (std::string& output)
 {
-  auto configs = context.config.all ();
+  auto configs = Context::getContext ().config.all ();
   std::sort (configs.begin (), configs.end ());
 
   for (const auto& config : configs)
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 644e3bb2e..d1657327b 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -36,8 +36,6 @@
 #include <shared.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdContext::CmdContext ()
 {
@@ -60,7 +58,7 @@ int CmdContext::execute (std::string& output)
   std::stringstream out;
 
   // Get the non-attribute, non-fancy command line arguments.
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   if (words.size () > 0)
   {
     auto subcommand = words[0];
@@ -110,7 +108,7 @@ std::vector <std::string> CmdContext::getContexts ()
 {
   std::vector <std::string> contexts;
 
-  for (auto& name : context.config)
+  for (auto& name : Context::getContext ().config)
     if (name.first.substr (0, 8) == "context.")
       contexts.push_back (name.first.substr (8));
 
@@ -129,7 +127,7 @@ std::vector <std::string> CmdContext::getContexts ()
 //
 void CmdContext::defineContext (const std::vector <std::string>& words, std::stringstream& out)
 {
-  auto confirmation = context.config.getBoolean ("confirmation");
+  auto confirmation = Context::getContext ().config.getBoolean ("confirmation");
 
   if (words.size () > 2)
   {
@@ -145,12 +143,12 @@ void CmdContext::defineContext (const std::vector <std::string>& words, std::str
     // Check if the value is a proper filter by filtering current pending.data
     Filter filter;
     std::vector <Task> filtered;
-    auto pending = context.tdb2.pending.get_tasks ();
+    auto pending = Context::getContext ().tdb2.pending.get_tasks ();
 
     try
     {
       // This result is not used, and is just to check validity.
-      context.cli2.addFilter (value);
+      Context::getContext ().cli2.addFilter (value);
       filter.subset (pending, filtered);
     }
     catch (std::string exception)
@@ -193,11 +191,11 @@ void CmdContext::deleteContext (const std::vector <std::string>& words, std::str
     // Delete the specified context
     auto name = "context." + words[1];
 
-    auto confirmation = context.config.getBoolean ("confirmation");
+    auto confirmation = Context::getContext ().config.getBoolean ("confirmation");
     auto rc = CmdConfig::unsetConfigVariable(name, confirmation);
 
     // If the currently set context was deleted, unset it
-    if (context.config.get ("context") == words[1])
+    if (Context::getContext ().config.get ("context") == words[1])
       CmdConfig::unsetConfigVariable("context", false);
 
     // Output feedback
@@ -226,13 +224,13 @@ void CmdContext::listContexts (std::stringstream& out)
     std::sort (contexts.begin (), contexts.end ());
 
     Table table;
-    table.width (context.getWidth ());
+    table.width (Context::getContext ().getWidth ());
     table.add ("Name");
     table.add ("Definition");
     table.add ("Active");
     setHeaderUnderline (table);
 
-    std::string activeContext = context.config.get ("context");
+    std::string activeContext = Context::getContext ().config.get ("context");
 
     for (auto& userContext : contexts)
     {
@@ -242,7 +240,7 @@ void CmdContext::listContexts (std::stringstream& out)
 
       int row = table.addRow ();
       table.set (row, 0, userContext);
-      table.set (row, 1, context.config.get ("context." + userContext));
+      table.set (row, 1, Context::getContext ().config.get ("context." + userContext));
       table.set (row, 2, active);
     }
 
@@ -294,13 +292,13 @@ void CmdContext::setContext (const std::vector <std::string>& words, std::string
 //
 void CmdContext::showContext (std::stringstream& out)
 {
-  auto currentContext = context.config.get ("context");
+  auto currentContext = Context::getContext ().config.get ("context");
 
   if (currentContext == "")
     out << "No context is currently applied.\n";
   else
   {
-    std::string currentFilter = context.config.get ("context." + currentContext);
+    std::string currentFilter = Context::getContext ().config.get ("context." + currentContext);
     out << format ("Context '{1}' with filter '{2}' is currently applied.\n", currentContext, currentFilter);
   }
 }
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 90f4abbe9..4402574ad 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -40,8 +40,6 @@
 #include <util.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdCustom::CmdCustom (
   const std::string& keyword,
@@ -67,10 +65,10 @@ int CmdCustom::execute (std::string& output)
   auto rc = 0;
 
   // Load report configuration.
-  auto reportColumns = context.config.get ("report." + _keyword + ".columns");
-  auto reportLabels  = context.config.get ("report." + _keyword + ".labels");
-  auto reportSort    = context.config.get ("report." + _keyword + ".sort");
-  auto reportFilter  = context.config.get ("report." + _keyword + ".filter");
+  auto reportColumns = Context::getContext ().config.get ("report." + _keyword + ".columns");
+  auto reportLabels  = Context::getContext ().config.get ("report." + _keyword + ".labels");
+  auto reportSort    = Context::getContext ().config.get ("report." + _keyword + ".sort");
+  auto reportFilter  = Context::getContext ().config.get ("report." + _keyword + ".filter");
 
   auto columns = split (reportColumns, ',');
   validateReportColumns (columns);
@@ -87,7 +85,7 @@ int CmdCustom::execute (std::string& output)
 
   // Add the report filter to any existing filter.
   if (reportFilter != "")
-    context.cli2.addFilter (reportFilter);
+    Context::getContext ().cli2.addFilter (reportFilter);
 
   // Apply filter.
   handleRecurrence ();
@@ -100,10 +98,10 @@ int CmdCustom::execute (std::string& output)
       sortOrder[0] == "none")
   {
     // Assemble a sequence vector that represents the tasks listed in
-    // context.cli2._uuid_ranges, in the order in which they appear. This
+    // Context::getContext ().cli2._uuid_ranges, in the order in which they appear. This
     // equates to no sorting, just a specified order.
     sortOrder.clear ();
-    for (auto& i : context.cli2._uuid_list)
+    for (auto& i : Context::getContext ().cli2._uuid_list)
       for (unsigned int t = 0; t < filtered.size (); ++t)
         if (filtered[t].get ("uuid") == i)
           sequence.push_back (t);
@@ -122,21 +120,21 @@ int CmdCustom::execute (std::string& output)
 
   // Configure the view.
   ViewTask view;
-  view.width (context.getWidth ());
-  view.leftMargin (context.config.getInteger ("indent.report"));
-  view.extraPadding (context.config.getInteger ("row.padding"));
-  view.intraPadding (context.config.getInteger ("column.padding"));
+  view.width (Context::getContext ().getWidth ());
+  view.leftMargin (Context::getContext ().config.getInteger ("indent.report"));
+  view.extraPadding (Context::getContext ().config.getInteger ("row.padding"));
+  view.intraPadding (Context::getContext ().config.getInteger ("column.padding"));
 
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
-    Color label (context.config.get ("color.label"));
+    Color label (Context::getContext ().config.get ("color.label"));
     view.colorHeader (label);
 
-    Color label_sort (context.config.get ("color.label.sort"));
+    Color label_sort (Context::getContext ().config.get ("color.label.sort"));
     view.colorSortHeader (label_sort);
 
     // If an alternating row color is specified, notify the table.
-    Color alternate (context.config.get ("color.alternate"));
+    Color alternate (Context::getContext ().config.get ("color.alternate"));
     if (alternate.nontrivial ())
     {
       view.colorOdd (alternate);
@@ -153,7 +151,7 @@ int CmdCustom::execute (std::string& output)
     std::string name;
     bool ascending;
     bool breakIndicator;
-    context.decomposeSortField (so, name, ascending, breakIndicator);
+    Context::getContext ().decomposeSortField (so, name, ascending, breakIndicator);
 
     if (breakIndicator)
       view.addBreak (name);
@@ -177,9 +175,9 @@ int CmdCustom::execute (std::string& output)
 
   // How many lines taken up by table header?
   int table_header = 0;
-  if (context.verbose ("label"))
+  if (Context::getContext ().verbose ("label"))
   {
-    if (context.color () && context.config.getBoolean ("fontunderline"))
+    if (Context::getContext ().color () && Context::getContext ().config.getBoolean ("fontunderline"))
       table_header = 1;  // Underlining doesn't use extra line.
     else
       table_header = 2;  // Dashes use an extra line.
@@ -188,15 +186,15 @@ int CmdCustom::execute (std::string& output)
   // Report output can be limited by rows or lines.
   auto maxrows = 0;
   auto maxlines = 0;
-  context.getLimits (maxrows, maxlines);
+  Context::getContext ().getLimits (maxrows, maxlines);
 
   // Adjust for fluff in the output.
   if (maxlines)
     maxlines -= table_header
-              + (context.verbose ("blank") ? 1 : 0)
-              + (context.verbose ("footnote") ? context.footnotes.size () : 0)
-              + (context.verbose ("affected") ? 1 : 0)
-              + context.config.getInteger ("reserved.lines");  // For prompt, etc.
+              + (Context::getContext ().verbose ("blank") ? 1 : 0)
+              + (Context::getContext ().verbose ("footnote") ? Context::getContext ().footnotes.size () : 0)
+              + (Context::getContext ().verbose ("affected") ? 1 : 0)
+              + Context::getContext ().config.getInteger ("reserved.lines");  // For prompt, etc.
 
   // Render.
   std::stringstream out;
@@ -210,7 +208,7 @@ int CmdCustom::execute (std::string& output)
         << optionalBlankLine ();
 
     // Print the number of rendered tasks
-    if (context.verbose ("affected"))
+    if (Context::getContext ().verbose ("affected"))
     {
       out << (filtered.size () == 1
                 ?  "1 task"
@@ -228,7 +226,7 @@ int CmdCustom::execute (std::string& output)
   }
   else
   {
-    context.footnote ("No matches.");
+    Context::getContext ().footnote ("No matches.");
     rc = 1;
   }
 
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 06a547c06..abb58a703 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -36,8 +36,6 @@
 #define STRING_CMD_DELETE_TASK_R     "Deleting recurring task {1} '{2}'."
 #define STRING_CMD_DELETE_CONFIRM_R  "This is a recurring task.  Do you want to delete all pending recurrences of this same task?"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdDelete::CmdDelete ()
 {
@@ -67,7 +65,7 @@ int CmdDelete::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -95,21 +93,21 @@ int CmdDelete::execute (std::string&)
       {
         updateRecurrenceMask (task);
         ++count;
-        context.tdb2.modify (task);
+        Context::getContext ().tdb2.modify (task);
         feedback_affected ("Deleting task {1} '{2}'.", task);
         feedback_unblocked (task);
         dependencyChainOnComplete (task);
-        if (context.verbose ("project"))
+        if (Context::getContext ().verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task);
 
         // Delete siblings.
         if (task.has ("parent"))
         {
-          if ((context.config.get ("recurrence.confirmation") == "prompt"
+          if ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
                && confirm (STRING_CMD_DELETE_CONFIRM_R)) ||
-              context.config.getBoolean ("recurrence.confirmation"))
+              Context::getContext ().config.getBoolean ("recurrence.confirmation"))
           {
-            std::vector <Task> siblings = context.tdb2.siblings (task);
+            std::vector <Task> siblings = Context::getContext ().tdb2.siblings (task);
             for (auto& sibling : siblings)
             {
               sibling.modify (Task::modAnnotate);
@@ -118,7 +116,7 @@ int CmdDelete::execute (std::string&)
                 sibling.setAsNow ("end");
 
               updateRecurrenceMask (sibling);
-              context.tdb2.modify (sibling);
+              Context::getContext ().tdb2.modify (sibling);
               feedback_affected (STRING_CMD_DELETE_TASK_R, sibling);
               feedback_unblocked (sibling);
               ++count;
@@ -126,21 +124,21 @@ int CmdDelete::execute (std::string&)
 
             // Delete the parent
             Task parent;
-            context.tdb2.get (task.get ("parent"), parent);
+            Context::getContext ().tdb2.get (task.get ("parent"), parent);
             parent.setStatus (Task::deleted);
             if (! parent.has ("end"))
               parent.setAsNow ("end");
 
-            context.tdb2.modify (parent);
+            Context::getContext ().tdb2.modify (parent);
           }
         }
 
         // Task potentially has child tasks - optionally delete them.
         else
         {
-          std::vector <Task> children = context.tdb2.children (task);
+          std::vector <Task> children = Context::getContext ().tdb2.children (task);
           if (children.size () &&
-              (context.config.getBoolean ("recurrence.confirmation") ||
+              (Context::getContext ().config.getBoolean ("recurrence.confirmation") ||
                confirm (STRING_CMD_DELETE_CONFIRM_R)))
           {
             for (auto& child : children)
@@ -151,7 +149,7 @@ int CmdDelete::execute (std::string&)
                 child.setAsNow ("end");
 
               updateRecurrenceMask (child);
-              context.tdb2.modify (child);
+              Context::getContext ().tdb2.modify (child);
               feedback_affected (STRING_CMD_DELETE_TASK_R, child);
               feedback_unblocked (child);
               ++count;
@@ -180,7 +178,7 @@ int CmdDelete::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Deleted {1} task." : "Deleted {1} tasks.", count);
 
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index f2a0c3dca..5b5941a14 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -38,8 +38,6 @@
 #define STRING_CMD_DENO_1            "Denotated {1} task."
 #define STRING_CMD_DENO_N            "Denotated {1} tasks."
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdDenotate::CmdDenotate ()
 {
@@ -61,7 +59,7 @@ int CmdDenotate::execute (std::string&)
 {
   auto rc = 0;
   auto count = 0;
-  auto sensitive = context.config.getBoolean ("search.case.sensitive");
+  auto sensitive = Context::getContext ().config.getBoolean ("search.case.sensitive");
 
   // Apply filter.
   Filter filter;
@@ -69,13 +67,13 @@ int CmdDenotate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
   // Extract all the ORIGINAL MODIFICATION args as simple text patterns.
   std::string pattern = "";
-  for (auto& a : context.cli2._args)
+  for (auto& a : Context::getContext ().cli2._args)
   {
     if (a.hasTag ("MISCELLANEOUS"))
     {
@@ -136,9 +134,9 @@ int CmdDenotate::execute (std::string&)
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
         ++count;
-        context.tdb2.modify (task);
+        Context::getContext ().tdb2.modify (task);
         feedback_affected (format ("Found annotation '{1}' and deleted it.", anno));
-        if (context.verbose ("project"))
+        if (Context::getContext ().verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task, false);
       }
       else
@@ -159,7 +157,7 @@ int CmdDenotate::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? STRING_CMD_DENO_1 : STRING_CMD_DENO_N, count);
   return rc;
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 1e9ff63bc..303c129d2 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -43,8 +43,6 @@
 #include <gnutls/gnutls.h>
 #endif
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdDiagnostics::CmdDiagnostics ()
 {
@@ -69,7 +67,7 @@ CmdDiagnostics::CmdDiagnostics ()
 int CmdDiagnostics::execute (std::string& output)
 {
   Color bold;
-  if (context.color ())
+  if (Context::getContext ().color ())
     bold = Color ("bold");
 
   std::stringstream out;
@@ -160,7 +158,7 @@ int CmdDiagnostics::execute (std::string& output)
       << "\n\n";
 
   // Config: .taskrc found, readable, writable
-  File rcFile (context.config.file ());
+  File rcFile (Context::getContext ().config.file ());
   out << bold.colorize ("Configuration")
       << '\n'
       << "       File: " << rcFile._data << ' '
@@ -174,7 +172,7 @@ int CmdDiagnostics::execute (std::string& output)
       << '\n';
 
   // Config: data.location found, readable, writable
-  File location (context.config.get ("data.location"));
+  File location (Context::getContext ().config.get ("data.location"));
   out << "       Data: " << location._data << ' '
       << (location.exists ()
            ? "(found)"
@@ -198,31 +196,31 @@ int CmdDiagnostics::execute (std::string& output)
         << '\n';
 
   out << "    Locking: "
-      << (context.config.getBoolean ("locking")
+      << (Context::getContext ().config.getBoolean ("locking")
            ? "Enabled"
            : "Disabled")
       << '\n';
 
   out << "         GC: "
-      << (context.config.getBoolean ("gc")
+      << (Context::getContext ().config.getBoolean ("gc")
            ? "Enabled"
            : "Disabled")
       << '\n';
 
   // Determine rc.editor/$EDITOR/$VISUAL.
   char* peditor;
-  if (context.config.get ("editor") != "")
-    out << "  rc.editor: " << context.config.get ("editor") << '\n';
+  if (Context::getContext ().config.get ("editor") != "")
+    out << "  rc.editor: " << Context::getContext ().config.get ("editor") << '\n';
   else if ((peditor = getenv ("VISUAL")) != NULL)
     out << "    $VISUAL: " << peditor << '\n';
   else if ((peditor = getenv ("EDITOR")) != NULL)
     out << "    $EDITOR: " << peditor << '\n';
 
   out << "     Server: "
-      << context.config.get ("taskd.server")
+      << Context::getContext ().config.get ("taskd.server")
       << '\n';
 
-  auto ca_pem = context.config.get ("taskd.ca");
+  auto ca_pem = Context::getContext ().config.get ("taskd.ca");
   out << "         CA: ";
   if (ca_pem != "")
   {
@@ -238,7 +236,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  auto cert_pem = context.config.get ("taskd.certificate");
+  auto cert_pem = Context::getContext ().config.get ("taskd.certificate");
   out << "Certificate: ";
   if (cert_pem != "")
   {
@@ -254,7 +252,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  auto key_pem = context.config.get ("taskd.key");
+  auto key_pem = Context::getContext ().config.get ("taskd.key");
   out << "        Key: ";
   if (key_pem != "")
   {
@@ -270,7 +268,7 @@ int CmdDiagnostics::execute (std::string& output)
   else
     out << "-\n";
 
-  auto trust_value = context.config.get ("taskd.trust");
+  auto trust_value = Context::getContext ().config.get ("taskd.trust");
   if (trust_value == "strict" ||
       trust_value == "ignore hostname" ||
       trust_value == "allow all")
@@ -279,11 +277,11 @@ int CmdDiagnostics::execute (std::string& output)
     out << "      Trust: Bad value - see 'man taskrc'\n";
 
   out << "    Ciphers: "
-      << context.config.get ("taskd.ciphers")
+      << Context::getContext ().config.get ("taskd.ciphers")
       << '\n';
 
   // Get credentials, but mask out the key.
-  auto credentials = context.config.get ("taskd.credentials");
+  auto credentials = Context::getContext ().config.get ("taskd.credentials");
   auto last_slash = credentials.rfind ('/');
   if (last_slash != std::string::npos)
     credentials = credentials.substr (0, last_slash)
@@ -296,26 +294,26 @@ int CmdDiagnostics::execute (std::string& output)
 
   // Display hook status.
   Path hookLocation;
-  if (context.config.has ("hooks.location"))
+  if (Context::getContext ().config.has ("hooks.location"))
   {
-    hookLocation = Path (context.config.get ("hooks.location"));
+    hookLocation = Path (Context::getContext ().config.get ("hooks.location"));
   }
   else
   {
-    hookLocation = Path (context.config.get ("data.location"));
+    hookLocation = Path (Context::getContext ().config.get ("data.location"));
     hookLocation += "hooks";
   }
 
   out << bold.colorize ("Hooks")
       << '\n'
       << "     System: "
-      << (context.config.getBoolean ("hooks") ? "Enabled" : "Disabled")
+      << (Context::getContext ().config.getBoolean ("hooks") ? "Enabled" : "Disabled")
       << '\n'
       << "   Location: "
       << static_cast <std::string> (hookLocation)
       << '\n';
 
-  auto hooks = context.hooks.list ();
+  auto hooks = Context::getContext ().hooks.list ();
   if (hooks.size ())
   {
     unsigned int longest = 0;
@@ -397,13 +395,13 @@ int CmdDiagnostics::execute (std::string& output)
 
   // Report terminal dimensions.
   out << "   Terminal: "
-      << context.getWidth ()
+      << Context::getContext ().getWidth ()
       << 'x'
-      << context.getHeight ()
+      << Context::getContext ().getHeight ()
       << '\n';
 
   // Scan tasks for duplicate UUIDs.
-  auto all = context.tdb2.all_tasks ();
+  auto all = Context::getContext ().tdb2.all_tasks ();
   std::map <std::string, int> seen;
   std::vector <std::string> dups;
   std::string uuid;
@@ -442,7 +440,7 @@ int CmdDiagnostics::execute (std::string& output)
     // Check dependencies
     for (auto& uuid : task.getDependencyUUIDs ())
     {
-      if (! context.tdb2.has (uuid))
+      if (! Context::getContext ().tdb2.has (uuid))
       {
         out << "             "
             << format ("Task {1} depends on nonexistent task: {2}", task.get ("uuid"), uuid)
@@ -454,7 +452,7 @@ int CmdDiagnostics::execute (std::string& output)
     // Check recurrence parent
     auto parentUUID = task.get ("parent");
 
-    if (parentUUID != "" && ! context.tdb2.has (parentUUID))
+    if (parentUUID != "" && ! Context::getContext ().tdb2.has (parentUUID))
     {
       out << "             "
           << format ("Task {1} has nonexistent recurrence template {2}", task.get ("uuid"), parentUUID)
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index d336fd89e..0c7a898a3 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -33,8 +33,6 @@
 #include <format.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdDone::CmdDone ()
 {
@@ -63,7 +61,7 @@ int CmdDone::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -92,21 +90,21 @@ int CmdDone::execute (std::string&)
       if (task.has ("start"))
       {
         task.remove ("start");
-        if (context.config.getBoolean ("journal.time"))
-          task.addAnnotation (context.config.get ("journal.time.stop.annotation"));
+        if (Context::getContext ().config.getBoolean ("journal.time"))
+          task.addAnnotation (Context::getContext ().config.get ("journal.time.stop.annotation"));
       }
 
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
         updateRecurrenceMask (task);
-        context.tdb2.modify (task);
+        Context::getContext ().tdb2.modify (task);
         ++count;
         feedback_affected ("Completed task {1} '{2}'.", task);
         feedback_unblocked (task);
         if (!nagged)
           nagged = nag (task);
         dependencyChainOnComplete (task);
-        if (context.verbose ("project"))
+        if (Context::getContext ().verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task);
       }
       else
@@ -130,7 +128,7 @@ int CmdDone::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Completed {1} task." : "Completed {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 80ab5db47..a13bd38ed 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -33,8 +33,6 @@
 #include <util.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdDuplicate::CmdDuplicate ()
 {
@@ -63,7 +61,7 @@ int CmdDuplicate::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -109,21 +107,21 @@ int CmdDuplicate::execute (std::string&)
                             task.get ("description")),
                     filtered.size ()))
     {
-      context.tdb2.add (dup);
+      Context::getContext ().tdb2.add (dup);
       ++count;
       feedback_affected ("Duplicated task {1} '{2}'.", task);
 
       auto status = dup.getStatus ();
-      if (context.verbose ("new-id") &&
+      if (Context::getContext ().verbose ("new-id") &&
           (status == Task::pending ||
            status == Task::waiting))
         std::cout << format ("Created task {1}.\n", dup.id);
 
-      else if (context.verbose ("new-uuid") &&
+      else if (Context::getContext ().verbose ("new-uuid") &&
                status != Task::recurring)
         std::cout << format ("Created task {1}.\n", dup.get ("uuid"));
 
-      if (context.verbose ("project"))
+      if (Context::getContext ().verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task);
     }
     else
@@ -138,7 +136,7 @@ int CmdDuplicate::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Duplicated {1} task." : "Duplicated {1} tasks.", count);
 
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 69bf3034d..536d11302 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -51,8 +51,6 @@
 #define STRING_EDIT_UNTIL_MOD        "Until date modified."
 #define STRING_EDIT_WAIT_MOD         "Wait date modified."
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdEdit::CmdEdit ()
 {
@@ -83,7 +81,7 @@ int CmdEdit::execute (std::string&)
 
   if (! filtered.size ())
   {
-    context.footnote ("No matches.");
+    Context::getContext ().footnote ("No matches.");
     return 1;
   }
 
@@ -94,7 +92,7 @@ int CmdEdit::execute (std::string&)
     if (result == CmdEdit::editResult::error)
       break;
     else if (result == CmdEdit::editResult::changes)
-      context.tdb2.modify (task);
+      Context::getContext ().tdb2.modify (task);
   }
 
   return 0;
@@ -200,7 +198,7 @@ std::string CmdEdit::formatDuration (
 std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 {
   std::stringstream before;
-  auto verbose = context.verbose ("edit");
+  auto verbose = Context::getContext ().verbose ("edit");
 
   if (verbose)
     before << "# The 'task <id> edit' command allows you to modify all aspects of a task\n"
@@ -268,7 +266,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
       allDeps << ",";
 
     Task t;
-    context.tdb2.get (dependencies[i], t);
+    Context::getContext ().tdb2.get (dependencies[i], t);
     if (t.getStatus () == Task::pending ||
         t.getStatus () == Task::waiting)
       allDeps << t.id;
@@ -283,8 +281,8 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   // UDAs
   std::vector <std::string> udas;
-  for (auto& col : context.columns)
-    if (context.config.get ("uda." + col.first + ".type") != "")
+  for (auto& col : Context::getContext ().columns)
+    if (Context::getContext ().config.get ("uda." + col.first + ".type") != "")
       udas.push_back (col.first);
 
   if (udas.size ())
@@ -298,7 +296,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
       if (pad > 0)
         padding = std::string (pad, ' ');
 
-      std::string type = context.config.get ("uda." + uda + ".type");
+      std::string type = Context::getContext ().config.get ("uda." + uda + ".type");
       if (type == "string" || type == "numeric")
         before << "  UDA " << uda << ": " << padding << task.get (uda) << '\n';
       else if (type == "date")
@@ -338,12 +336,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote ("Project modified.");
+      Context::getContext ().footnote ("Project modified.");
       task.set ("project", value);
     }
     else
     {
-      context.footnote ("Project deleted.");
+      Context::getContext ().footnote ("Project deleted.");
       task.remove ("project");
     }
   }
@@ -359,7 +357,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote ("Description modified.");
+      Context::getContext ().footnote ("Description modified.");
       task.set ("description", value);
     }
     else
@@ -372,7 +370,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != formatDate (task, "entry", dateformat))
     {
-      context.footnote ("Creation date modified.");
+      Context::getContext ().footnote ("Creation date modified.");
       task.set ("entry", Datetime (value, dateformat).toEpochString ());
     }
   }
@@ -387,13 +385,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "start", dateformat))
       {
-        context.footnote (STRING_EDIT_START_MOD);
+        Context::getContext ().footnote (STRING_EDIT_START_MOD);
         task.set ("start", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
-      context.footnote (STRING_EDIT_START_MOD);
+      Context::getContext ().footnote (STRING_EDIT_START_MOD);
       task.set ("start", Datetime (value, dateformat).toEpochString ());
     }
   }
@@ -401,7 +399,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("start") != "")
     {
-      context.footnote ("Start date removed.");
+      Context::getContext ().footnote ("Start date removed.");
       task.remove ("start");
     }
   }
@@ -414,7 +412,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "end", dateformat))
       {
-        context.footnote ("End date modified.");
+        Context::getContext ().footnote ("End date modified.");
         task.set ("end", Datetime (value, dateformat).toEpochString ());
       }
     }
@@ -425,7 +423,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("end") != "")
     {
-      context.footnote ("End date removed.");
+      Context::getContext ().footnote ("End date removed.");
       task.setStatus (Task::pending);
       task.remove ("end");
     }
@@ -439,13 +437,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "scheduled", dateformat))
       {
-        context.footnote (STRING_EDIT_SCHED_MOD);
+        Context::getContext ().footnote (STRING_EDIT_SCHED_MOD);
         task.set ("scheduled", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
-      context.footnote (STRING_EDIT_SCHED_MOD);
+      Context::getContext ().footnote (STRING_EDIT_SCHED_MOD);
       task.set ("scheduled", Datetime (value, dateformat).toEpochString ());
     }
   }
@@ -453,7 +451,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("scheduled") != "")
     {
-      context.footnote ("Scheduled date removed.");
+      Context::getContext ().footnote ("Scheduled date removed.");
       task.remove ("scheduled");
     }
   }
@@ -466,13 +464,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "due", dateformat))
       {
-        context.footnote (STRING_EDIT_DUE_MOD);
+        Context::getContext ().footnote (STRING_EDIT_DUE_MOD);
         task.set ("due", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
-      context.footnote (STRING_EDIT_DUE_MOD);
+      Context::getContext ().footnote (STRING_EDIT_DUE_MOD);
       task.set ("due", Datetime (value, dateformat).toEpochString ());
     }
   }
@@ -483,11 +481,11 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       if (task.getStatus () == Task::recurring ||
           task.get ("parent") != "")
       {
-        context.footnote ("Cannot remove a due date from a recurring task.");
+        Context::getContext ().footnote ("Cannot remove a due date from a recurring task.");
       }
       else
       {
-        context.footnote ("Due date removed.");
+        Context::getContext ().footnote ("Due date removed.");
         task.remove ("due");
       }
     }
@@ -501,13 +499,13 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "until", dateformat))
       {
-        context.footnote (STRING_EDIT_UNTIL_MOD);
+        Context::getContext ().footnote (STRING_EDIT_UNTIL_MOD);
         task.set ("until", Datetime (value, dateformat).toEpochString ());
       }
     }
     else
     {
-      context.footnote (STRING_EDIT_UNTIL_MOD);
+      Context::getContext ().footnote (STRING_EDIT_UNTIL_MOD);
       task.set ("until", Datetime (value, dateformat).toEpochString ());
     }
   }
@@ -515,7 +513,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("until") != "")
     {
-      context.footnote ("Until date removed.");
+      Context::getContext ().footnote ("Until date removed.");
       task.remove ("until");
     }
   }
@@ -530,7 +528,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       std::string::size_type idx = 0;
       if (p.parse (value, idx))
       {
-        context.footnote ("Recurrence modified.");
+        Context::getContext ().footnote ("Recurrence modified.");
         if (task.get ("due") != "")
         {
           task.set ("recur", value);
@@ -544,7 +542,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     }
     else
     {
-      context.footnote ("Recurrence removed.");
+      Context::getContext ().footnote ("Recurrence removed.");
       task.setStatus (Task::pending);
       task.remove ("recur");
       task.remove ("until");
@@ -561,14 +559,14 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     {
       if (value != formatDate (task, "wait", dateformat))
       {
-        context.footnote (STRING_EDIT_WAIT_MOD);
+        Context::getContext ().footnote (STRING_EDIT_WAIT_MOD);
         task.set ("wait", Datetime (value, dateformat).toEpochString ());
         task.setStatus (Task::waiting);
       }
     }
     else
     {
-      context.footnote (STRING_EDIT_WAIT_MOD);
+      Context::getContext ().footnote (STRING_EDIT_WAIT_MOD);
       task.set ("wait", Datetime (value, dateformat).toEpochString ());
       task.setStatus (Task::waiting);
     }
@@ -577,7 +575,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (task.get ("wait") != "")
     {
-      context.footnote ("Wait date removed.");
+      Context::getContext ().footnote ("Wait date removed.");
       task.remove ("wait");
       task.setStatus (Task::pending);
     }
@@ -589,12 +587,12 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   {
     if (value != "")
     {
-      context.footnote ("Parent UUID modified.");
+      Context::getContext ().footnote ("Parent UUID modified.");
       task.set ("parent", value);
     }
     else
     {
-      context.footnote ("Parent UUID removed.");
+      Context::getContext ().footnote ("Parent UUID removed.");
       task.remove ("parent");
     }
   }
@@ -658,9 +656,9 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
   }
 
   // UDAs
-  for (auto& col : context.columns)
+  for (auto& col : Context::getContext ().columns)
   {
-    auto type = context.config.get ("uda." + col.first + ".type");
+    auto type = Context::getContext ().config.get ("uda." + col.first + ".type");
     if (type != "")
     {
       auto value = findValue (after, "\n  UDA " + col.first + ":");
@@ -671,7 +669,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
       {
         if (value != "")
         {
-          context.footnote (format ("UDA {1} modified.", col.first));
+          Context::getContext ().footnote (format ("UDA {1} modified.", col.first));
 
           if (type == "string")
           {
@@ -698,7 +696,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
         }
         else
         {
-          context.footnote (format ("UDA {1} deleted.", col.first));
+          Context::getContext ().footnote (format ("UDA {1} deleted.", col.first));
           task.remove (col.first);
         }
       }
@@ -726,7 +724,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
 CmdEdit::editResult CmdEdit::editFile (Task& task)
 {
   // Check for file permissions.
-  Directory location (context.config.get ("data.location"));
+  Directory location (Context::getContext ().config.get ("data.location"));
   if (! location.writable ())
     throw std::string ("Your data.location directory is not writable.");
 
@@ -737,9 +735,9 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   // Determine the output date format, which uses a hierarchy of definitions.
   //   rc.dateformat.edit
   //   rc.dateformat
-  auto dateformat = context.config.get ("dateformat.edit");
+  auto dateformat = Context::getContext ().config.get ("dateformat.edit");
   if (dateformat == "")
-    dateformat = context.config.get ("dateformat");
+    dateformat = Context::getContext ().config.get ("dateformat");
 
   // Change directory for the editor
   auto current_dir = Directory::cwd ();
@@ -757,7 +755,7 @@ CmdEdit::editResult CmdEdit::editFile (Task& task)
   File::write (file.str (), before);
 
   // Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi
-  auto editor = context.config.get ("editor");
+  auto editor = Context::getContext ().config.get ("editor");
   char* peditor = getenv ("VISUAL");
   if (editor == "" && peditor) editor = std::string (peditor);
   peditor = getenv ("EDITOR");
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 4435d2297..117ed7443 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -30,8 +30,6 @@
 #include <Context.h>
 #include <shared.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdExec::CmdExec ()
 {
@@ -51,7 +49,7 @@ CmdExec::CmdExec ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdExec::execute (std::string&)
 {
-  return system (join (" ", context.cli2.getWords ()).c_str ());
+  return system (join (" ", Context::getContext ().cli2.getWords ()).c_str ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 449fb8259..51524f5bb 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -30,8 +30,6 @@
 #include <Filter.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdExport::CmdExport ()
 {
@@ -67,11 +65,11 @@ int CmdExport::execute (std::string& output)
   // Obey 'limit:N'.
   int rows = 0;
   int lines = 0;
-  context.getLimits (rows, lines);
+  Context::getContext ().getLimits (rows, lines);
   int limit = (rows > lines ? rows : lines);
 
   // Is output contained within a JSON array?
-  bool json_array = context.config.getBoolean ("json.array");
+  bool json_array = Context::getContext ().config.getBoolean ("json.array");
 
   // Compose output.
   if (json_array)
@@ -100,7 +98,7 @@ int CmdExport::execute (std::string& output)
   if (json_array)
     output += "]\n";
 
-  context.time_render_us += timer.total_us ();
+  Context::getContext ().time_render_us += timer.total_us ();
   return rc;
 }
 
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index d29093e47..6be5500f5 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -33,8 +33,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdGet::CmdGet ()
 {
@@ -60,7 +58,7 @@ CmdGet::CmdGet ()
 int CmdGet::execute (std::string& output)
 {
   std::vector <std::string> results;
-  for (auto& arg : context.cli2._args)
+  for (auto& arg : Context::getContext ().cli2._args)
   {
     switch (arg._lextype)
     {
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index d80ae8b99..7f0e97658 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -33,8 +33,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdHelp::CmdHelp ()
 {
@@ -54,7 +52,7 @@ CmdHelp::CmdHelp ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdHelp::execute (std::string& output)
 {
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   if (words.size () == 1 && closeEnough ("usage", words[0]))
     output = '\n'
            + composeUsage ()
@@ -183,7 +181,7 @@ int CmdHelp::execute (std::string& output)
 std::string CmdHelp::composeUsage () const
 {
   Table view;
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   view.add ("");
   view.add ("");
   view.add ("");
@@ -196,7 +194,7 @@ std::string CmdHelp::composeUsage () const
 
   // Obsolete method of getting a list of all commands.
   std::vector <std::string> all;
-  for (auto& cmd : context.commands)
+  for (auto& cmd : Context::getContext ().commands)
     all.push_back (cmd.first);
 
   // Sort alphabetically by usage.
@@ -208,8 +206,8 @@ std::string CmdHelp::composeUsage () const
     if (name[0] != '_')
     {
       row = view.addRow ();
-      view.set (row, 1, context.commands[name]->usage ());
-      view.set (row, 2, context.commands[name]->description ());
+      view.set (row, 1, Context::getContext ().commands[name]->usage ());
+      view.set (row, 2, Context::getContext ().commands[name]->description ());
     }
   }
 
@@ -219,8 +217,8 @@ std::string CmdHelp::composeUsage () const
     if (name[0] == '_')
     {
       row = view.addRow ();
-      view.set (row, 1, context.commands[name]->usage ());
-      view.set (row, 2, context.commands[name]->description ());
+      view.set (row, 1, Context::getContext ().commands[name]->usage ());
+      view.set (row, 2, Context::getContext ().commands[name]->description ());
     }
   }
 
@@ -228,7 +226,7 @@ std::string CmdHelp::composeUsage () const
   row = view.addRow ();
   view.set (row, 1, " ");
 
-  for (auto& alias : context.config)
+  for (auto& alias : Context::getContext ().config)
   {
     if (alias.first.substr (0, 6) == "alias.")
     {
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 716a7068b..64aaa0cd1 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -42,8 +42,6 @@
 #define STRING_CMD_HISTORY_COMP      "Completed"
 #define STRING_CMD_HISTORY_DEL       "Deleted"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 template<class HistoryStrategy>
 CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
@@ -66,21 +64,21 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
 template<class HistoryStrategy>
 void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
 {
-  auto widthOfBar = context.getWidth () - HistoryStrategy::labelWidth;
+  auto widthOfBar = Context::getContext ().getWidth () - HistoryStrategy::labelWidth;
 
   // Now build the view.
   Table view;
   setHeaderUnderline (view);
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
 
   HistoryStrategy::setupTableDates (view);
 
   view.add ("Number Added/Completed/Deleted", true, false); // Fixed.
 
-  Color color_add    (context.config.get ("color.history.add"));
-  Color color_done   (context.config.get ("color.history.done"));
-  Color color_delete (context.config.get ("color.history.delete"));
-  Color label        (context.config.get ("color.label"));
+  Color color_add    (Context::getContext ().config.get ("color.history.add"));
+  Color color_done   (Context::getContext ().config.get ("color.history.done"));
+  Color color_delete (Context::getContext ().config.get ("color.history.delete"));
+  Color label        (Context::getContext ().config.get ("color.label"));
 
   // Determine the longest line, and the longest "added" line.
   auto maxAddedLine = 0;
@@ -121,7 +119,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
       unsigned int deletedBar   = (widthOfBar *   deletedGroup[i.first]) / maxLine;
 
       std::string bar;
-      if (context.color ())
+      if (Context::getContext ().color ())
       {
         std::string aBar;
         if (addedGroup[i.first])
@@ -173,7 +171,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
         << view.render ()
         << '\n';
 
-    if (context.color ())
+    if (Context::getContext ().color ())
       out << format ("Legend: {1}, {2}, {3}",
                      color_add.colorize (STRING_CMD_HISTORY_ADDED),
                      color_done.colorize (STRING_CMD_HISTORY_COMP),
@@ -185,7 +183,7 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string& output)
   }
   else
   {
-    context.footnote ("No tasks.");
+    Context::getContext ().footnote ("No tasks.");
     rc = 1;
   }
 
@@ -198,7 +196,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
 {
   Table view;
   setHeaderUnderline (view);
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
 
   HistoryStrategy::setupTableDates (view);
 
@@ -245,7 +243,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
     }
 
     Color net_color;
-    if (context.color () && net)
+    if (Context::getContext ().color () && net)
       net_color = net > 0
                     ? Color (Color::red)
                     : Color (Color::green);
@@ -260,7 +258,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
     row = view.addRow ();
 
     Color row_color;
-    if (context.color ())
+    if (Context::getContext ().color ())
       row_color = Color (Color::nocolor, Color::nocolor, false, true, false);
 
     view.set (row, HistoryStrategy::dateFieldCount - 1, "Average", row_color);
@@ -277,7 +275,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string& output)
         << '\n';
   else
   {
-    context.footnote ("No tasks.");
+    Context::getContext ().footnote ("No tasks.");
     rc = 1;
   }
 
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index bf0d608d7..0b7c06552 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -33,8 +33,6 @@
 #include <main.h>
 #include <shared.h>
 
-extern Context context;
-
 std::string zshColonReplacement = ",";
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -71,7 +69,7 @@ int CmdIDs::execute (std::string& output)
   std::sort (ids.begin (), ids.end ());
   output = compressIds (ids) + '\n';
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
@@ -164,7 +162,7 @@ int CmdCompletionIds::execute (std::string& output)
   std::sort (ids.begin (), ids.end ());
   output = join ("\n", ids) + '\n';
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
@@ -204,7 +202,7 @@ int CmdZshCompletionIds::execute (std::string& output)
 
   output = out.str ();
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
@@ -240,7 +238,7 @@ int CmdUUIDs::execute (std::string& output)
   std::sort (uuids.begin (), uuids.end ());
   output = join (" ", uuids) + '\n';
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
@@ -276,7 +274,7 @@ int CmdCompletionUuids::execute (std::string& output)
   std::sort (uuids.begin (), uuids.end ());
   output = join ("\n", uuids) + '\n';
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
@@ -314,7 +312,7 @@ int CmdZshCompletionUuids::execute (std::string& output)
 
   output = out.str ();
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 7ca2f2a82..15e78eecd 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -33,8 +33,6 @@
 #include <shared.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdImport::CmdImport ()
 {
@@ -58,7 +56,7 @@ int CmdImport::execute (std::string&)
   auto count = 0;
 
   // Get filenames from command line arguments.
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   if (! words.size () ||
       (words.size () == 1 && words[0] == "-"))
   {
@@ -91,7 +89,7 @@ int CmdImport::execute (std::string&)
     }
   }
 
-  context.footnote (format ("Imported {1} tasks.", count));
+  Context::getContext ().footnote (format ("Imported {1} tasks.", count));
   return rc;
 }
 
@@ -177,7 +175,7 @@ void CmdImport::importSingleTask (json::object* obj)
 
   // Check whether the imported task is new or a modified existing task.
   Task before;
-  if (context.tdb2.get (task.get ("uuid"), before))
+  if (Context::getContext ().tdb2.get (task.get ("uuid"), before))
   {
     // We need to neglect updates from attributes with dynamic defaults
     // unless they have been explicitly specified on import.
@@ -214,7 +212,7 @@ void CmdImport::importSingleTask (json::object* obj)
   }
   else
   {
-    context.tdb2.add (task);
+    Context::getContext ().tdb2.add (task);
     std::cout << " add  ";
   }
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 1ceed7073..9050bf921 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -38,8 +38,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdInfo::CmdInfo ()
 {
@@ -74,23 +72,23 @@ int CmdInfo::execute (std::string& output)
 
   if (! filtered.size ())
   {
-    context.footnote ("No matches.");
+    Context::getContext ().footnote ("No matches.");
     rc = 1;
   }
 
   // Get the undo data.
   std::vector <std::string> undo;
-  if (context.config.getBoolean ("journal.info"))
-    undo = context.tdb2.undo.get_lines ();
+  if (Context::getContext ().config.getBoolean ("journal.info"))
+    undo = Context::getContext ().tdb2.undo.get_lines ();
 
   // Determine the output date format, which uses a hierarchy of definitions.
   //   rc.dateformat.info
   //   rc.dateformat
-  auto dateformat = context.config.get ("dateformat.info");
+  auto dateformat = Context::getContext ().config.get ("dateformat.info");
   if (dateformat == "")
-    dateformat = context.config.get ("dateformat");
+    dateformat = Context::getContext ().config.get ("dateformat");
 
-  auto dateformatanno = context.config.get ("dateformat.annotation");
+  auto dateformatanno = Context::getContext ().config.get ("dateformat.annotation");
   if (dateformatanno == "")
     dateformatanno = dateformat;
 
@@ -99,10 +97,10 @@ int CmdInfo::execute (std::string& output)
   for (auto& task : filtered)
   {
     Table view;
-    view.width (context.getWidth ());
-    if (context.config.getBoolean ("obfuscate"))
+    view.width (Context::getContext ().getWidth ());
+    if (Context::getContext ().config.getBoolean ("obfuscate"))
       view.obfuscate ();
-    if (context.color ())
+    if (Context::getContext ().color ())
       view.forceColor ();
     view.add ("Name");
     view.add ("Value");
@@ -121,7 +119,7 @@ int CmdInfo::execute (std::string& output)
     Color c;
     autoColorize (task, c);
     auto description = task.get ("description");
-    auto indent = context.config.getInteger ("indent.annotation");
+    auto indent = Context::getContext ().config.getInteger ("indent.annotation");
 
     for (auto& anno : task.getAnnotations ())
       description += '\n'
@@ -352,9 +350,9 @@ int CmdInfo::execute (std::string& output)
     std::string type;
     for (auto& att: all)
     {
-      if (context.columns.find (att) != context.columns.end ())
+      if (Context::getContext ().columns.find (att) != Context::getContext ().columns.end ())
       {
-        Column* col = context.columns[att];
+        Column* col = Context::getContext ().columns[att];
         if (col->is_uda ())
         {
           auto value = task.get (att);
@@ -386,7 +384,7 @@ int CmdInfo::execute (std::string& output)
     for (auto& att : all)
     {
       if (att.substr (0, 11) != "annotation_" &&
-          context.columns.find (att) == context.columns.end ())
+          Context::getContext ().columns.find (att) == Context::getContext ().columns.end ())
       {
          row = view.addRow ();
          view.set (row, 0, '[' + att);
@@ -399,19 +397,19 @@ int CmdInfo::execute (std::string& output)
     if (task.urgency () != 0.0)
     {
       setHeaderUnderline (urgencyDetails);
-      if (context.color ())
+      if (Context::getContext ().color ())
       {
-        Color alternate (context.config.get ("color.alternate"));
+        Color alternate (Context::getContext ().config.get ("color.alternate"));
         urgencyDetails.colorOdd (alternate);
         urgencyDetails.intraColorOdd (alternate);
       }
 
-      if (context.config.getBoolean ("obfuscate"))
+      if (Context::getContext ().config.getBoolean ("obfuscate"))
         urgencyDetails.obfuscate ();
-      if (context.config.getBoolean ("color"))
+      if (Context::getContext ().config.getBoolean ("color"))
         view.forceColor ();
 
-      urgencyDetails.width (context.getWidth ());
+      urgencyDetails.width (Context::getContext ().getWidth ());
       urgencyDetails.add (""); // Attribute
       urgencyDetails.add (""); // Value
       urgencyDetails.add (""); // *
@@ -500,16 +498,16 @@ int CmdInfo::execute (std::string& output)
     Table journal;
     setHeaderUnderline (journal);
 
-    if (context.config.getBoolean ("obfuscate"))
+    if (Context::getContext ().config.getBoolean ("obfuscate"))
       journal.obfuscate ();
-    if (context.config.getBoolean ("color"))
+    if (Context::getContext ().config.getBoolean ("color"))
       journal.forceColor ();
 
-    journal.width (context.getWidth ());
+    journal.width (Context::getContext ().getWidth ());
     journal.add ("Date");
     journal.add ("Modification");
 
-    if (context.config.getBoolean ("journal.info") &&
+    if (Context::getContext ().config.getBoolean ("journal.info") &&
         undo.size () > 3)
     {
       // Scan the undo data for entries matching this task, without making
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index eee0cd042..922c697d6 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -30,8 +30,6 @@
 #include <format.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdLog::CmdLog ()
 {
@@ -64,12 +62,12 @@ int CmdLog::execute (std::string& output)
   if (task.has ("wait"))
     throw std::string ("You cannot log waiting tasks.");
 
-  context.tdb2.add (task);
+  Context::getContext ().tdb2.add (task);
 
-  if (context.verbose ("project"))
-    context.footnote (onProjectChange (task));
+  if (Context::getContext ().verbose ("project"))
+    Context::getContext ().footnote (onProjectChange (task));
 
-  if (context.verbose ("new-uuid"))
+  if (Context::getContext ().verbose ("new-uuid"))
     output = format ("Logged task {1}.\n", task.get ("uuid"));
 
   return 0;
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index f9e9c77c6..a6f1b1273 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -29,8 +29,6 @@
 #include <Context.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdLogo::CmdLogo ()
 {
@@ -83,10 +81,10 @@ int CmdLogo::execute (std::string& output)
     ""
   };
 
-  if (! context.color ())
+  if (! Context::getContext ().color ())
     throw std::string ("The logo command requires that color support is enabled.");
 
-  std::string indent (context.config.getInteger ("indent.report"), ' ');
+  std::string indent (Context::getContext ().config.getInteger ("indent.report"), ' ');
   output += optionalBlankLine ();
 
   for (int line = 0; data[line][0]; ++line)
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 520d9f788..3745d04a0 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -36,8 +36,6 @@
 #define STRING_CMD_MODIFY_TASK_R     "Modifying recurring task {1} '{2}'."
 #define STRING_CMD_MODIFY_RECUR      "This is a recurring task.  Do you want to modify all pending recurrences of this same task?"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdModify::CmdModify ()
 {
@@ -65,7 +63,7 @@ int CmdModify::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -104,7 +102,7 @@ int CmdModify::execute (std::string&)
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ?  "Modified {1} task." : "Modified {1} tasks.", count);
   return rc;
@@ -143,8 +141,8 @@ int CmdModify::modifyAndUpdate (
   updateRecurrenceMask (after);
   feedback_affected ("Modifying task {1} '{2}'.", after);
   feedback_unblocked (after);
-  context.tdb2.modify (after);
-  if (context.verbose ("project") && projectChanges)
+  Context::getContext ().tdb2.modify (after);
+  if (Context::getContext ().verbose ("project") && projectChanges)
     (*projectChanges)[after.get ("project")] = onProjectChange (before, after);
 
   // Task has siblings - modify them.
@@ -165,11 +163,11 @@ int CmdModify::modifyRecurrenceSiblings (
 {
   auto count = 0;
 
-  if ((context.config.get ("recurrence.confirmation") == "prompt"
+  if ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
         && confirm (STRING_CMD_MODIFY_RECUR)) ||
-      context.config.getBoolean ("recurrence.confirmation"))
+      Context::getContext ().config.getBoolean ("recurrence.confirmation"))
   {
-    std::vector <Task> siblings = context.tdb2.siblings (task);
+    std::vector <Task> siblings = Context::getContext ().tdb2.siblings (task);
     for (auto& sibling : siblings)
     {
       Task alternate (sibling);
@@ -178,16 +176,16 @@ int CmdModify::modifyRecurrenceSiblings (
       ++count;
       feedback_affected (STRING_CMD_MODIFY_TASK_R, sibling);
       feedback_unblocked (sibling);
-      context.tdb2.modify (sibling);
-      if (context.verbose ("project") && projectChanges)
+      Context::getContext ().tdb2.modify (sibling);
+      if (Context::getContext ().verbose ("project") && projectChanges)
         (*projectChanges)[sibling.get ("project")] = onProjectChange (alternate, sibling);
     }
 
     // Modify the parent
     Task parent;
-    context.tdb2.get (task.get ("parent"), parent);
+    Context::getContext ().tdb2.get (task.get ("parent"), parent);
     parent.modify (Task::modReplace);
-    context.tdb2.modify (parent);
+    Context::getContext ().tdb2.modify (parent);
   }
 
   return count;
@@ -200,9 +198,9 @@ int CmdModify::modifyRecurrenceParent (
 {
   auto count = 0;
 
-  auto children = context.tdb2.children (task);
+  auto children = Context::getContext ().tdb2.children (task);
   if (children.size () &&
-      (! context.config.getBoolean ("recurrence.confirmation") ||
+      (! Context::getContext ().config.getBoolean ("recurrence.confirmation") ||
         confirm (STRING_CMD_MODIFY_RECUR)))
   {
     for (auto& child : children)
@@ -210,8 +208,8 @@ int CmdModify::modifyRecurrenceParent (
       Task alternate (child);
       child.modify (Task::modReplace);
       updateRecurrenceMask (child);
-      context.tdb2.modify (child);
-      if (context.verbose ("project") && projectChanges)
+      Context::getContext ().tdb2.modify (child);
+      if (Context::getContext ().verbose ("project") && projectChanges)
         (*projectChanges)[child.get ("project")] = onProjectChange (alternate, child);
       ++count;
       feedback_affected (STRING_CMD_MODIFY_TASK_R, child);
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index ec83e65b4..cfd1376f7 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -33,8 +33,6 @@
 #include <format.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdPrepend::CmdPrepend ()
 {
@@ -63,7 +61,7 @@ int CmdPrepend::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -85,33 +83,33 @@ int CmdPrepend::execute (std::string&)
 
     if (permission (taskDifferences (before, task) + question, filtered.size ()))
     {
-      context.tdb2.modify (task);
+      Context::getContext ().tdb2.modify (task);
       ++count;
       feedback_affected ("Prepending to task {1} '{2}'.", task);
-      if (context.verbose ("project"))
+      if (Context::getContext ().verbose ("project"))
         projectChanges[task.get ("project")] = onProjectChange (task, false);
 
       // Prepend to siblings.
       if (task.has ("parent"))
       {
-        if ((context.config.get ("recurrence.confirmation") == "prompt"
+        if ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
              && confirm ("This is a recurring task.  Do you want to prepend to all pending recurrences of this same task?")) ||
-            context.config.getBoolean ("recurrence.confirmation"))
+            Context::getContext ().config.getBoolean ("recurrence.confirmation"))
         {
-          std::vector <Task> siblings = context.tdb2.siblings (task);
+          std::vector <Task> siblings = Context::getContext ().tdb2.siblings (task);
           for (auto& sibling : siblings)
           {
             sibling.modify (Task::modPrepend, true);
-            context.tdb2.modify (sibling);
+            Context::getContext ().tdb2.modify (sibling);
             ++count;
             feedback_affected ("Prepending to recurring task {1} '{2}'.", sibling);
           }
 
           // Prepend to the parent
           Task parent;
-          context.tdb2.get (task.get ("parent"), parent);
+          Context::getContext ().tdb2.get (task.get ("parent"), parent);
           parent.modify (Task::modPrepend, true);
-          context.tdb2.modify (parent);
+          Context::getContext ().tdb2.modify (parent);
         }
       }
     }
@@ -127,7 +125,7 @@ int CmdPrepend::execute (std::string&)
   // Now list the project changes.
   for (auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Prepended {1} task." : "Prepended {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index a69c79327..2228bdcab 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -35,8 +35,6 @@
 #include <util.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdProjects::CmdProjects ()
 {
@@ -60,10 +58,10 @@ int CmdProjects::execute (std::string& output)
 
   // Get all the tasks.
   handleRecurrence ();
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
 
-  if (context.config.getBoolean ("list.all.projects"))
-    for (auto& task : context.tdb2.completed.get_tasks ())
+  if (Context::getContext ().config.getBoolean ("list.all.projects"))
+    for (auto& task : Context::getContext ().tdb2.completed.get_tasks ())
       tasks.push_back (task);
 
   // Apply the filter.
@@ -105,7 +103,7 @@ int CmdProjects::execute (std::string& output)
   {
     // Render a list of project names from the map.
     Table view;
-    view.width (context.getWidth ());
+    view.width (Context::getContext ().getWidth ());
     view.add ("Project");
     view.add ("Tasks", false);
     setHeaderUnderline (view);
@@ -178,10 +176,10 @@ int CmdCompletionProjects::execute (std::string& output)
 {
   // Get all the tasks.
   handleRecurrence ();
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
 
-  if (context.config.getBoolean ("list.all.projects"))
-    for (auto& task : context.tdb2.completed.get_tasks ())
+  if (Context::getContext ().config.getBoolean ("list.all.projects"))
+    for (auto& task : Context::getContext ().tdb2.completed.get_tasks ())
       tasks.push_back (task);
 
   // Apply the filter.
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 055833bd1..ffb7ada19 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -32,8 +32,6 @@
 #include <format.h>
 #include <shared.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdPurge::CmdPurge ()
 {
@@ -57,7 +55,7 @@ CmdPurge::CmdPurge ()
 // - child tasks
 void CmdPurge::purgeTask (Task& task, int& count)
 {
-  context.tdb2.purge (task);
+  Context::getContext ().tdb2.purge (task);
   handleDeps (task);
   handleChildren (task, count);
   count++;
@@ -70,14 +68,14 @@ void CmdPurge::handleDeps (Task& task)
 {
    std::string uuid = task.get ("uuid");
 
-   for (auto& blockedConst: context.tdb2.all_tasks ())
+   for (auto& blockedConst: Context::getContext ().tdb2.all_tasks ())
    {
      Task& blocked = const_cast<Task&>(blockedConst);
      if (blocked.has ("depends") &&
          blocked.get ("depends").find (uuid) != std::string::npos)
      {
          blocked.removeDependency (uuid);
-         context.tdb2.modify (blocked);
+         Context::getContext ().tdb2.modify (blocked);
      }
    }
 }
@@ -95,7 +93,7 @@ void CmdPurge::handleChildren (Task& task, int& count)
   std::vector<Task> children;
 
   // Find all child tasks
-  for (auto& childConst: context.tdb2.all_tasks ())
+  for (auto& childConst: Context::getContext ().tdb2.all_tasks ())
   {
     Task& child = const_cast<Task&> (childConst);
 
@@ -120,8 +118,8 @@ void CmdPurge::handleChildren (Task& task, int& count)
                                  task.get ("description"),
                                  children.size ());
 
-  if (context.config.getBoolean ("recurrence.confirmation") ||
-      (context.config.get ("recurrence.confirmation") == "prompt"
+  if (Context::getContext ().config.getBoolean ("recurrence.confirmation") ||
+      (Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
        && confirm (question)))
   {
     for (auto& child: children)
@@ -145,7 +143,7 @@ int CmdPurge::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 3ac2be602..de7716ade 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -32,8 +32,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdReports::CmdReports ()
 {
@@ -56,7 +54,7 @@ int CmdReports::execute (std::string& output)
   std::vector <std::string> reports;
 
   // Add custom reports.
-  for (auto& i : context.config)
+  for (auto& i : Context::getContext ().config)
   {
     if (i.first.substr (0, 7) == "report.")
     {
@@ -85,7 +83,7 @@ int CmdReports::execute (std::string& output)
   // Compose the output.
   std::stringstream out;
   Table view;
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   view.add ("Report");
   view.add ("Description");
   setHeaderUnderline (view);
@@ -94,7 +92,7 @@ int CmdReports::execute (std::string& output)
   {
     int row = view.addRow ();
     view.set (row, 0, report);
-    view.set (row, 1, context.commands[report]->description ());
+    view.set (row, 1, Context::getContext ().commands[report]->description ());
   }
 
   out << optionalBlankLine ()
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 5f414d5b2..ec6863b61 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -39,7 +39,6 @@
 #define STRING_CMD_SHOW_DIFFER_COLOR "These are highlighted in {1} above."
 #define STRING_CMD_SHOW_CONFIG_ERROR "Configuration error: {1} contains an unrecognized value '{2}'."
 
-extern Context context;
 extern std::string configurationDefaults;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -66,11 +65,11 @@ int CmdShow::execute (std::string& output)
 
   // Obtain the arguments from the description.  That way, things like '--'
   // have already been handled.
-  std::vector <std::string> words = context.cli2.getWords ();
+  std::vector <std::string> words = Context::getContext ().cli2.getWords ();
   if (words.size () > 1)
     throw std::string ("You can only specify 'all' or a search string.");
 
-  int width = context.getWidth ();
+  int width = Context::getContext ().getWidth ();
 
   // Complain about configuration variables that are not recognized.
   // These are the regular configuration variables.
@@ -224,7 +223,7 @@ int CmdShow::execute (std::string& output)
   recognized += "_forcecolor ";
 
   std::vector <std::string> unrecognized;
-  for (auto& i : context.config)
+  for (auto& i : Context::getContext ().config)
   {
     // Disallow partial matches by tacking a leading and trailing space on each
     // variable name.
@@ -259,7 +258,7 @@ int CmdShow::execute (std::string& output)
   Configuration default_config;
   default_config.parse (configurationDefaults);
 
-  for (auto& i : context.config)
+  for (auto& i : Context::getContext ().config)
     if (i.second != default_config.get (i.first))
       default_values.push_back (i.first);
 
@@ -272,10 +271,10 @@ int CmdShow::execute (std::string& output)
 
   Color error;
   Color warning;
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
-    error   = Color (context.config.get ("color.error"));
-    warning = Color (context.config.get ("color.warning"));
+    error   = Color (Context::getContext ().config.get ("color.error"));
+    warning = Color (Context::getContext ().config.get ("color.warning"));
   }
 
   bool issue_error = false;
@@ -291,7 +290,7 @@ int CmdShow::execute (std::string& output)
     section = "";
 
   std::string::size_type loc;
-  for (auto& i : context.config)
+  for (auto& i : Context::getContext ().config)
   {
     loc = i.first.find (section, 0);
     if (loc != std::string::npos)
@@ -333,7 +332,7 @@ int CmdShow::execute (std::string& output)
   {
     out << "Some of your .taskrc variables differ from the default values.\n";
 
-    if (context.color () && warning.nontrivial ())
+    if (Context::getContext ().color () && warning.nontrivial ())
       out << "  "
           << format (STRING_CMD_SHOW_DIFFER_COLOR, warning.colorize ("color"))
           << "\n\n";
@@ -347,7 +346,7 @@ int CmdShow::execute (std::string& output)
     for (auto& i : unrecognized)
       out << "  " << i << '\n';
 
-    if (context.color () && error.nontrivial ())
+    if (Context::getContext ().color () && error.nontrivial ())
       out << '\n' << format (STRING_CMD_SHOW_DIFFER_COLOR, error.colorize ("color"));
 
     out << "\n\n";
@@ -360,7 +359,7 @@ int CmdShow::execute (std::string& output)
   // TODO Check for referenced but missing string files.
 
   // Check for bad values in rc.calendar.details.
-  std::string calendardetails = context.config.get ("calendar.details");
+  std::string calendardetails = Context::getContext ().config.get ("calendar.details");
   if (calendardetails != "full"   &&
       calendardetails != "sparse" &&
       calendardetails != "none")
@@ -368,7 +367,7 @@ int CmdShow::execute (std::string& output)
         << '\n';
 
   // Check for bad values in rc.calendar.holidays.
-  std::string calendarholidays = context.config.get ("calendar.holidays");
+  std::string calendarholidays = Context::getContext ().config.get ("calendar.holidays");
   if (calendarholidays != "full"   &&
       calendarholidays != "sparse" &&
       calendarholidays != "none")
@@ -378,14 +377,14 @@ int CmdShow::execute (std::string& output)
   // Verify installation.  This is mentioned in the documentation as the way
   // to ensure everything is properly installed.
 
-  if (context.config.size () == 0)
+  if (Context::getContext ().config.size () == 0)
   {
     out << "Configuration error: .taskrc contains no entries.\n";
     rc = 1;
   }
   else
   {
-    Directory location (context.config.get ("data.location"));
+    Directory location (Context::getContext ().config.get ("data.location"));
 
     if (location._data == "")
       out << "Configuration error: data.location not specified in .taskrc file.\n";
@@ -413,13 +412,13 @@ CmdShowRaw::CmdShowRaw ()
 int CmdShowRaw::execute (std::string& output)
 {
   // Get all the settings and sort alphabetically by name.
-  auto all = context.config.all ();
+  auto all = Context::getContext ().config.all ();
   std::sort (all.begin (), all.end ());
 
   // Display them all.
   std::stringstream out;
   for (auto& i : all)
-    out << i << '=' << context.config.get (i) << '\n';
+    out << i << '=' << Context::getContext ().config.get (i) << '\n';
 
   output = out.str ();
   return 0;
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 964bdd35c..0c67d5ab4 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -33,8 +33,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdStart::CmdStart ()
 {
@@ -63,7 +61,7 @@ int CmdStart::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -91,19 +89,19 @@ int CmdStart::execute (std::string&)
         task.setStatus (Task::pending);
       }
 
-      if (context.config.getBoolean ("journal.time"))
-        task.addAnnotation (context.config.get ("journal.time.start.annotation"));
+      if (Context::getContext ().config.getBoolean ("journal.time"))
+        task.addAnnotation (Context::getContext ().config.get ("journal.time.start.annotation"));
 
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
         updateRecurrenceMask (task);
-        context.tdb2.modify (task);
+        Context::getContext ().tdb2.modify (task);
         ++count;
         feedback_affected ("Starting task {1} '{2}'.", task);
         if (!nagged)
           nagged = nag (task);
         dependencyChainOnStart (task);
-        if (context.verbose ("project"))
+        if (Context::getContext ().verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task, false);
       }
       else
@@ -127,7 +125,7 @@ int CmdStart::execute (std::string&)
   // Now list the project changes.
   for (auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ? "Started {1} task." : "Started {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 7b993d762..87ecf07e5 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -38,8 +38,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdStats::CmdStats ()
 {
@@ -62,23 +60,23 @@ int CmdStats::execute (std::string& output)
   int rc = 0;
   std::stringstream out;
 
-  std::string dateformat = context.config.get ("dateformat");
+  std::string dateformat = Context::getContext ().config.get ("dateformat");
 
   // Go get the file sizes.
-  size_t dataSize = context.tdb2.pending._file.size ()
-                  + context.tdb2.completed._file.size ()
-                  + context.tdb2.undo._file.size ()
-                  + context.tdb2.backlog._file.size ();
+  size_t dataSize = Context::getContext ().tdb2.pending._file.size ()
+                  + Context::getContext ().tdb2.completed._file.size ()
+                  + Context::getContext ().tdb2.undo._file.size ()
+                  + Context::getContext ().tdb2.backlog._file.size ();
 
   // Count the undo transactions.
-  std::vector <std::string> undoTxns = context.tdb2.undo.get_lines ();
+  std::vector <std::string> undoTxns = Context::getContext ().tdb2.undo.get_lines ();
   int undoCount = 0;
   for (auto& tx : undoTxns)
     if (tx == "---")
       ++undoCount;
 
   // Count the backlog transactions.
-  std::vector <std::string> backlogTxns = context.tdb2.backlog.get_lines ();
+  std::vector <std::string> backlogTxns = Context::getContext ().tdb2.backlog.get_lines ();
   int backlogCount = 0;
   for (auto& tx : backlogTxns)
     if (tx[0] == '{')
@@ -86,7 +84,7 @@ int CmdStats::execute (std::string& output)
 
   // Get all the tasks.
   Filter filter;
-  std::vector <Task> all = context.tdb2.all_tasks ();
+  std::vector <Task> all = Context::getContext ().tdb2.all_tasks ();
   std::vector <Task> filtered;
   filter.subset (all, filtered);
 
@@ -155,7 +153,7 @@ int CmdStats::execute (std::string& output)
 
   // Create a table for output.
   Table view;
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   view.intraPadding (2);
   view.add ("Category");
   view.add ("Data");
@@ -280,9 +278,9 @@ int CmdStats::execute (std::string& output)
   }
 
   // If an alternating row color is specified, notify the table.
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
-    Color alternate (context.config.get ("color.alternate"));
+    Color alternate (Context::getContext ().config.get ("color.alternate"));
     if (alternate.nontrivial ())
     {
       view.colorOdd (alternate);
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index d48af2930..7ff5beeba 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -32,8 +32,6 @@
 #include <main.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdStop::CmdStop ()
 {
@@ -62,7 +60,7 @@ int CmdStop::execute (std::string&)
   filter.subset (filtered);
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
@@ -83,17 +81,17 @@ int CmdStop::execute (std::string&)
       task.modify (Task::modAnnotate);
       task.remove ("start");
 
-      if (context.config.getBoolean ("journal.time"))
-        task.addAnnotation (context.config.get ("journal.time.stop.annotation"));
+      if (Context::getContext ().config.getBoolean ("journal.time"))
+        task.addAnnotation (Context::getContext ().config.get ("journal.time.stop.annotation"));
 
       if (permission (taskDifferences (before, task) + question, filtered.size ()))
       {
         updateRecurrenceMask (task);
-        context.tdb2.modify (task);
+        Context::getContext ().tdb2.modify (task);
         ++count;
         feedback_affected ("Stopping task {1} '{2}'.", task);
         dependencyChainOnStart (task);
-        if (context.verbose ("project"))
+        if (Context::getContext ().verbose ("project"))
           projectChanges[task.get ("project")] = onProjectChange (task, false);
       }
       else
@@ -117,7 +115,7 @@ int CmdStop::execute (std::string&)
   // Now list the project changes.
   for (auto& change : projectChanges)
     if (change.first != "")
-      context.footnote (change.second);
+      Context::getContext ().footnote (change.second);
 
   feedback_affected (count == 1 ?  "Stopped {1} task." : "Stopped {1} tasks.", count);
   return rc;
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 65a511306..9e8c2ae5c 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -37,8 +37,6 @@
 #include <util.h>
 #include <main.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdSummary::CmdSummary ()
 {
@@ -62,7 +60,7 @@ CmdSummary::CmdSummary ()
 int CmdSummary::execute (std::string& output)
 {
   int rc = 0;
-  bool showAllProjects = context.config.getBoolean ("summary.all.projects");
+  bool showAllProjects = Context::getContext ().config.getBoolean ("summary.all.projects");
 
   // Apply filter.
   handleRecurrence ();
@@ -131,7 +129,7 @@ int CmdSummary::execute (std::string& output)
 
   // Create a table for output.
   Table view;
-  view.width (context.getWidth ());
+  view.width (Context::getContext ().getWidth ());
   view.add ("Project");
   view.add ("Remaining", false);
   view.add ("Avg age",   false);
@@ -141,10 +139,10 @@ int CmdSummary::execute (std::string& output)
 
   Color bar_color;
   Color bg_color;
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
-    bar_color = Color (context.config.get ("color.summary.bar"));
-    bg_color  = Color (context.config.get ("color.summary.background"));
+    bar_color = Color (Context::getContext ().config.get ("color.summary.bar"));
+    bg_color  = Color (Context::getContext ().config.get ("color.summary.background"));
   }
 
   int barWidth = 30;
@@ -182,7 +180,7 @@ int CmdSummary::execute (std::string& output)
 
       std::string bar;
       std::string subbar;
-      if (context.color ())
+      if (Context::getContext ().color ())
       {
         bar += bar_color.colorize (std::string (           completedBar, ' '));
         bar += bg_color.colorize  (std::string (barWidth - completedBar, ' '));
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 19a8ad6f2..126980e4a 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -36,8 +36,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdSync::CmdSync ()
 {
@@ -67,12 +65,12 @@ int CmdSync::execute (std::string& output)
 
   // Loog for the 'init' keyword to indicate one-time pending.data upload.
   bool first_time_init = false;
-  std::vector <std::string> words = context.cli2.getWords ();
+  std::vector <std::string> words = Context::getContext ().cli2.getWords ();
   for (auto& word : words)
   {
     if (closeEnough ("initialize", word, 4))
     {
-      if (!context.config.getBoolean ("confirmation") ||
+      if (!Context::getContext ().config.getBoolean ("confirmation") ||
           confirm ("Please confirm that you wish to upload all your tasks to the Taskserver"))
         first_time_init = true;
       else
@@ -81,13 +79,13 @@ int CmdSync::execute (std::string& output)
   }
 
   // If no server is set up, quit.
-  std::string connection = context.config.get ("taskd.server");
+  std::string connection = Context::getContext ().config.get ("taskd.server");
   if (connection == "" ||
       connection.rfind (':') == std::string::npos)
     throw std::string ("Taskserver is not configured.");
 
   // Obtain credentials.
-  std::string credentials_string = context.config.get ("taskd.credentials");
+  std::string credentials_string = Context::getContext ().config.get ("taskd.credentials");
   if (credentials_string == "")
     throw std::string ("Taskserver credentials malformed.");
 
@@ -96,7 +94,7 @@ int CmdSync::execute (std::string& output)
     throw std::string ("Taskserver credentials malformed.");
 
   // This was a Boolean value in 2.3.0, and is a tri-state since 2.4.0.
-  std::string trust_value = context.config.get ("taskd.trust");
+  std::string trust_value = Context::getContext ().config.get ("taskd.trust");
   if (trust_value != "strict" &&
       trust_value != "ignore hostname" &&
       trust_value != "allow all")
@@ -109,18 +107,18 @@ int CmdSync::execute (std::string& output)
     trust = TLSClient::ignore_hostname;
 
   // CA must exist, if provided.
-  File ca (context.config.get ("taskd.ca"));
+  File ca (Context::getContext ().config.get ("taskd.ca"));
   if (ca._data != "" && ! ca.exists ())
     throw std::string ("CA certificate not found.");
 
   if (trust == TLSClient::allow_all && ca._data != "")
     throw std::string ("You should either provide a CA certificate or override verification, but not both.");
 
-  File certificate (context.config.get ("taskd.certificate"));
+  File certificate (Context::getContext ().config.get ("taskd.certificate"));
   if (! certificate.exists ())
     throw std::string ("Taskserver certificate missing.");
 
-  File key (context.config.get ("taskd.key"));
+  File key (Context::getContext ().config.get ("taskd.key"));
   if (! key.exists ())
     throw std::string ("Taskserver key missing.");
 
@@ -132,9 +130,9 @@ int CmdSync::execute (std::string& output)
   {
     // Delete backlog.data.  Because if we're uploading everything, the list of
     // deltas is meaningless.
-    context.tdb2.backlog._file.truncate ();
+    Context::getContext ().tdb2.backlog._file.truncate ();
 
-    auto all_tasks = context.tdb2.all_tasks ();
+    auto all_tasks = Context::getContext ().tdb2.all_tasks ();
     for (auto& i : all_tasks)
     {
       payload += i.composeJSON () + '\n';
@@ -143,7 +141,7 @@ int CmdSync::execute (std::string& output)
   }
   else
   {
-    std::vector <std::string> lines = context.tdb2.backlog.get_lines ();
+    std::vector <std::string> lines = Context::getContext ().tdb2.backlog.get_lines ();
     for (auto& i : lines)
     {
       if (i[0] == '{')
@@ -169,7 +167,7 @@ int CmdSync::execute (std::string& output)
 
   request.setPayload (payload);
 
-  if (context.verbose ("sync"))
+  if (Context::getContext ().verbose ("sync"))
     out << format ("Syncing with {1}", connection)
         << '\n';
 
@@ -189,10 +187,10 @@ int CmdSync::execute (std::string& output)
     {
       Color colorAdded;
       Color colorChanged;
-      if (context.color ())
+      if (Context::getContext ().color ())
       {
-        colorAdded   = Color (context.config.get ("color.sync.added"));
-        colorChanged = Color (context.config.get ("color.sync.changed"));
+        colorAdded   = Color (Context::getContext ().config.get ("color.sync.added"));
+        colorChanged = Color (Context::getContext ().config.get ("color.sync.changed"));
       }
 
       int download_count = 0;
@@ -203,7 +201,7 @@ int CmdSync::execute (std::string& output)
       // the payload, so if there are two or more lines, then we have merging
       // to perform, otherwise it's just a backlog.data update.
       if (lines.size () > 1)
-        context.tdb2.all_tasks ();
+        Context::getContext ().tdb2.all_tasks ();
 
       std::string sync_key = "";
       for (auto& line : lines)
@@ -217,33 +215,33 @@ int CmdSync::execute (std::string& output)
 
           // Is it a new task from the server, or an update to an existing one?
           Task dummy;
-          if (context.tdb2.get (uuid, dummy))
+          if (Context::getContext ().tdb2.get (uuid, dummy))
           {
-            if (context.verbose ("sync"))
+            if (Context::getContext ().verbose ("sync"))
               out << "  "
                   << colorChanged.colorize (
                        format ("modify {1} '{2}'",
                                uuid,
                                from_server.get ("description")))
                   << '\n';
-            context.tdb2.modify (from_server, false);
+            Context::getContext ().tdb2.modify (from_server, false);
           }
           else
           {
-            if (context.verbose ("sync"))
+            if (Context::getContext ().verbose ("sync"))
               out << "  "
                   << colorAdded.colorize (
                        format ("   add {1} '{2}'",
                                uuid,
                                from_server.get ("description")))
                   << '\n';
-            context.tdb2.add (from_server, false);
+            Context::getContext ().tdb2.add (from_server, false);
           }
         }
         else if (line != "")
         {
           sync_key = line;
-          context.debug ("Sync key " + sync_key);
+          Context::getContext ().debug ("Sync key " + sync_key);
         }
 
         // Otherwise line is blank, so ignore it.
@@ -254,46 +252,46 @@ int CmdSync::execute (std::string& output)
       if (sync_key != "")
       {
         // Truncate backlog.data, save new sync_key.
-        context.tdb2.backlog._file.truncate ();
-        context.tdb2.backlog.clear_tasks ();
-        context.tdb2.backlog.clear_lines ();
-        context.tdb2.backlog.add_line (sync_key + '\n');
+        Context::getContext ().tdb2.backlog._file.truncate ();
+        Context::getContext ().tdb2.backlog.clear_tasks ();
+        Context::getContext ().tdb2.backlog.clear_lines ();
+        Context::getContext ().tdb2.backlog.add_line (sync_key + '\n');
 
         // Present a clear status message.
         if (upload_count == 0 && download_count == 0)
           // Note: should not happen - expect code 201 instead.
-          context.footnote ("Sync successful.");
+          Context::getContext ().footnote ("Sync successful.");
         else if (upload_count == 0 && download_count > 0)
-          context.footnote (format ("Sync successful.  {1} changes downloaded.", download_count));
+          Context::getContext ().footnote (format ("Sync successful.  {1} changes downloaded.", download_count));
         else if (upload_count > 0 && download_count == 0)
-          context.footnote (format ("Sync successful.  {1} changes uploaded.", upload_count));
+          Context::getContext ().footnote (format ("Sync successful.  {1} changes uploaded.", upload_count));
         else if (upload_count > 0 && download_count > 0)
-          context.footnote (format ("Sync successful.  {1} changes uploaded, {2} changes downloaded.", upload_count, download_count));
+          Context::getContext ().footnote (format ("Sync successful.  {1} changes uploaded, {2} changes downloaded.", upload_count, download_count));
       }
 
       status = 0;
     }
     else if (code == "201")
     {
-      context.footnote ("Sync successful.  No changes.");
+      Context::getContext ().footnote ("Sync successful.  No changes.");
       status = 0;
     }
     else if (code == "301")
     {
       std::string new_server = response.get ("info");
-      context.config.set ("taskd.server", new_server);
-      context.error ("The server account has been relocated.  Please update your configuration using:");
-      context.error ("  " + format ("task config taskd.server {1}", new_server));
+      Context::getContext ().config.set ("taskd.server", new_server);
+      Context::getContext ().error ("The server account has been relocated.  Please update your configuration using:");
+      Context::getContext ().error ("  " + format ("task config taskd.server {1}", new_server));
       status = 2;
     }
     else if (code == "430")
     {
-      context.error ("Sync failed.  Either your credentials are incorrect, or your account doesn't exist on the Taskserver.");
+      Context::getContext ().error ("Sync failed.  Either your credentials are incorrect, or your account doesn't exist on the Taskserver.");
       status = 2;
     }
     else
     {
-      context.error (format ("Sync failed.  The Taskserver returned error: {1} {2}",
+      Context::getContext ().error (format ("Sync failed.  The Taskserver returned error: {1} {2}",
                              code,
                              response.get ("status")));
       status = 2;
@@ -303,10 +301,10 @@ int CmdSync::execute (std::string& output)
     std::string to_be_displayed = response.get ("messages");
     if (to_be_displayed != "")
     {
-      if (context.verbose ("footnote"))
-        context.footnote (to_be_displayed);
+      if (Context::getContext ().verbose ("footnote"))
+        Context::getContext ().footnote (to_be_displayed);
       else
-        context.debug (to_be_displayed);
+        Context::getContext ().debug (to_be_displayed);
     }
   }
 
@@ -319,11 +317,11 @@ int CmdSync::execute (std::string& output)
   //   - No signal/cable
   else
   {
-    context.error ("Sync failed.  Could not connect to the Taskserver.");
+    Context::getContext ().error ("Sync failed.  Could not connect to the Taskserver.");
     status = 1;
   }
 
-  if (context.verbose ("sync"))
+  if (Context::getContext ().verbose ("sync"))
     out << '\n';
   output = out.str ();
 
@@ -365,10 +363,10 @@ bool CmdSync::send (
   try
   {
     TLSClient client;
-    client.debug (context.config.getInteger ("debug.tls"));
+    client.debug (Context::getContext ().config.getInteger ("debug.tls"));
 
     client.trust (trust);
-    client.ciphers (context.config.get ("taskd.ciphers"));
+    client.ciphers (Context::getContext ().config.get ("taskd.ciphers"));
     client.init (ca, certificate, key);
     client.connect (server, port);
     client.send (request.serialize () + '\n');
@@ -383,7 +381,7 @@ bool CmdSync::send (
 
   catch (std::string& error)
   {
-    context.error (error);
+    Context::getContext ().error (error);
   }
 
   // Indicate message failed.
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index c084db004..ed4b38470 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -35,8 +35,6 @@
 #include <format.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdTags::CmdTags ()
 {
@@ -60,10 +58,10 @@ int CmdTags::execute (std::string& output)
   std::stringstream out;
 
   // Get all the tasks.
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
 
-  if (context.config.getBoolean ("list.all.tags"))
-    for (auto& task : context.tdb2.completed.get_tasks ())
+  if (Context::getContext ().config.getBoolean ("list.all.tags"))
+    for (auto& task : Context::getContext ().tdb2.completed.get_tasks ())
       tasks.push_back (task);
 
   int quantity = tasks.size ();
@@ -89,20 +87,20 @@ int CmdTags::execute (std::string& output)
   {
     // Render a list of tags names from the map.
     Table view;
-    view.width (context.getWidth ());
+    view.width (Context::getContext ().getWidth ());
     view.add ("Tag");
     view.add ("Count", false);
     setHeaderUnderline (view);
 
     Color bold;
-    if (context.color ())
+    if (Context::getContext ().color ())
       bold = Color ("bold");
 
     bool special = false;
     for (auto& i : unique)
     {
       // Highlight the special tags.
-      special = (context.color () &&
+      special = (Context::getContext ().color () &&
                  (i.first == "nocolor" ||
                   i.first == "nonag"   ||
                   i.first == "nocal"   ||
@@ -118,20 +116,20 @@ int CmdTags::execute (std::string& output)
         << optionalBlankLine ();
 
     if (unique.size () == 1)
-      context.footnote ("1 tag");
+      Context::getContext ().footnote ("1 tag");
     else
-      context.footnote (format ("{1} tags", unique.size ()));
+      Context::getContext ().footnote (format ("{1} tags", unique.size ()));
 
     if (quantity == 1)
-      context.footnote ("(1 task)");
+      Context::getContext ().footnote ("(1 task)");
     else
-      context.footnote (format ("({1} tasks)", quantity));
+      Context::getContext ().footnote (format ("({1} tasks)", quantity));
 
     out << '\n';
   }
   else
   {
-    context.footnote ("No tags.");
+    Context::getContext ().footnote ("No tags.");
     rc = 1;
   }
 
@@ -159,10 +157,10 @@ CmdCompletionTags::CmdCompletionTags ()
 int CmdCompletionTags::execute (std::string& output)
 {
   // Get all the tasks.
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
 
-  if (context.config.getBoolean ("complete.all.tags"))
-    for (auto& task : context.tdb2.completed.get_tasks ())
+  if (Context::getContext ().config.getBoolean ("complete.all.tags"))
+    for (auto& task : Context::getContext ().tdb2.completed.get_tasks ())
       tasks.push_back (task);
 
   // Apply filter.
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index df8d45b50..26e5a7d5a 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -37,8 +37,6 @@
 #include <util.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdTimesheet::CmdTimesheet ()
 {
@@ -62,7 +60,7 @@ int CmdTimesheet::execute (std::string& output)
 
   // Detect a filter.
   bool hasFilter {false};
-  for (auto& a : context.cli2._args)
+  for (auto& a : Context::getContext ().cli2._args)
   {
     if (a.hasTag ("FILTER"))
     {
@@ -73,10 +71,10 @@ int CmdTimesheet::execute (std::string& output)
 
   if (! hasFilter)
   {
-    auto defaultFilter = context.config.get ("report.timesheet.filter");
+    auto defaultFilter = Context::getContext ().config.get ("report.timesheet.filter");
     if (defaultFilter == "")
       defaultFilter = "(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)";
-    context.cli2.addFilter (defaultFilter);
+    Context::getContext ().cli2.addFilter (defaultFilter);
   }
 
   // Apply filter to get a set of tasks.
@@ -114,8 +112,8 @@ int CmdTimesheet::execute (std::string& output)
 
   // Render the completed table.
   Table table;
-  table.width (context.getWidth ());
-  if (context.config.getBoolean ("obfuscate"))
+  table.width (Context::getContext ().getWidth ());
+  if (Context::getContext ().config.getBoolean ("obfuscate"))
     table.obfuscate ();
   table.add ("Wk");
   table.add ("Date");
@@ -126,7 +124,7 @@ int CmdTimesheet::execute (std::string& output)
   table.add ("Task");
   setHeaderUnderline (table);
 
-  auto dateformat = context.config.get ("dateformat");
+  auto dateformat = Context::getContext ().config.get ("dateformat");
 
   int previous_week = -1;
   std::string previous_date = "";
@@ -188,7 +186,7 @@ int CmdTimesheet::execute (std::string& output)
         << table.render ()
         << '\n';
 
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
     out << format ("{1} completed, {2} started.", num_completed, num_started)
         << '\n';
 
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 5b06c7d75..9acef008e 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -36,8 +36,6 @@
 #include <shared.h>
 #include <util.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdUDAs::CmdUDAs ()
 {
@@ -61,7 +59,7 @@ int CmdUDAs::execute (std::string& output)
   std::stringstream out;
 
   std::vector <std::string> udas;
-  for (auto& name : context.config)
+  for (auto& name : Context::getContext ().config)
   {
     if (name.first.substr (0, 4) == "uda." &&
         name.first.find (".type") != std::string::npos)
@@ -84,7 +82,7 @@ int CmdUDAs::execute (std::string& output)
     // Render a list of UDA name, type, label, allowed values,
     // possible default value, and finally the usage count.
     Table table;
-    table.width (context.getWidth ());
+    table.width (Context::getContext ().getWidth ());
     table.add ("Name");
     table.add ("Type");
     table.add ("Label");
@@ -95,10 +93,10 @@ int CmdUDAs::execute (std::string& output)
 
     for (auto& uda : udas)
     {
-      std::string type   = context.config.get ("uda." + uda + ".type");
-      std::string label  = context.config.get ("uda." + uda + ".label");
-      std::string values = context.config.get ("uda." + uda + ".values");
-      std::string defval = context.config.get ("uda." + uda + ".default");
+      std::string type   = Context::getContext ().config.get ("uda." + uda + ".type");
+      std::string label  = Context::getContext ().config.get ("uda." + uda + ".label");
+      std::string values = Context::getContext ().config.get ("uda." + uda + ".values");
+      std::string defval = Context::getContext ().config.get ("uda." + uda + ".default");
       if (label == "")
         label = uda;
 
@@ -137,7 +135,7 @@ int CmdUDAs::execute (std::string& output)
   {
     for (auto& att : i.data)
       if (att.first.substr (0, 11) != "annotation_" &&
-          context.columns.find (att.first) == context.columns.end ())
+          Context::getContext ().columns.find (att.first) == Context::getContext ().columns.end ())
         orphans[att.first]++;
   }
 
@@ -145,7 +143,7 @@ int CmdUDAs::execute (std::string& output)
   {
     // Display the orphans and their counts.
     Table orphanTable;
-    orphanTable.width (context.getWidth ());
+    orphanTable.width (Context::getContext ().getWidth ());
     orphanTable.add ("Orphan UDA");
     orphanTable.add ("Usage Count");
     setHeaderUnderline (orphanTable);
@@ -190,7 +188,7 @@ CmdCompletionUDAs::CmdCompletionUDAs ()
 int CmdCompletionUDAs::execute (std::string& output)
 {
   std::vector <std::string> udas;
-  for (auto& name : context.config)
+  for (auto& name : Context::getContext ().config)
   {
     if (name.first.substr (0, 4) == "uda." &&
         name.first.find (".type") != std::string::npos)
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 0018da368..b0431166e 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -28,8 +28,6 @@
 #include <CmdUndo.h>
 #include <Context.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdUndo::CmdUndo ()
 {
@@ -49,7 +47,7 @@ CmdUndo::CmdUndo ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdUndo::execute (std::string&)
 {
-  context.tdb2.revert ();
+  Context::getContext ().tdb2.revert ();
   return 0;
 }
 
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index b1399db09..0b67dbdc6 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -32,8 +32,6 @@
 #include <Filter.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdUnique::CmdUnique ()
 {
@@ -63,13 +61,13 @@ int CmdUnique::execute (std::string& output)
   std::string attribute {};
 
   // Just the first arg.
-  auto words = context.cli2.getWords ();
+  auto words = Context::getContext ().cli2.getWords ();
   if (words.size () == 0)
     throw std::string ("An attribute must be specified.  See 'task _columns'.");
   attribute = words[0];
 
   std::string canonical;
-  if (! context.cli2.canonicalize (canonical, "attribute", attribute))
+  if (! Context::getContext ().cli2.canonicalize (canonical, "attribute", attribute))
     throw std::string ("You must specify an attribute or UDA.");
 
   // Find the unique set of matching tasks.
@@ -92,7 +90,7 @@ int CmdUnique::execute (std::string& output)
   for (auto& value : values)
     output += value + '\n';
 
-  context.headers.clear ();
+  Context::getContext ().headers.clear ();
   return 0;
 }
 
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index aa83e16e1..0f4e8f130 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -34,8 +34,6 @@
 #include <main.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdUrgency::CmdUrgency ()
 {
@@ -62,7 +60,7 @@ int CmdUrgency::execute (std::string& output)
 
   if (filtered.size () == 0)
   {
-    context.footnote ("No tasks specified.");
+    Context::getContext ().footnote ("No tasks specified.");
     return 1;
   }
 
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index 46560ee9e..77706a3ad 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -36,8 +36,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 CmdVersion::CmdVersion ()
 {
@@ -60,7 +58,7 @@ int CmdVersion::execute (std::string& output)
   std::stringstream out;
 
   // Create a table for the disclaimer.
-  int width = context.getWidth ();
+  int width = Context::getContext ().getWidth ();
   Table disclaimer;
   disclaimer.width (width);
   disclaimer.add ("");
@@ -73,7 +71,7 @@ int CmdVersion::execute (std::string& output)
   link.set (link.addRow (), 0, "Documentation for Taskwarrior can be found using 'man task', 'man taskrc', 'man task-color', 'man task-sync' or at http://taskwarrior.org");
 
   Color bold;
-  if (context.color ())
+  if (Context::getContext ().color ())
     bold = Color ("bold");
 
   out << '\n'
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 79c7583e0..830c81a13 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -90,8 +90,6 @@
 #include <ColProject.h>
 #include <ColDue.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 void Command::factory (std::map <std::string, Command*>& all)
 {
@@ -174,7 +172,7 @@ void Command::factory (std::map <std::string, Command*>& all)
 
   // Instantiate a command object for each custom report.
   std::vector <std::string> reports;
-  for (auto &i : context.config)
+  for (auto &i : Context::getContext ().config)
   {
     if (i.first.substr (0, 7) == "report.")
     {
@@ -194,7 +192,7 @@ void Command::factory (std::map <std::string, Command*>& all)
     c = new CmdCustom (
               report,
               "task <filter> " + report,
-              context.config.get ("report." + report + ".description"));
+              Context::getContext ().config.get ("report." + report + ".description"));
 
     all[c->keyword ()] = c;
   }
@@ -334,8 +332,8 @@ bool Command::permission (
 
   // What remains are write commands that have not yet selected 'all' or 'quit'.
   // Describe the task.
-  bool         confirmation = context.config.getBoolean ("confirmation");
-  unsigned int bulk         = context.config.getInteger ("bulk");
+  bool         confirmation = Context::getContext ().config.getBoolean ("confirmation");
+  unsigned int bulk         = Context::getContext ().config.getInteger ("bulk");
 
   // Quantity 1 modifications have optional confirmation, and only (y/n).
   if (quantity == 1)
@@ -353,7 +351,7 @@ bool Command::permission (
   if ((bulk == 0 || quantity < bulk) && (!_needs_confirm || !confirmation))
     return true;
 
-  if (context.verbose ("blank") && !_first_iteration)
+  if (Context::getContext ().verbose ("blank") && !_first_iteration)
     std::cout << '\n';
   int answer = confirm4 (question);
   _first_iteration = false;
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 55c972981..af51f314e 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -36,15 +36,13 @@
 
 #define STRING_DEPEND_BLOCKED        "Task {1} is blocked by:"
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 std::vector <Task> dependencyGetBlocked (const Task& task)
 {
   auto uuid = task.get ("uuid");
 
   std::vector <Task> blocked;
-  for (auto& it : context.tdb2.pending.get_tasks ())
+  for (auto& it : Context::getContext ().tdb2.pending.get_tasks ())
     if (it.getStatus () != Task::completed &&
         it.getStatus () != Task::deleted   &&
         it.has ("depends")                 &&
@@ -61,7 +59,7 @@ std::vector <Task> dependencyGetBlocking (const Task& task)
 
   std::vector <Task> blocking;
   if (depends != "")
-    for (auto& it : context.tdb2.pending.get_tasks ())
+    for (auto& it : Context::getContext ().tdb2.pending.get_tasks ())
       if (it.getStatus () != Task::completed &&
           it.getStatus () != Task::deleted   &&
           depends.find (it.get ("uuid")) != std::string::npos)
@@ -95,7 +93,7 @@ bool dependencyIsCircular (const Task& task)
       // fact that we do not visit any task twice
       for (unsigned int i = 0; i < deps_current.size (); i++)
       {
-        if (context.tdb2.get (deps_current[i], current))
+        if (Context::getContext ().tdb2.get (deps_current[i], current))
         {
           auto current_uuid = current.get ("uuid");
 
@@ -160,7 +158,7 @@ void dependencyChainOnComplete (Task& task)
     auto blocked = dependencyGetBlocked (task);
 
     // Nag about broken chain.
-    if (context.config.getBoolean ("dependency.reminder"))
+    if (Context::getContext ().config.getBoolean ("dependency.reminder"))
     {
       std::cout << format (STRING_DEPEND_BLOCKED, task.identifier ())
                 << '\n';
@@ -172,7 +170,7 @@ void dependencyChainOnComplete (Task& task)
     // If there are both blocking and blocked tasks, the chain is broken.
     if (blocked.size ())
     {
-      if (context.config.getBoolean ("dependency.reminder"))
+      if (Context::getContext ().config.getBoolean ("dependency.reminder"))
       {
         std::cout << "and is blocking:\n";
 
@@ -180,7 +178,7 @@ void dependencyChainOnComplete (Task& task)
           std::cout << "  " << b.id << ' ' << b.get ("description") << '\n';
       }
 
-      if (!context.config.getBoolean ("dependency.confirmation") ||
+      if (!Context::getContext ().config.getBoolean ("dependency.confirmation") ||
           confirm ("Would you like the dependency chain fixed?"))
       {
         // Repair the chain - everything in blocked should now depend on
@@ -195,10 +193,10 @@ void dependencyChainOnComplete (Task& task)
 
         // Now update TDB2, now that the updates have all occurred.
         for (auto& left : blocked)
-          context.tdb2.modify (left);
+          Context::getContext ().tdb2.modify (left);
 
         for (auto& right : blocking)
-          context.tdb2.modify (right);
+          Context::getContext ().tdb2.modify (right);
       }
     }
   }
@@ -207,7 +205,7 @@ void dependencyChainOnComplete (Task& task)
 ////////////////////////////////////////////////////////////////////////////////
 void dependencyChainOnStart (Task& task)
 {
-  if (context.config.getBoolean ("dependency.reminder"))
+  if (Context::getContext ().config.getBoolean ("dependency.reminder"))
   {
     auto blocking = dependencyGetBlocking (task);
 
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 03f7875a0..d656494c2 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -40,8 +40,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 static void countTasks (const std::vector <Task>&, const std::string&, int&, int&);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -242,16 +240,16 @@ std::string taskInfoDifferences (
 ////////////////////////////////////////////////////////////////////////////////
 std::string renderAttribute (const std::string& name, const std::string& value, const std::string& format /* = "" */)
 {
-  if (context.columns.find (name) != context.columns.end ())
+  if (Context::getContext ().columns.find (name) != Context::getContext ().columns.end ())
   {
-    Column* col = context.columns[name];
+    Column* col = Context::getContext ().columns[name];
     if (col                    &&
         col->type () == "date" &&
         value != "")
     {
       Datetime d ((time_t)strtol (value.c_str (), NULL, 10));
       if (format == "")
-        return d.toString (context.config.get ("dateformat"));
+        return d.toString (Context::getContext ().config.get ("dateformat"));
 
       return d.toString (format);
     }
@@ -265,7 +263,7 @@ std::string renderAttribute (const std::string& name, const std::string& value,
 //    <string>
 void feedback_affected (const std::string& effect)
 {
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
     std::cout << effect << "\n";
 }
 
@@ -277,7 +275,7 @@ void feedback_affected (const std::string& effect)
 //    {1}    Quantity
 void feedback_affected (const std::string& effect, int quantity)
 {
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
     std::cout << format (effect, quantity)
               << "\n";
 }
@@ -291,7 +289,7 @@ void feedback_affected (const std::string& effect, int quantity)
 //    {2}    Description
 void feedback_affected (const std::string& effect, const Task& task)
 {
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
   {
     std::cout << format (effect,
                          task.identifier (true),
@@ -344,7 +342,7 @@ void feedback_reserved_tags (const std::string& tag)
 // Implements feedback when adding special tags to a task.
 void feedback_special_tags (const Task& task, const std::string& tag)
 {
-  if (context.verbose ("special"))
+  if (Context::getContext ().verbose ("special"))
   {
     std::string msg;
     std::string explanation;
@@ -370,7 +368,7 @@ void feedback_special_tags (const Task& task, const std::string& tag)
 //    Unblocked <id> '<description>'
 void feedback_unblocked (const Task& task)
 {
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
   {
     // Get a list of tasks that depended on this task.
     auto blocked = dependencyGetBlocked (task);
@@ -402,18 +400,18 @@ void feedback_unblocked (const Task& task)
 ///////////////////////////////////////////////////////////////////////////////
 void feedback_backlog ()
 {
-  if (context.config.get ("taskd.server") != "" &&
-      context.verbose ("sync"))
+  if (Context::getContext ().config.get ("taskd.server") != "" &&
+      Context::getContext ().verbose ("sync"))
   {
     int count = 0;
-    std::vector <std::string> lines = context.tdb2.backlog.get_lines ();
+    std::vector <std::string> lines = Context::getContext ().tdb2.backlog.get_lines ();
     for (auto& line : lines)
       if ((line)[0] == '{')
         ++count;
 
     if (count)
-      context.footnote (format (count > 1 ?  "There are {1} local changes.  Sync required."
-                                          : "There is {1} local change.  Sync required.", count));
+      Context::getContext ().footnote (format (count > 1 ?  "There are {1} local changes.  Sync required."
+                                                         : "There is {1} local change.  Sync required.", count));
   }
 }
 
@@ -432,7 +430,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
     // Count pending and done tasks, for this project.
     int count_pending = 0;
     int count_done = 0;
-    std::vector <Task> all = context.tdb2.all_tasks ();
+    std::vector <Task> all = Context::getContext ().tdb2.all_tasks ();
     countTasks (all, project, count_pending, count_done);
 
     // count_done  count_pending  percentage
@@ -481,7 +479,7 @@ std::string onExpiration (Task& task)
 {
   std::stringstream msg;
 
-  if (context.verbose ("affected"))
+  if (Context::getContext ().verbose ("affected"))
     msg << format ("Task {1} '{2}' expired and was deleted.",
                    task.identifier (true),
                    task.get ("description"));
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 35ee0783a..5f8426028 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -32,8 +32,6 @@
 
 #define STRING_LEGACY_PRIORITY "Legacy attribute found.  Please change '{1}' to '{2}'."
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 void legacyColumnMap (std::string& name)
 {
@@ -57,7 +55,7 @@ void legacyColumnMap (std::string& name)
   auto found = legacyMap.find (name);
   if (found != legacyMap.end ())
   {
-    context.footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
+    Context::getContext ().footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
     name = found->second;
   }
 }
@@ -85,7 +83,7 @@ void legacySortColumnMap (std::string& name)
   auto found = legacyMap.find (name);
   if (found != legacyMap.end ())
   {
-    context.footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
+    Context::getContext ().footnote (format (STRING_LEGACY_PRIORITY, name, found->second));
     name = found->second;
   }
 }
@@ -94,7 +92,7 @@ void legacySortColumnMap (std::string& name)
 std::string legacyCheckForDeprecatedVariables ()
 {
   std::vector <std::string> deprecated;
-  for (auto& it : context.config)
+  for (auto& it : Context::getContext ().config)
   {
     // 2014-07-04: report.*.limit removed.
     // 2016-02-24: alias._query removed.
@@ -135,12 +133,12 @@ std::string legacyCheckForDeprecatedVariables ()
 std::string legacyCheckForDeprecatedColumns ()
 {
   std::vector <std::string> deprecated;
-  for (auto& it : context.config)
+  for (auto& it : Context::getContext ().config)
   {
     if (it.first.find ("report") == 0)
     {
       // Deprecated in 2.0.0
-      std::string value = context.config.get (it.first);
+      std::string value = Context::getContext ().config.get (it.first);
       if (value.find ("entry_time") != std::string::npos ||
           value.find ("start_time") != std::string::npos ||
           value.find ("end_time")   != std::string::npos)
@@ -156,7 +154,7 @@ std::string legacyCheckForDeprecatedColumns ()
     out << "Your .taskrc file contains reports with deprecated columns.  Please check for entry_time, start_time or end_time in:\n";
 
     for (const auto& dep : deprecated)
-      out << "  " << dep << "=" << context.config.get (dep) << "\n";
+      out << "  " << dep << "=" << Context::getContext ().config.get (dep) << "\n";
 
     out << "\n";
   }
diff --git a/src/main.cpp b/src/main.cpp
index 0c5133185..f3778c22c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,13 +30,14 @@
 #include <cstring>
 #include <Context.h>
 
-Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 int main (int argc, const char** argv)
 {
   int status {0};
 
+  Context globalContext;
+  Context::setContext (&globalContext);
+
   // Lightweight version checking that doesn't require initialization or any I/O.
   if (argc == 2 && !strcmp (argv[1], "--version"))
   {
@@ -46,9 +47,9 @@ int main (int argc, const char** argv)
   {
     try
     {
-      status = context.initialize (argc, argv);
+      status = Context::getContext ().initialize (argc, argv);
       if (status == 0)
-        status = context.run ();
+        status = Context::getContext ().run ();
     }
 
     catch (const std::string& error)
diff --git a/src/nag.cpp b/src/nag.cpp
index ab0a7b209..3e06e5746 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -27,8 +27,6 @@
 #include <cmake.h>
 #include <Context.h>
 
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // Returns a Boolean indicator as to whether a nag message was generated, so
 // that commands can control the number of nag messages displayed (ie one is
@@ -42,18 +40,18 @@ bool nag (Task& task)
   if (task.hasTag ("nonag"))
     return false;
 
-  auto msg = context.config.get ("nag");
+  auto msg = Context::getContext ().config.get ("nag");
   if (msg != "")
   {
     // Scan all pending, non-recurring tasks.
-    auto pending = context.tdb2.pending.get_tasks ();
+    auto pending = Context::getContext ().tdb2.pending.get_tasks ();
     for (auto& t : pending)
     {
       if ((t.getStatus () == Task::pending ||
            t.getStatus () == Task::waiting) &&
           t.urgency () > task.urgency ())
       {
-        context.footnote (msg);
+        Context::getContext ().footnote (msg);
         return true;
       }
     }
diff --git a/src/recur.cpp b/src/recur.cpp
index ab2c3c872..0381b1ee3 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -46,9 +46,6 @@
 #include <util.h>
 #include <main.h>
 
-// Global context for use by all.
-extern Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 // Scans all tasks, and for any recurring tasks, determines whether any new
 // child tasks need to be generated to fill gaps.
@@ -56,10 +53,10 @@ void handleRecurrence ()
 {
   // Recurrence can be disabled.
   // Note: This is currently a workaround for TD-44, TW-1520.
-  if (! context.config.getBoolean ("recurrence"))
+  if (! Context::getContext ().config.getBoolean ("recurrence"))
     return;
 
-  auto tasks = context.tdb2.pending.get_tasks ();
+  auto tasks = Context::getContext ().tdb2.pending.get_tasks ();
   Datetime now;
 
   // Look at all tasks and find any recurring ones.
@@ -74,8 +71,8 @@ void handleRecurrence ()
       {
         // Determine the end date.
         t.setStatus (Task::deleted);
-        context.tdb2.modify (t);
-        context.footnote (onExpiration (t));
+        Context::getContext ().tdb2.modify (t);
+        Context::getContext ().footnote (onExpiration (t));
         continue;
       }
 
@@ -93,7 +90,7 @@ void handleRecurrence ()
 
           Task rec (t);                          // Clone the parent.
           rec.setStatus (Task::pending);         // Change the status.
-          rec.id = context.tdb2.next_id ();      // New ID.
+          rec.id = Context::getContext ().tdb2.next_id ();      // New ID.
           rec.set ("uuid", uuid ());             // New UUID.
           rec.set ("parent", t.get ("uuid"));    // Remember mom.
           rec.setAsNow ("entry");                // New entry date.
@@ -118,7 +115,7 @@ void handleRecurrence ()
           rec.remove ("mask");                   // Remove the mask of the parent.
 
           // Add the new task to the DB.
-          context.tdb2.add (rec);
+          Context::getContext ().tdb2.add (rec);
         }
 
         ++i;
@@ -128,10 +125,10 @@ void handleRecurrence ()
       if (changed)
       {
         t.set ("mask", mask);
-        context.tdb2.modify (t);
+        Context::getContext ().tdb2.modify (t);
 
-        if (context.verbose ("recur"))
-          context.footnote (format ("Creating recurring task instance '{1}'", t.get ("description")));
+        if (Context::getContext ().verbose ("recur"))
+          Context::getContext ().footnote (format ("Creating recurring task instance '{1}'", t.get ("description")));
       }
     }
 
@@ -171,7 +168,7 @@ bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
     specificEnd = true;
   }
 
-  auto recurrence_limit = context.config.getInteger ("recurrence.limit");
+  auto recurrence_limit = Context::getContext ().config.getInteger ("recurrence.limit");
   int recurrence_counter = 0;
   Datetime now;
   for (Datetime i = due; ; i = getNextRecurrence (i, recur))
@@ -382,7 +379,7 @@ void updateRecurrenceMask (Task& task)
   Task parent;
 
   if (uuid != "" &&
-      context.tdb2.get (uuid, parent))
+      Context::getContext ().tdb2.get (uuid, parent))
   {
     unsigned int index = strtol (task.get ("imask").c_str (), NULL, 10);
     auto mask = parent.get ("mask");
@@ -408,7 +405,7 @@ void updateRecurrenceMask (Task& task)
     }
 
     parent.set ("mask", mask);
-    context.tdb2.modify (parent);
+    Context::getContext ().tdb2.modify (parent);
   }
 }
 
diff --git a/src/rules.cpp b/src/rules.cpp
index ae4df2db1..8517f5a5e 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -31,8 +31,6 @@
 #include <shared.h>
 #include <main.h>
 
-extern Context context;
-
 static std::map <std::string, Color> gsColor;
 static std::vector <std::string> gsPrecedence;
 static Datetime now;
@@ -41,7 +39,7 @@ static Datetime now;
 void initializeColorRules ()
 {
   // If color is not enable/supported, short circuit.
-  if (! context.color ())
+  if (! Context::getContext ().color ())
     return;
 
   try
@@ -52,7 +50,7 @@ void initializeColorRules ()
     // Load all the configuration values, filter to only the ones that begin with
     // "color.", then store name/value in gsColor, and name in rules.
     std::vector <std::string> rules;
-    for (const auto& v : context.config)
+    for (const auto& v : Context::getContext ().config)
     {
       if (! v.first.compare (0, 6, "color.", 6))
       {
@@ -66,7 +64,7 @@ void initializeColorRules ()
     // Load the rule.precedence.color list, split it, then autocomplete against
     // the 'rules' vector loaded above.
     std::vector <std::string> results;
-    auto precedence = split (context.config.get ("rule.precedence.color"), ',');
+    auto precedence = split (Context::getContext ().config.get ("rule.precedence.color"), ',');
 
     for (const auto& p : precedence)
     {
@@ -81,7 +79,7 @@ void initializeColorRules ()
 
   catch (const std::string& e)
   {
-    context.error (e);
+    Context::getContext ().error (e);
   }
 }
 
@@ -149,7 +147,7 @@ static void colorizeTag (Task& task, const std::string& rule, const Color& base,
 static void colorizeProject (Task& task, const std::string& rule, const Color& base, Color& c, bool merge)
 {
   // Observe the case sensitivity setting.
-  bool sensitive = context.config.getBoolean ("search.case.sensitive");
+  bool sensitive = Context::getContext ().config.getBoolean ("search.case.sensitive");
 
   auto project = task.get ("project");
   auto rule_trunc = rule.substr (14);
@@ -178,7 +176,7 @@ static void colorizeTagNone (Task& task, const Color& base, Color& c, bool merge
 static void colorizeKeyword (Task& task, const std::string& rule, const Color& base, Color& c, bool merge)
 {
   // Observe the case sensitivity setting.
-  auto sensitive = context.config.getBoolean ("search.case.sensitive");
+  auto sensitive = Context::getContext ().config.getBoolean ("search.case.sensitive");
 
   // The easiest thing to check is the description, because it is just one
   // attribute.
@@ -286,14 +284,14 @@ static void colorizeDeleted (Task& task, const Color& base, Color& c, bool merge
 void autoColorize (Task& task, Color& c)
 {
   // The special tag 'nocolor' overrides all auto and specific colorization.
-  if (! context.color () ||
+  if (! Context::getContext ().color () ||
       task.hasTag ("nocolor"))
   {
     c = Color ();
     return;
   }
 
-  auto merge = context.config.getBoolean ("rule.color.merge");
+  auto merge = Context::getContext ().config.getBoolean ("rule.color.merge");
 
   // Note: c already contains colors specifically assigned via command.
   // Note: These rules form a hierarchy - the last rule is King, hence the
diff --git a/src/sort.cpp b/src/sort.cpp
index 8dae4a339..ef1fb1950 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -35,8 +35,6 @@
 #include <shared.h>
 #include <format.h>
 
-extern Context context;
-
 static std::vector <Task>* global_data = NULL;
 static std::vector <std::string> global_keys;
 static bool sort_compare (int, int);
@@ -58,7 +56,7 @@ void sort_tasks (
   if (order.size ())
     std::stable_sort (order.begin (), order.end (), sort_compare);
 
-  context.time_sort_us += timer.total_us ();
+  Context::getContext ().time_sort_us += timer.total_us ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -79,7 +77,7 @@ static bool sort_compare (int left, int right)
 
   for (auto& k : global_keys)
   {
-    context.decomposeSortField (k, field, ascending, breakIndicator);
+    Context::getContext ().decomposeSortField (k, field, ascending, breakIndicator);
 
     // Urgency.
     if (field == "urgency")
@@ -170,8 +168,8 @@ static bool sort_compare (int left, int right)
         return !ascending;
 
       // Sort on the first dependency.
-      left_number  = context.tdb2.id (left_string.substr (0, 36));
-      right_number = context.tdb2.id (right_string.substr (0, 36));
+      left_number  = Context::getContext ().tdb2.id (left_string.substr (0, 36));
+      right_number = Context::getContext ().tdb2.id (right_string.substr (0, 36));
 
       if (left_number == right_number)
         continue;
@@ -196,7 +194,7 @@ static bool sort_compare (int left, int right)
     }
 
     // UDAs.
-    else if ((column = context.columns[field]) != NULL)
+    else if ((column = Context::getContext ().columns[field]) != NULL)
     {
       std::string type = column->type ();
       if (type == "numeric")
diff --git a/src/util.cpp b/src/util.cpp
index 1f9222cb8..0f4c9a09a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -63,8 +63,6 @@
 #define STRING_UTIL_CONFIRM_ALL_U    "All"
 #define STRING_UTIL_CONFIRM_QUIT     "quit"
 
-extern Context context;
-
 static const char* newline = "\n";
 static const char* noline  = "";
 
@@ -107,7 +105,7 @@ int confirm4 (const std::string& question)
 
     std::string answer {""};
     std::getline (std::cin, answer);
-    context.debug ("STDIN '" + answer + '\'');
+    Context::getContext ().debug ("STDIN '" + answer + '\'');
     answer = std::cin.eof () ? STRING_UTIL_CONFIRM_QUIT : Lexer::lowerCase (Lexer::trim (answer));
     autoComplete (answer, options, matches, 1); // Hard-coded 1.
   }
@@ -278,32 +276,32 @@ bool nontrivial (const std::string& input)
 ////////////////////////////////////////////////////////////////////////////////
 const char* optionalBlankLine ()
 {
-  return context.verbose ("blank") ? newline : noline;
+  return Context::getContext ().verbose ("blank") ? newline : noline;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void setHeaderUnderline (Table& table)
 {
   // If an alternating row color is specified, notify the table.
-  if (context.color ())
+  if (Context::getContext ().color ())
   {
-    Color alternate (context.config.get ("color.alternate"));
+    Color alternate (Context::getContext ().config.get ("color.alternate"));
     table.colorOdd (alternate);
     table.intraColorOdd (alternate);
 
-    if (context.config.getBoolean ("fontunderline"))
+    if (Context::getContext ().config.getBoolean ("fontunderline"))
     {
-      table.colorHeader (Color ("underline " + context.config.get ("color.label")));
+      table.colorHeader (Color ("underline " + Context::getContext ().config.get ("color.label")));
     }
     else
     {
-      table.colorHeader (Color (context.config.get ("color.label")));
+      table.colorHeader (Color (Context::getContext ().config.get ("color.label")));
       table.underlineHeaders ();
     }
   }
   else
   {
-    if (context.config.getBoolean ("fontunderline"))
+    if (Context::getContext ().config.getBoolean ("fontunderline"))
       table.colorHeader (Color ("underline"));
     else
       table.underlineHeaders ();
diff --git a/test/col.t.cpp b/test/col.t.cpp
index e750239e8..d65ad891c 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -30,8 +30,6 @@
 #include <main.h>
 #include <test.h>
 
-Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 5296282dc..398dd9d01 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -25,13 +25,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <iostream> // TODO Remove.
 #include <test.h>
 #include <DOM.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 bool providerString (const std::string& path, Variant& var)
@@ -72,7 +68,7 @@ int main (int, char**)
   dom.addSource ("name.next", &providerString);
   dom.addSource ("name.size", &providerString);
   dom.addSource ("foo",       &providerString);
-  std::cout << dom.dump () << '\n';
+  t.diag (dom.dump ());
   t.is (dom.count (), 4,               "DOM now contains 4 nodes");
 
   t.ok    (dom.valid ("name"),         "DOM 'name' valid");
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 53f485224..907ce8fb5 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -27,9 +27,6 @@
 #include <cmake.h>
 #include <test.h>
 #include <Eval.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 // A few hard-coded symbols.
diff --git a/test/t.t.cpp b/test/t.t.cpp
index d6628ed8f..7aa3c3d1e 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -29,8 +29,6 @@
 #include <main.h>
 #include <test.h>
 
-Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 3acd11322..3ee45ae00 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -31,8 +31,6 @@
 #include <util.h>
 #include <test.h>
 
-Context context;
-
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index b0b1bf6f7..048f9c44d 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.001
 
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index 2055bb870..cbf1eb3a7 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 864e5783f..6ae0e4062 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.001
 
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index 1699b942a..7b2cd4515 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.0001
 
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index 21c9c2aa0..e8350f8de 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index 1514a0ebc..a1ef6bf5d 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index 9e641da61..35c591065 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index bbd718535..42937570c 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index ef6c84790..adced2a2e 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index 0804d50b2..e90b081b9 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index 9c02aabe3..e04f1cad0 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index 54e64f4d0..2a2440122 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -28,10 +28,8 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
 #include <Task.h>
 
-Context context;
 Task task;
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index 5c08da02a..6430e6f7e 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.001
 
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index 5a807d2b7..53d2037cb 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.0001
 
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index 1c006c1f8..506432418 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 #define EPSILON 0.0001
 
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index 2f22fa3d8..74861f055 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -28,10 +28,8 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
 #include <Task.h>
 
-Context context;
 Task task;
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index bf378fe11..c0908579b 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index d96d128aa..7f1a5e3a4 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index ee4086494..09e7cee0d 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index 83e1c2b07..382e296c0 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -28,10 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
-
 
 #define EPSILON 0.001
 
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index 154e287ca..15365f4a6 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
-#include <Context.h>
-
-Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)

From ae27a1b34349158b55310237d080a0468636ddb3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 3 Feb 2018 14:06:53 +0100
Subject: [PATCH 728/879] Eval: Eliminated string def

---
 src/Eval.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Eval.cpp b/src/Eval.cpp
index 53013f46b..51e52dc69 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -34,8 +34,6 @@
 #include <shared.h>
 #include <format.h>
 
-#define STRING_EVAL_NO_EVAL "The expression could not be evaluated."
-
 extern Task& contextTask;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -232,7 +230,7 @@ void Eval::evaluatePostfixStack (
         token.first == "!")
     {
       if (values.size () < 1)
-        throw std::string (STRING_EVAL_NO_EVAL);
+        throw std::string ("The expression could not be evaluated.");
 
       Variant right = values.back ();
       values.pop_back ();
@@ -245,7 +243,7 @@ void Eval::evaluatePostfixStack (
              token.first == "_neg_")
     {
       if (values.size () < 1)
-        throw std::string (STRING_EVAL_NO_EVAL);
+        throw std::string ("The expression could not be evaluated.");
 
       Variant right = values.back ();
       values.pop_back ();
@@ -269,7 +267,7 @@ void Eval::evaluatePostfixStack (
     else if (token.second == Lexer::Type::op)
     {
       if (values.size () < 2)
-        throw std::string (STRING_EVAL_NO_EVAL);
+        throw std::string ("The expression could not be evaluated.");
 
       Variant right = values.back ();
       values.pop_back ();

From a4c72238d0b5f5aed946cc42ec257a6adce92c1b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Feb 2018 09:45:02 +0100
Subject: [PATCH 729/879] Docs: Updated man page discussing rc.recurrence

---
 doc/man/taskrc.5.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 14ddd9df0..8b814eae3 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -69,7 +69,7 @@ Values support UTF8 as well as JSON encoding, such as \\uNNNN.
 
 Note that Taskwarrior is flexible about the values used to represent Boolean
 items. You can use "1" to enable, anything else is interpreted as disabled.
-The values "on", "yes", "y" and "true" are currently supported by deprecated.
+The values "on", "yes", "y" and "true" are currently supported but deprecated.
 
 .RS
 include <file>
@@ -450,6 +450,10 @@ The character or string to show in the <uda>.indicator column. Defaults to U.
 Controls whether recurrence is enabled, and whether recurring tasks continue to
 generate new task instances. Defaults to "1".
 
+If you are syncing multiple clients, then it is adviѕed that you set 'recurrence=1'
+on your primary client, and 'recurrence=0' on ALL other clients. This is a workaround
+for a duplication bug.
+
 .TP
 .B recurrence.confirmation=prompt
 Controls whether changes to recurring tasks propagates to other child tasks with

From 6db06524b18dd135dc06fcab610cf239061420cc Mon Sep 17 00:00:00 2001
From: buhtz <c.buhtz@posteo.jp>
Date: Sun, 4 Feb 2018 23:06:58 +0100
Subject: [PATCH 730/879] URL formating

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a8d83f66b..6e08018d5 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
 Source project. Take a look at the site:
 
-    http://taskwarrior.org
+http://taskwarrior.org
 
 There you'll find online documentation, downloads, news and more.
 
@@ -31,11 +31,11 @@ input is needed.
 
 For support options, take a look at:
 
-    http://taskwarrior.org/support
+http://taskwarrior.org/support
 
 Please send your code patches to:
 
-    support@taskwarrior.org
+support@taskwarrior.org
 
 Consider joining bug.tasktools.org and participating in the future of Taskwarrior.
 

From cf4249697003621b616d78c3f35a1760964901d8 Mon Sep 17 00:00:00 2001
From: Lynoure Braakman <lynoure@gmail.com>
Date: Tue, 6 Feb 2018 19:13:01 +0100
Subject: [PATCH 731/879] Update and rename DEVELOPER to DEVELOPER.md

Rough markdownification, no content changes
---
 DEVELOPER => DEVELOPER.md | 83 ++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 40 deletions(-)
 rename DEVELOPER => DEVELOPER.md (74%)

diff --git a/DEVELOPER b/DEVELOPER.md
similarity index 74%
rename from DEVELOPER
rename to DEVELOPER.md
index f3a800f7e..70414b45f 100644
--- a/DEVELOPER
+++ b/DEVELOPER.md
@@ -1,13 +1,13 @@
-How to Build Taskwarrior
+# How to Build Taskwarrior
 
-  Satisfy the Requirements:
-    - gcc 4.9 or later, clang 3.4 or later, or a compiler with full C++11
-      support.
-    - libuuid (if not on macOS)
-    - gnutls (optional)
-    - python 2.7 or 3 (optional, for running the test suite)
+## Satisfy the Requirements:
+ * gcc 4.9 or later, clang 3.4 or later, or a compiler with full C++11 support.
+ * libuuid (if not on macOS)
+ * gnutls (optional)
+ * python 2.7 or 3 (optional, for running the test suite)
 
-  Obtain and build code:
+## Obtain and build code:
+```
     $ git clone --recursive https://git.tasktools.org/TM/task.git task.git
     $ cd task.git
     $ git checkout 2.5.2                 # Latest dev branch
@@ -16,12 +16,15 @@ How to Build Taskwarrior
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
     $ make VERBOSE=1 -j4                 # Shows details, builds using 4 jobs
                                          # Alternately 'export MAKEFLAGS=-j 4'
+```
+## Running Test Suite:
 
-  Running Test Suite:
+```
     $ cd tests
     $ make VERBOSE=1                     # Shows details
     $ ./run_all                          # Runs all tests silently > all.log
     $ ./problems                         # Enumerate test failures in all.log
+```
 
   Note that any development should be performed using a git clone, and the
   current development branch. The source tarballs do not reflect HEAD, and do
@@ -32,46 +35,46 @@ How to Build Taskwarrior
   against the tarball source, or master.
 
 
-General Statement
+# General Statement
   This file is intended to convey the current efforts, priorities and needs of
   the code base. It is for anyone looking for a way to start contributing.
   Here are many ways to contribute that may not be obvious:
 
-  - Use Taskwarrior, become familiar with it, and make suggestions. There are
+  * Use Taskwarrior, become familiar with it, and make suggestions. There are
     always ongoing discussions about new features and changes to existing
     features.
 
-  - Join us in the #taskwarrior IRC channel on freenode.net. Many great ideas,
+  * Join us in the #taskwarrior IRC channel on freenode.net. Many great ideas,
     suggestions, testing and discussions have taken place there. It is also
     the quickest way to get help, or confirm a bug.
 
-  - Review documentation: there are man pages, online articles, tutorials and
+  * Review documentation: there are man pages, online articles, tutorials and
     so on, and these may contain errors, or they may not convey ideas in the
     best way. Perhaps you can help improve it. Contact us - documentation is
     a separate effort from the code base, and includes all web sites, and all
     are available as git repositories.
 
-  - Take a look at the bug database, and help triage the bug list. This is a
+  * Take a look at the bug database, and help triage the bug list. This is a
     review process that involves confirming bugs, providing additional data,
     information or analysis. Bug triage is very useful and much needed. You
     could check to see that an old bug is still relevant - sometimes they are
     not.
 
-  - Review the source code, and point out inefficiencies, problems, unreadable
+  * Review the source code, and point out inefficiencies, problems, unreadable
     functions, bugs and assumptions.
 
-  - Fix a bug. For this you'll need C++ and Git skills. We welcome all bug
+  * Fix a bug. For this you'll need C++ and Git skills. We welcome all bug
     fixes, provided the work is done well and doesn't create other problems or
     introduce new dependencies. We recommend talking to us before starting.
     Seriously.
 
-  - Add unit tests. Unit tests are possibly the most useful contributions of
+  * Add unit tests. Unit tests are possibly the most useful contributions of
     all, because they not only improve the quality of the code, but prevent
     future regressions, therefore maintaining quality of subsequent releases.
     Plus, broken tests are a great motivator for us to fix the causal defect.
     You'll need Python skills.
 
-  - Add a feature. Well, let's be very clear about this: adding a feature is
+  * Add a feature. Well, let's be very clear about this: adding a feature is
     not usually well-received, and if you add a feature and send a patch, it
     will most likely be rejected. The reason for this is that there are many
     efforts under way, in various code branches. There is a very good chance
@@ -82,57 +85,57 @@ 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.
 
-  - Spread the word. Help others become more effective at managing tasks.
+  * Spread the word. Help others become more effective at managing tasks.
 
-  - Encouragement. Tell us what works for you, and what doesn't. Tell us about
+  * Encouragement. Tell us what works for you, and what doesn't. Tell us about
     your methodology for managing tasks. It's all useful information.
 
-  - Request a feature. This not only tells us that you think something is
+  * Request a feature. This not only tells us that you think something is
     missing from the software, but gives us insights into how you use it.
     Plus, you might get your feature implemented.
 
-Unit Tests Needed
+# Unit Tests Needed
   There are always more unit tests needed. More specifically, better unit tests
   are always needed. The convention is that there are four types of unit test:
 
   1. High level tests that exercise large features, or combinations of commands.
      For example, dependencies.t runs through a long list of commands that test
      dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
-  2. Regression tests that ensure certain bugs are fixed and stay fixed. These
+  1. Regression tests that ensure certain bugs are fixed and stay fixed. These
      tests are named tw-NNNN.t where NNNN refers to the bug number. While it is
      not worth creating tests for small fixes like typos, it is for logic
      changes.
-  3. Small feature tests. When small features are added, we would like small,
+  1. Small feature tests. When small features are added, we would like small,
      low-level feature tests named feature.t, with a descriptive name and
      focused tests.
-  4. Code tests. These are tests written in C++ that exercise C++ objects, or
+  1. Code tests. These are tests written in C++ that exercise C++ objects, or
      function calls. These are the lowest level tests. It is important that
      these kind of tests be extensive and thorough, because the software depends
      on this code the most.
 
   The tests are written in Python, Bash and C++, and all use TAP.
 
-  Tests needed:
+## Tests needed
 
-  - Take a look at the bug database (https://bug.tasktools.org) and notice that
+  * Take a look at the bug database (https://bug.tasktools.org) and notice that
     many issues, open and closed, have the "needsTest" label. These are things
     that we would like to see in the test suite, as regression tests.
 
   All new unit tests should follow the test/template.t standard.
 
-Patches
+# Patches
   Patches are encouraged and welcomed. Either attach them to the appropriate
   Jira issue, or send them to support@taskwarrior.org. A good patch:
 
-    - Maintains the MIT license, and does not contain code lifted from other
+    * Maintains the MIT license, and does not contain code lifted from other
       sources. You will have written 100% of the code in the patch, otherwise
       we cannot maintain the license.
-    - Precisely addresses one issue only.
-    - Doesn't break unit tests.
-    - Doesn't introduce dependencies.
-    - Is accompanied by unit tests, where appropriate.
-    - Is accompanied by documentation changes, where appropriate.
-    - Conforms to the prevailing coding standards - in other words, it should
+    * Precisely addresses one issue only.
+    * Doesn't break unit tests.
+    * Doesn't introduce dependencies.
+    * Is accompanied by unit tests, where appropriate.
+    * Is accompanied by documentation changes, where appropriate.
+    * Conforms to the prevailing coding standards - in other words, it should
       fit in with the existing code.
 
   A patch may be rejected for violating any of the above rules, and more.
@@ -141,13 +144,13 @@ Patches
   plans or upcoming changes. Check with us first, before sinking time and effort
   into a patch.
 
-Current Code Base Condition
+# Current Code Base Condition
 
-  'master' branch:
-    - 2.5.1 Current release, locked.
+**'master' branch**:
+ * 2.5.1 Current release, locked.
 
-  '2.6.0' branch:
-    - Current development branch no plans yet.
+ **'2.6.0' branch**:
+  * Current development branch no plans yet.
 
 ---
 

From ea4a23654f1cfba711c5dfed68e02ea2d595fee8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 08:32:58 -0500
Subject: [PATCH 732/879] Issues: Create issue-template.md

---
 .github/issue_template.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/issue_template.md

diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 000000000..ff212fa2a
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,9 @@
+### To Report a bug...
+
+#### Paste the output of the ```task diag``` command
+
+#### What command(s) did you run?
+
+#### What did you expect to happen?
+
+#### What actually happened?

From 36fac4efe1d38c8c78dadc3e0c5d9a84a5eee392 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 08:40:38 -0500
Subject: [PATCH 733/879] Docs: Updated URLs

---
 AUTHORS                 | 1 +
 DEVELOPER.md            | 9 ++++-----
 NEWS                    | 6 ++++--
 README.md               | 7 ++++---
 doc/man/task-color.5.in | 2 +-
 doc/man/task-sync.5.in  | 4 ++--
 doc/man/task.1.in       | 6 +++---
 doc/man/taskrc.5.in     | 7 +++----
 test/README             | 4 ++--
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index dd53e279d..791ad574a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -142,6 +142,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Paul J. Fenwick
   Michael Neumann
   Mark Scannell
+  buhtz
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 70414b45f..26cd6301d 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -18,7 +18,6 @@
                                          # Alternately 'export MAKEFLAGS=-j 4'
 ```
 ## Running Test Suite:
-
 ```
     $ cd tests
     $ make VERBOSE=1                     # Shows details
@@ -117,9 +116,10 @@
 
 ## Tests needed
 
-  * Take a look at the bug database (https://bug.tasktools.org) and notice that
-    many issues, open and closed, have the "needsTest" label. These are things
-    that we would like to see in the test suite, as regression tests.
+  * Take a look at the bug database (https://github.com/GothenburgBitFactory/taskwarrior/issues)
+    and notice that many issues, open and closed, have the "needsTest" label.
+    These are things that we would like to see in the test suite, as regression
+    tests.
 
   All new unit tests should follow the test/template.t standard.
 
@@ -153,5 +153,4 @@
   * Current development branch no plans yet.
 
 ---
-
 2018-05-13 Updated for 2.5.2
diff --git a/NEWS b/NEWS
index 43ab95e5f..7d28057e0 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,8 @@ Removed Features in 2.5.2
 
 Known Issues
 
+  - https://github.com/GothenburgBitFactory/taskwarrior
+
 Taskwarrior has been built and tested on the following configurations:
 
   * macOS
@@ -69,11 +71,11 @@ Taskwarrior has been built and tested on the following configurations:
 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:
 
-  https://bug.tasktools.org
+  https://github.com/GothenburgBitFactory/taskwarrior<Paste>
 
 Or just send a message to:
 
-  support@taskwarrior.org
+  support@GothenburgBitFactory.org
 
 Thank you.
 
diff --git a/README.md b/README.md
index 6e08018d5..da5552611 100644
--- a/README.md
+++ b/README.md
@@ -33,11 +33,12 @@ For support options, take a look at:
 
 http://taskwarrior.org/support
 
-Please send your code patches to:
+Please use pull requests, or send your code patches to:
 
-support@taskwarrior.org
+support@GothenburgBitFactory.org
 
-Consider joining bug.tasktools.org and participating in the future of Taskwarrior.
+Visit https://github.com/GothenburgBitFactory/taskwarrior and participate in
+the future of Taskwarrior.
 
 ---
 
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 5b2dd0470..236f3851b 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -321,7 +321,7 @@ The official site at
 
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
 You can contact the project by writing an email to
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index a8df1e42e..d58a1afbd 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -173,11 +173,11 @@ The official site at
 
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
 You can contact the project by writing an email to
-<support@taskwarrior.org>
+<support@gothenburgBitFactory.org>
 
 .SH REPORTING BUGS
 .TP
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 3e63b6660..520192832 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1324,13 +1324,13 @@ The official site at
 
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
 You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://bug.tasktools.org/>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 8b814eae3..06612dc3b 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1531,14 +1531,13 @@ The official site at
 
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
 You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://bug.tasktools.org/>
-
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
diff --git a/test/README b/test/README
index 8adb1f304..f38904a7f 100644
--- a/test/README
+++ b/test/README
@@ -91,8 +91,8 @@ If you wish to contribute tests, please consider the following guidelines:
     test script, such as filter.t, export.t, whichever is appropriate.
 
   * Tests created after bugs or feature requests should (ideally) have an entry
-    on https://bug.tasktools.org/ and should include the issue ID in a
-    docstring or comment.
+    on https://github.com/GothenburgBitFactory/taskwarrior/issues and should
+    include the issue ID in a docstring or comment.
 
   * Class and method names should be descriptive of what they are testing.
     Example: TestFilterOnReports

From 683141d14aef68d5ed0c1a8809b6417c302678b2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 08:44:19 -0500
Subject: [PATCH 734/879] Issues: /Updated template for feature requests

---
 .github/issue_template.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index ff212fa2a..995d151aa 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,9 +1,11 @@
-### To Report a bug...
+#### To report a bug...
 
-#### Paste the output of the ```task diag``` command
+* What command(s) did you run?
+* What did you expect to happen?
+* What actually happened?
+* Paste the output of the ```task diag``` command.
 
-#### What command(s) did you run?
+#### To request a feature...
 
-#### What did you expect to happen?
-
-#### What actually happened?
+* Clearly describe the feature.
+* Clearly state the use case. We are only interested in use cases, do not waste time with implementation details or suggested syntax.

From 0e38cdc4a99ac7a4d7b6b745f416841d1f8b8c82 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 08:49:57 -0500
Subject: [PATCH 735/879] Github: Added pull request template

---
 .github/pull_request_template.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..d17a07c60
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,6 @@
+#### Additional information...
+
+* Have you run the test suite?
+  Many changes need to be tested. Please run the test suite and include the output
+  of the ```cd test && ./problems``` script.
+

From f34b2e23cb0aae58526f326a82c74f919e483575 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 08:50:41 -0500
Subject: [PATCH 736/879] Github: typo

---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d17a07c60..eba55ea2b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,5 +2,5 @@
 
 * Have you run the test suite?
   Many changes need to be tested. Please run the test suite and include the output
-  of the ```cd test && ./problems``` script.
+  of the ```cd test && ./problems``` command.
 

From 3585d21a41f3e807379d510685e785311269b8f1 Mon Sep 17 00:00:00 2001
From: Dirk Deimeke <dirk@deimeke.net>
Date: Wed, 7 Feb 2018 14:57:47 +0100
Subject: [PATCH 737/879] Added Link to "How to request a feature"

---
 .github/issue_template.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 995d151aa..b65581ad7 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -9,3 +9,4 @@
 
 * Clearly describe the feature.
 * Clearly state the use case. We are only interested in use cases, do not waste time with implementation details or suggested syntax.
+* Please see our notes on [How to request a feature](https://taskwarrior.org/docs/features.html)

From a6833c62f8b8aeeb2f1e4e706fc32f04c9e59eae Mon Sep 17 00:00:00 2001
From: Federico Hernandez <recollir@users.noreply.github.com>
Date: Wed, 7 Feb 2018 15:02:43 +0100
Subject: [PATCH 738/879] Made the question a checkbox

To be checked off by the submitter.
---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index eba55ea2b..115a73f6c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 #### Additional information...
 
-* Have you run the test suite?
+* [ ] Have you run the test suite?  
   Many changes need to be tested. Please run the test suite and include the output
   of the ```cd test && ./problems``` command.
 

From e09699a0299517178640700c1e3846a80187a8c0 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <recollir@users.noreply.github.com>
Date: Wed, 7 Feb 2018 15:06:15 +0100
Subject: [PATCH 739/879] Reformatting

---
 .github/pull_request_template.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 115a73f6c..624e58b72 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,9 @@
+#### Description
+
+Replace this text with a description of the PR.
+
 #### Additional information...
 
-* [ ] Have you run the test suite?  
-  Many changes need to be tested. Please run the test suite and include the output
-  of the ```cd test && ./problems``` command.
-
+- [ ] Have you run the test suite?  
+  Many changes need to be tested. Please run the test suite.  
+  And include the output of ```cd test && ./problems```.

From 573ad560b62266e03e3b49a98e9fdba5ead3ae1f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 20:49:22 -0500
Subject: [PATCH 740/879] Templates: Combined two sentences for readability

---
 .github/pull_request_template.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 624e58b72..43476299b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,6 +4,6 @@ Replace this text with a description of the PR.
 
 #### Additional information...
 
-- [ ] Have you run the test suite?  
-  Many changes need to be tested. Please run the test suite.  
-  And include the output of ```cd test && ./problems```.
+- [ ] Have you run the test suite?
+  Many changes need to be tested. Please run the test suite
+  and include the output of ```cd test && ./problems```.

From 3a79bd908aa40e6a710090f31c57497e5b956ce7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 20:49:48 -0500
Subject: [PATCH 741/879] Docs: Updated README.md

- Thanks to Thomas Lauf
---
 README.md | 94 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index da5552611..66acdee8b 100644
--- a/README.md
+++ b/README.md
@@ -1,46 +1,82 @@
-# Disclaimer during ongoing development
-
-We want to discourage you from using the development version of Taskwarrior.
-
-The development branch is a work in progress and may not pass all quality tests,
-therefore it may harm your data. We do not guarantee proper or even adequate
-functionality, performance or timely fixes.
-
-We welcome bug reports from beta- and release-level software, but generally not
-development versions. If you are undaunted by this, please:
-
-- Make proper backups.
-- Expect broken and missing functionality.
-- Be aware that using the development branch involves risks.
-
----
+# Taskwarrior
 
 Thank you for taking a look at Taskwarrior!
 
 Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
-Source project. Take a look at the site:
+Source project.
 
-http://taskwarrior.org
+# Documentation
 
-There you'll find online documentation, downloads, news and more.
+There is extensive online documentation.
+You'll find all the details at:
 
-Your contributions are especially welcome. Whether it comes in the form of
-code patches, ideas, discussion, bug reports, encouragement or criticism, your
-input is needed.
+    http://taskwarrior.org/docs
+
+At the site you'll find online documentation, downloads, news and more.
+
+# Support
 
 For support options, take a look at:
 
-http://taskwarrior.org/support
+    http://taskwarrior.org/support
 
 Please use pull requests, or send your code patches to:
 
-support@GothenburgBitFactory.org
+    support@gothenburgbitfactory.org
 
-Visit https://github.com/GothenburgBitFactory/taskwarrior and participate in
-the future of Taskwarrior.
+# Branching Model
 
----
+We use the following branching model:
+
+* `master` is the stable branch. Building from here is the same as building
+  from the latest tarball, or installing a binary package. No development is
+  done on the `master` branch.
+
+* `2.6.0` is the current development branch. All work is done here, and upon
+  release it will be merged to `master`. This development branch is not stable,
+  may not even build or pass tests, and should be treated accordingly.
+  Make backups.
+
+# Installing
+
+There are many binary packages available, but to install from source requires:
+
+* git
+* cmake
+* make
+* C++ compiler, currently gcc 4.7+ or clang 3.3+ for full C++11 support
+
+Download the tarball, and expand it:
+
+    $ curl -O https://taskwarrior.org/download/task-2.5.1.tar.gz
+    $ tar xzf task-2.5.1.tar.gz
+    $ cd task-2.5.1
+
+Or clone this repository:
+
+    $ git clone --recursive -b 2.6.0 https://github.com/GothenburgBitFactory/taskwarrior.git
+    $ cd taskwarrior
+
+Then build:
+
+    $ cmake -DCMAKE_BUILD_TYPE=release .
+    ...
+    $ make
+    ...
+    [$ make test]
+    ...
+    $ sudo make install
+
+## Contributing
+
+Your contributions are especially welcome.
+Whether it comes in the form of code patches, ideas, discussion, bug reports, encouragement or criticism, your input is needed.
+
+Visit https://github.com/GothenburgBitFactory/taskwarrior and participate in the future of Taskwarrior.
+
+## License
+
+Taskwarrior is released under the MIT license.
+For details check the [LICENSE](LICENSE) file.
 
-Taskwarrior is released under the MIT license. For details check the LICENSE
-file.

From a9a60c4f9c83acee2987bb747141bc8b23656caa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 20:51:35 -0500
Subject: [PATCH 742/879] Docs: Fixed md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 66acdee8b..3166fe079 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
 Source project.
 
-# Documentation
+## Documentation
 
 There is extensive online documentation.
 You'll find all the details at:
@@ -15,7 +15,7 @@ You'll find all the details at:
 
 At the site you'll find online documentation, downloads, news and more.
 
-# Support
+## Support
 
 For support options, take a look at:
 
@@ -25,7 +25,7 @@ Please use pull requests, or send your code patches to:
 
     support@gothenburgbitfactory.org
 
-# Branching Model
+## Branching Model
 
 We use the following branching model:
 
@@ -38,7 +38,7 @@ We use the following branching model:
   may not even build or pass tests, and should be treated accordingly.
   Make backups.
 
-# Installing
+## Installing
 
 There are many binary packages available, but to install from source requires:
 

From 7410b01cadbf77efe17441d133f2d019ce0a48ef Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Feb 2018 20:54:41 -0500
Subject: [PATCH 743/879] Docs: Fixed md

---
 README.md | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 3166fe079..df97e9a84 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,16 @@ Source project.
 ## Documentation
 
 There is extensive online documentation.
-You'll find all the details at:
-
-    http://taskwarrior.org/docs
+You'll find all the details at [taskwarrior.org/docs](http://taskwarrior.org/docs)
 
 At the site you'll find online documentation, downloads, news and more.
 
 ## Support
 
-For support options, take a look at:
+For support options, take a look at [taskwarrior.org/support](http://taskwarrior.org/support)
 
-    http://taskwarrior.org/support
-
-Please use pull requests, or send your code patches to:
-
-    support@gothenburgbitfactory.org
+Please use pull requests, or alternately send your code patches to
+[support@gothenburgbitfactory.org](mailto:support@gothenburgbitfactory.org)
 
 ## Branching Model
 
@@ -73,7 +68,7 @@ Then build:
 Your contributions are especially welcome.
 Whether it comes in the form of code patches, ideas, discussion, bug reports, encouragement or criticism, your input is needed.
 
-Visit https://github.com/GothenburgBitFactory/taskwarrior and participate in the future of Taskwarrior.
+Visit [Github](https://github.com/GothenburgBitFactory/taskwarrior) and participate in the future of Taskwarrior.
 
 ## License
 

From eed9664173fb7b6f7b2875b6a247131c0e61d6d1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 8 Feb 2018 22:08:59 -0500
Subject: [PATCH 744/879] Docs: Updated URLs

---
 CMakeLists.txt          | 2 +-
 DEVELOPER.md            | 8 ++++----
 INSTALL                 | 2 +-
 cmake/CXXSniffer.cmake  | 2 +-
 doc/man/task-color.5.in | 2 +-
 test/README             | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cb6da8a4..f5a6b3e10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 
 set (PACKAGE "${PROJECT_NAME}")
 set (VERSION "${PROJECT_VERSION}")
-set (PACKAGE_BUGREPORT "support@taskwarrior.org")
+set (PACKAGE_BUGREPORT "support@gothenburgbitfactory.org")
 set (PACKAGE_NAME "${PACKAGE}")
 set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 26cd6301d..0adac537b 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -8,9 +8,9 @@
 
 ## Obtain and build code:
 ```
-    $ git clone --recursive https://git.tasktools.org/TM/task.git task.git
-    $ cd task.git
-    $ git checkout 2.5.2                 # Latest dev branch
+    $ git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior taskwarrior.git
+    $ cd taskwarrior.git
+    $ git checkout 2.6.0                 # Latest dev branch
     $ git submodule init                 # This is now done by cmake as a test
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
@@ -29,7 +29,7 @@
   current development branch. The source tarballs do not reflect HEAD, and do
   not contain the test suite.
 
-  If you send a patch (support@taskwarrior.org), make sure that patch is made
+  If you send a patch (support@gothenburgbitfactory.org), make sure that patch is made
   against git HEAD on the development branch. We cannot apply patches made
   against the tarball source, or master.
 
diff --git a/INSTALL b/INSTALL
index 7aad45280..02fe9434e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -180,7 +180,7 @@ CMake with no reported problems, and the build will fail later.  This is
 almost always because CMake is mistaken about some assumption.
 
 If a build does not succeed, please send the contents of the 'CMakeCache.txt'
-and 'CMakeFiles/CMakeOutput.log' files to support@taskwarrior.org.
+and 'CMakeFiles/CMakeOutput.log' files to support@gothenburgbitfactory.org.
 
 If CMake runs but Taskwarrior does not build, please send the contents of the
 above files as well as a transcript from the build, which is not written to a
diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake
index b6aa56dc7..e7ad810ac 100644
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -17,7 +17,7 @@ elseif (_HAS_GNU0X)
   message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
   set (_CXX11_FLAGS "-std=gnu++0x")
 else (_HAS_CXX11)
- message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
+ message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
 endif (_HAS_CXX11)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 236f3851b..ff7030af6 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -325,7 +325,7 @@ The official code repository at
 
 .TP
 You can contact the project by writing an email to
-<support@taskwarrior.org>
+<support@gothenburgbitfactory.org>
 
 .SH REPORTING BUGS
 .TP
diff --git a/test/README b/test/README
index f38904a7f..c6334c8ee 100644
--- a/test/README
+++ b/test/README
@@ -111,7 +111,7 @@ If you wish to contribute tests, please consider the following guidelines:
 How to Submit a Test Change/Addition
 ------------------------------------
 
-Mail it to support@taskwarrior.org, or attach it to an open bug.
+Mail it to support@gothenburgbitfactory.org, or attach it to an open bug.
 
 
 Wisdom

From 0411fd1ddcd9ba7e1e9958280bff93c3a38f0a5c Mon Sep 17 00:00:00 2001
From: Dirk Deimeke <dirk@deimeke.net>
Date: Tue, 13 Feb 2018 19:26:28 +0100
Subject: [PATCH 745/879] README.md

    - Added instructions for failing clone of libshared.git
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index df97e9a84..07ff0031f 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,11 @@ Or clone this repository:
     $ git clone --recursive -b 2.6.0 https://github.com/GothenburgBitFactory/taskwarrior.git
     $ cd taskwarrior
 
+In case of errors with libshared (URL pointing to git.tasktools.org):
+
+    $ sed -i 's/git.tasktools.org\/TM/github.com\/GothenburgBitFactory/' .git/config
+    $ git submodule update
+
 Then build:
 
     $ cmake -DCMAKE_BUILD_TYPE=release .

From 4f7ca3f2d1eb78e34a1f3997a3648fffdd9064b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 16 Feb 2018 21:33:28 -0500
Subject: [PATCH 746/879] TW-1906/#1919: sync sub-command is missing from
 task(1) manual page

- Thanks to rjc.
---
 AUTHORS           |  1 +
 ChangeLog         |  2 ++
 doc/man/task.1.in | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 791ad574a..0176697bc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -321,3 +321,4 @@ suggestions:
   Martin Strunz
   Kai HTML
   Marc Richter
+  rjc
diff --git a/ChangeLog b/ChangeLog
index 9ae14736d..78d6b136b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,8 @@
           (thanks to Dan Callahan).
 - TW-1903 grammar error -- There are 1 local changes.
           (thanks to Eric Hymowitz).
+- TW-1906/#1919 sync sub-command is missing from task(1) manual page
+          (thanks to rjc).
 - TW-1910 unreachable statement
           (thanks to Martin Strunz).
 - TW-1930 Typo in help
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 520192832..f883a548f 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -529,6 +529,25 @@ Shows statistics of the tasks defined by the filter.
 .B task <filter> summary
 Shows a report of aggregated task status by project.
 
+.TP
+.B task sync [init]
+The sync command synchronizes data with the Taskserver, if configured.
+
+The init subcommand should only ever be run once, and only on one client, because
+it sends all data to the Taskserver. This allows all the subsequent sync commands
+to only send small deltas.
+
+Note: If you use multiple sync clients, make sure this setting (which is the default)
+is on your primary client:
+
+  recurrence=on
+
+and on all other clients (this is not the default):
+
+  recurrence=off
+
+This is a workaround to avoid a recurrence bug that duplicates recurring tasks.
+
 .TP
 .B task <filter> tags
 Show a list of all tags used. Any special tags used are highlighted. Note that

From 2623d101e7027975ccbd424f77391910911e354d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 16 Feb 2018 21:50:14 -0500
Subject: [PATCH 747/879] - Thanks to php-coder

---
 AUTHORS                      |  1 +
 ChangeLog                    |  4 +-
 src/commands/CmdBurndown.cpp | 85 ++++++++++--------------------------
 test/burndown.t              |  8 ++--
 4 files changed, 32 insertions(+), 66 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0176697bc..2dde4c6fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -322,3 +322,4 @@ suggestions:
   Kai HTML
   Marc Richter
   rjc
+  php-coder
diff --git a/ChangeLog b/ChangeLog
index 78d6b136b..00092677e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,7 +76,9 @@
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
           (thanks to Paul J. Fenwick)
 - TW-1947 "urgency.over" filter seems to not work correct
-          (thanks to Marc Richter).
+          (thanks to Marc Richter)
+- #1964 task burndown shows extra brackets #1964
+          (thanks to php-coder)
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 6dfafa1e2..c745bd423 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -144,27 +144,25 @@ private:
   unsigned burndown_size (unsigned);
 
 public:
-  int _width;                     // Terminal width
-  int _height;                    // Terminal height
-  int _graph_width;               // Width of plot area
-  int _graph_height;              // Height of plot area
-  int _max_value;                 // Largest combined bar value
-  int _max_label;                 // Longest y-axis label
-  std::vector <int> _labels;      // Y-axis labels
-  int _estimated_bars;            // Estimated bar count
-  int _actual_bars;               // Calculated bar count
-  std::map <time_t, Bar> _bars;   // Epoch-indexed set of bars
-  Datetime _earliest;             // Date of earliest estimated bar
-  int _carryover_done;            // Number of 'done' tasks prior to chart range
-  char _period;                   // D, W, M
-  std::string _title;             // Additional description
-  std::string _grid;              // String representing grid of characters
-
-  time_t _peak_epoch;             // Quantized (D) date of highest pending peak
-  int _peak_count;                // Corresponding peak pending count
-  int _current_count;             // Current pending count
-  float _net_fix_rate;            // Calculated fix rate
-  std::string _completion;        // Estimated completion date
+  int _width                    {};        // Terminal width
+  int _height                   {};        // Terminal height
+  int _graph_width              {};        // Width of plot area
+  int _graph_height             {};        // Height of plot area
+  int _max_value                {0};      // Largest combined bar value
+  int _max_label                {1};      // Longest y-axis label
+  std::vector <int> _labels     {};        // Y-axis labels
+  int _estimated_bars           {};        // Estimated bar count
+  int _actual_bars              {0};      // Calculated bar count
+  std::map <time_t, Bar> _bars  {};        // Epoch-indexed set of bars
+  Datetime _earliest            {};        // Date of earliest estimated bar
+  int _carryover_done           {0};      // Number of 'done' tasks prior to chart range
+  char _period                  {};        // D, W, M
+  std::string _grid             {};        // String representing grid of characters
+  time_t _peak_epoch            {};        // Quantized (D) date of highest pending peak
+  int _peak_count               {0};      // Corresponding peak pending count
+  int _current_count            {0};      // Current pending count
+  float _net_fix_rate           {0.0};    // Calculated fix rate
+  std::string _completion       {};       // Estimated completion date
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -174,8 +172,6 @@ Chart::Chart (char type)
   // maximum space, and the width drives various other parameters.
   _width = Context::getContext ().getWidth ();
   _height = Context::getContext ().getHeight () - 1;  // Allow for new line with prompt.
-  _max_value = 0;
-  _max_label = 1;
   _graph_height = _height - 7;
   _graph_width = _width - _max_label - 14;
 
@@ -183,17 +179,7 @@ Chart::Chart (char type)
   // potentially enormous data set.
   _estimated_bars = (_width - 1 - 14) / 3;
 
-  _actual_bars = 0;
   _period = type;
-  _carryover_done = 0;
-
-  // Rates are calculated last.
-  _net_fix_rate = 0.0;
-
-  // Set the title.
-  std::vector <std::string> words = Context::getContext ().cli2.getWords ();
-  auto filter = join (" ", words);
-  _title = '(' + filter + ')';
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -229,7 +215,6 @@ void Chart::scanForPeak (std::vector <Task>& tasks)
   }
 
   // Find the peak, peak date and current.
-  _peak_count = 0;
   for (auto& count : pending)
   {
     if (count.second > _peak_count)
@@ -402,33 +387,11 @@ std::string Chart::render ()
     _grid += std::string (_width, ' ') + '\n';
 
   // Title.
-  std::string full_title;
-  switch (_period)
-  {
-  case 'D': full_title = "Daily";   break;
-  case 'W': full_title = "Weekly";  break;
-  case 'M': full_title = "Monthly"; break;
-  }
-
-  full_title += std::string (" Burndown");
-
-  if (_title.length ())
-  {
-    if (full_title.length () + 1 + _title.length () < (unsigned) _width)
-    {
-      full_title += ' ' + _title;
-      _grid.replace (LOC (0, (_width - full_title.length ()) / 2), full_title.length (), full_title);
-    }
-    else
-    {
-      _grid.replace (LOC (0, (_width - full_title.length ()) / 2), full_title.length (), full_title);
-      _grid.replace (LOC (1, (_width - _title.length ()) / 2), _title.length (), _title);
-    }
-  }
-  else
-  {
-    _grid.replace (LOC (0, (_width - full_title.length ()) / 2), full_title.length (), full_title);
-  }
+  std::string title = _period == 'D' ? "Daily"
+                    : _period == 'W' ? "Weekly"
+                    :                  "Monthly";
+  title += std::string (" Burndown");
+  _grid.replace (LOC (0, (_width - title.length ()) / 2), title.length (), title);
 
   // Legend.
   _grid.replace (LOC (_graph_height / 2 - 1, _width - 10), 10, "DD " + leftJustify ("Done",    7));
diff --git a/test/burndown.t b/test/burndown.t
index c976719a1..ddee43831 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -59,7 +59,7 @@ class TestBurndownCommand(TestCase):
     def test_burndown_daily(self):
         """Ensure burndown.daily generates a chart"""
         code, out, err = self.t("burndown.daily")
-        self.assertIn("Daily Burndown ()", out)
+        self.assertIn("Daily Burndown", out)
         self.assertIn(".", out)
         self.assertIn("+", out)
         self.assertIn("X", out)
@@ -67,13 +67,13 @@ class TestBurndownCommand(TestCase):
     def test_burndown_daily_color(self):
         """Ensure burndown.daily with color, generates a chart"""
         code, out, err = self.t("burndown.daily rc._forcecolor:on")
-        self.assertIn("Daily Burndown ()", out)
+        self.assertIn("Daily Burndown", out)
         self.assertNotIn("X", out)
 
     def test_burndown_weekly(self):
         """Ensure burndown.weekly generates a chart"""
         code, out, err = self.t("burndown.weekly")
-        self.assertIn("Weekly Burndown ()", out)
+        self.assertIn("Weekly Burndown", out)
         self.assertIn(".", out)
         self.assertIn("+", out)
         self.assertIn("X", out)
@@ -81,7 +81,7 @@ class TestBurndownCommand(TestCase):
     def test_burndown_monthly(self):
         """Ensure burndown.monthly generates a chart"""
         code, out, err = self.t("burndown.monthly")
-        self.assertIn("Monthly Burndown ()", out)
+        self.assertIn("Monthly Burndown", out)
         self.assertIn(".", out)
         self.assertIn("+", out)
         self.assertIn("X", out)

From 53088dae659e14ab01bba4436272f07cc8937d08 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 16 Feb 2018 22:04:29 -0500
Subject: [PATCH 748/879] Build: C++14 support added

---
 CMakeLists.txt              |  3 +--
 DEVELOPER.md                |  3 ++-
 INSTALL                     |  4 ++--
 README.md                   |  8 ++++----
 cmake/CXXSniffer.cmake      | 31 +++++++++----------------------
 doc/CMakeLists.txt          |  2 +-
 performance/CMakeLists.txt  |  2 +-
 scripts/CMakeLists.txt      |  2 +-
 src/CMakeLists.txt          |  2 +-
 src/columns/CMakeLists.txt  |  2 +-
 src/commands/CMakeLists.txt |  2 +-
 test/CMakeLists.txt         |  2 +-
 12 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5a6b3e10..a1873e42f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
-set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
+cmake_minimum_required (VERSION 3.0)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 include (CheckFunctionExists)
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 0adac537b..fa405b350 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -1,7 +1,8 @@
 # How to Build Taskwarrior
 
 ## Satisfy the Requirements:
- * gcc 4.9 or later, clang 3.4 or later, or a compiler with full C++11 support.
+ * CMake 3.0 or later
+ * gcc 5.0 or later, clang 3.4 or later, or a compiler with full C++11 support
  * libuuid (if not on macOS)
  * gnutls (optional)
  * python 2.7 or 3 (optional, for running the test suite)
diff --git a/INSTALL b/INSTALL
index 02fe9434e..52d9b1a60 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,14 +8,14 @@ source.
 Dependencies
 ------------
 
-You will need the CMake build system installed in order to build Taskwarrior
+You will need the CMake 3.0+ build system installed in order to build Taskwarrior
 from source. More information on CMake can be obtained at https://cmake.org
 
 You will also need:
   - make
 
 You will need a C++ compiler that supports full C++11, which includes:
-  - gcc 4.9   (released 2014-04-22)
+  - gcc 5.0   (released 2013-12-23)
   - clang 3.4 (released 2014-01-02)
 
 You will need the following libraries:
diff --git a/README.md b/README.md
index 07ff0031f..49bea6097 100644
--- a/README.md
+++ b/README.md
@@ -40,13 +40,13 @@ There are many binary packages available, but to install from source requires:
 * git
 * cmake
 * make
-* C++ compiler, currently gcc 4.7+ or clang 3.3+ for full C++11 support
+* C++ compiler, currently gcc 5.0+ or clang 3.4+ for full C++11 support
 
 Download the tarball, and expand it:
 
-    $ curl -O https://taskwarrior.org/download/task-2.5.1.tar.gz
-    $ tar xzf task-2.5.1.tar.gz
-    $ cd task-2.5.1
+    $ curl -O https://taskwarrior.org/download/task-2.6.0.tar.gz
+    $ tar xzf task-2.6.0.tar.gz
+    $ cd task-2.6.0
 
 Or clone this repository:
 
diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake
index e7ad810ac..4fe1e6e90 100644
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -1,30 +1,21 @@
-message ("-- Configuring C++11")
+message ("-- Configuring C++14")
 message ("-- System: ${CMAKE_SYSTEM_NAME}")
 
 include (CheckCXXCompilerFlag)
 
-# NOTE: Phase out -std=gnu++0x and --std=c++0x as soon as realistically possible.
-CHECK_CXX_COMPILER_FLAG("-std=c++11"   _HAS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x"   _HAS_CXX0X)
-CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
+CHECK_CXX_COMPILER_FLAG("-std=c++14"   _HAS_CXX14)
 
-if (_HAS_CXX11)
-  set (_CXX11_FLAGS "-std=c++11")
-elseif (_HAS_CXX0X)
-  message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
-  set (_CXX11_FLAGS "-std=c++0x")
-elseif (_HAS_GNU0X)
-  message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
-  set (_CXX11_FLAGS "-std=gnu++0x")
-else (_HAS_CXX11)
- message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
-endif (_HAS_CXX11)
+if (_HAS_CXX14)
+  set (_CXX14_FLAGS "-std=c++14")
+else (_HAS_CXX14)
+ message (FATAL_ERROR "C++14 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
+endif (_HAS_CXX14)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set (DARWIN true)
-  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
+  set (_CXX14_FLAGS "${_CXX14_FLAGS} -stdlib=libc++")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
   set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -41,13 +32,9 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
   set (GNUHURD true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
   set (CYGWIN true)
-  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
-  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
-  #       workaround instead of fixing Cygwin.
-  set (_CXX11_FLAGS "-std=gnu++0x")
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
+set (CMAKE_CXX_FLAGS "${_CXX14_FLAGS} ${CMAKE_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a0072349d..81df9d08f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 message ("-- Configuring man pages")
 set (man_FILES task-color.5 task-sync.5 taskrc.5 task.1)
 foreach (man_FILE ${man_FILES})
diff --git a/performance/CMakeLists.txt b/performance/CMakeLists.txt
index 792e7f10b..a990911fe 100644
--- a/performance/CMakeLists.txt
+++ b/performance/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 
 add_custom_target (performance ./run_perf
                                DEPENDS task_executable
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index edc8e2eb5..e6ac28d12 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 install (DIRECTORY bash fish vim zsh hooks
          DESTINATION ${TASK_DOCDIR}/scripts)
 install (DIRECTORY add-ons
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 15a94a656..7346a7e05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt
index 2054039ff..601f1ffe8 100644
--- a/src/columns/CMakeLists.txt
+++ b/src/columns/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt
index 188a8ef81..668f5c2f1 100644
--- a/src/commands/CMakeLists.txt
+++ b/src/commands/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bf361ef77..3e34ef778 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 
 # See this CMake issue before complaining about the following.
 # https://cmake.org/Bug/view.php?id=16062

From ea81976ee9083aae2375936ef38a3d5da81dc453 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 16 Feb 2018 22:14:26 -0500
Subject: [PATCH 749/879] TW-1917/#1930: "above" does a string comparison, even
 when the value is numeric

- Thanks to Dirk Deimeke.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 00092677e..89304c93c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,8 @@
           (thanks to rjc).
 - TW-1910 unreachable statement
           (thanks to Martin Strunz).
+= TW-1917/#1930 "above" does a string comparison, even when the value is numeric
+          (thanks to Dirk Deimeke).
 - TW-1930 Typo in help
           (thanks to Kai HTML).
 - TW-1935 Separate verbosity category for rc overrides

From 59342bc10fd96b4306f58ae09205172564447f92 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 16 Feb 2018 22:41:46 -0500
Subject: [PATCH 750/879] TW-54/#115: Reduce output for timesheet

- Thanks to Aikido guy.
---
 ChangeLog | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89304c93c..2edbeb2b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
           (thanks to Markus Beppler, Konstantin Vorobyev).
 - TI-91   Timewarrior does not compile on DragonFly
           (thanks to Michael Neumann).
+- TW-54/#115 Reduce output for timesheet
+          (thanks to Aikido guy).
 - TW-61   Extract only tasks with annotations
           (thanks to Aikido Guy).
 - TW-213  Align countdown column on boundary between number and text.
@@ -72,15 +74,15 @@
 - TW-1930 Typo in help
           (thanks to Kai HTML).
 - TW-1935 Separate verbosity category for rc overrides
-          (thanks to Paul J. Fenwick)
+          (thanks to Paul J. Fenwick).
 - TW-1936 Tweak tests to have fuller TAP compliance
-          (thanks to Paul J. Fenwick)
+          (thanks to Paul J. Fenwick).
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
-          (thanks to Paul J. Fenwick)
+          (thanks to Paul J. Fenwick).
 - TW-1947 "urgency.over" filter seems to not work correct
-          (thanks to Marc Richter)
+          (thanks to Marc Richter).
 - #1964 task burndown shows extra brackets #1964
-          (thanks to php-coder)
+          (thanks to php-coder).
 - Added 'juhannus' as a synonym for 'midsommarafton'
           (thanks to Lynoure Braakman).
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

From 23d63ccb44e98b9d2c3458750691a0ae1daa44ff Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Sat, 17 Feb 2018 13:59:29 +0100
Subject: [PATCH 751/879] Tests: Don't hardcode errno constants

The values of ENOENT and ESRCH are architecture-dependent, so don't
assume they're always 2 and 3.
---
 test/basetest/hooks.py | 5 +++--
 test/basetest/task.py  | 3 ++-
 test/basetest/taskd.py | 3 ++-
 test/basetest/utils.py | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/basetest/hooks.py b/test/basetest/hooks.py
index 245f0bc68..e0f7ea7ad 100644
--- a/test/basetest/hooks.py
+++ b/test/basetest/hooks.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import division
+import errno
 import os
 from sys import stderr
 import shutil
@@ -144,7 +145,7 @@ class Hooks(object):
             shutil.rmtree(self.hookdir)
         except OSError as e:
             # If the hookdir folder doesn't exist, no harm done and keep going
-            if e.errno != 2:
+            if e.errno != errno.ENOENT:
                 raise
 
         os.mkdir(self.hookdir)
@@ -258,7 +259,7 @@ class Hook(object):
         try:
             os.remove(file)
         except OSError as e:
-            if e.errno == 2:
+            if e.errno == errno.ENOENT:
                 raise HookError("Hook with name {0} was not found on "
                                 "hooks/ folder".format(file))
             else:
diff --git a/test/basetest/task.py b/test/basetest/task.py
index a5a81c256..812655db8 100644
--- a/test/basetest/task.py
+++ b/test/basetest/task.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import atexit
+import errno
 import json
 import os
 import shlex
@@ -274,7 +275,7 @@ class Task(object):
         try:
             shutil.rmtree(self.datadir)
         except OSError as e:
-            if e.errno == 2:
+            if e.errno == errno.ENOENT:
                 # Directory no longer exists
                 pass
             else:
diff --git a/test/basetest/taskd.py b/test/basetest/taskd.py
index e30fe5d00..c4b244bc9 100644
--- a/test/basetest/taskd.py
+++ b/test/basetest/taskd.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import division, print_function
+import errno
 import os
 import tempfile
 import shutil
@@ -310,7 +311,7 @@ class Taskd(object):
         try:
             shutil.rmtree(self.datadir)
         except OSError as e:
-            if e.errno == 2:
+            if e.errno == errno.ENOENT:
                 # Directory no longer exists
                 pass
             else:
diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index d41ac09cc..3efaebc1b 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import division
+import errno
 import os
 import sys
 import socket
@@ -212,8 +213,8 @@ def _get_output(arguments, timeout=None):
         try:
             os.kill(pid, signal.SIGABRT)
         except OSError as e:
-            # 3 means the process finished/died between last check and now
-            if e.errno != 3:
+            # ESRCH means the process finished/died between last check and now
+            if e.errno != errno.ESRCH:
                 raise
 
         # Wait for process to finish (should die/exit after signal)

From 81e65b43bf11d7ae0cbeeac5dec1d3ffc18a2d10 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Feb 2018 10:29:48 -0500
Subject: [PATCH 752/879] Docs: Updated Changelog with pull request info

---
 ChangeLog | 100 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2edbeb2b0..5549cac49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,117 +1,123 @@
 2.5.2 () -
 
 - TD-64   sync conflict deleted all annotations of the task
-          (thanks to Markus Beppler, Konstantin Vorobyev).
+          Thanks to Markus Beppler, Konstantin Vorobyev
 - TI-91   Timewarrior does not compile on DragonFly
-          (thanks to Michael Neumann).
+          Thanks to Michael Neumann
 - TW-54/#115 Reduce output for timesheet
-          (thanks to Aikido guy).
+          Thanks to Aikido guy
 - TW-61   Extract only tasks with annotations
-          (thanks to Aikido Guy).
+          Thanks to Aikido Guy
 - TW-213  Align countdown column on boundary between number and text.
-          (thanks to Eric Fluger).
+          Thanks to Eric Fluger
 - TW-1572 Alternative approach to urgency inheritance
-          (thanks to Jens Erat, Wim Schuermann).
+          Thanks to Jens Erat, Wim Schuermann
 - TW-1667 hooks: upon failure indicate which hook failed
-          (thanks to Daniel Shahaf).
+          Thanks to Daniel Shahaf
 - TW-1785 Purge command to remove deleted tasks
-          (thanks to Paul Beckingham).
-- TW-1772 Implementation of circular dependency detection is
-          inefficient (thanks to Michael Meier).
+          Thanks to Paul Beckingham
+- TW-1772 Implementation of circular dependency detection is inefficient
+          Thanks to Michael Meier
 - TW-1778 Unicode strings are truncated in task description
-          (thanks to Andrew, bjonnh, OKOMPer, Vladimir).
+          Thanks to Andrew, bjonnh, OKOMPer, Vladimir
 - TW-1788 Closing a reopened task does not update the end time
-          (thanks to Ralph Bean).
+          Thanks to Ralph Bean
 - TW-1791 taskrc(5) manpage: spurious "pri." in rule.precedence.color
-          (thanks to Sebastien Badia).
+          Thanks to Sebastien Badia
 - TW-1792 The info command uses '0' to reference dependencies on non-
           pending tasks.
 - TW-1795 Calendar underline on Day padding
-          (thanks to Renato Alves).
+          Thanks to Renato Alves
 - TW-1805 project:ide is not allowed
-          (thanks to Slaven ʙanovic).
+          Thanks to Slaven ʙanovic
 - TW-1807 dateformat lacks a flag to display day of week
-          (thanks to Ellington Santos).
+          Thanks to Ellington Santos
 - TW-1813 Range filter doesn't work
-          (thanks to george js).
+          Thanks to george js
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
-          (thanks to E. Manuel Cerr'on Angeles)
+          Thanks to E. Manuel Cerr'on Angeles
 - TW-1823 Incorrect unicode text wrapping / justifying.
-          (thanks to Sergey Trofimov).
+          Thanks to Sergey Trofimov
 - TW-1827 Extract annotations from a task
-          (thanks to Ryan).
+          Thanks to Ryan
 - TW-1855 "Well-known" CA certificates not properly auto-loaded
-          (thanks to Flavio Poletti).
+          Thanks to Flavio Poletti
 - TW-1857 Change Task::get call to the more efficient Task::has
-          (thanks to Zachary Manning).
+          Thanks to Zachary Manning
 - TW‐1858 Change signature for dependencyGetBlocked
 - TW-1859 Change signature of Task::getTags
 - TW-1860 Change signature of Task::getAnnotations
 - TW-1861 Truncated description when adding annotation
-          (thanks to eezewaek).
+          Thanks to eezewaek
 - TW-1869 segmentation fault (on unusual installation)
-          (thanks to Eric Hymowitz).
+          Thanks to Eric Hymowitz
 - TW-1873 Specify different path to extensions/hooks directory
-          (thanks to Eli).
+          Thanks to Eli
 - TW-1877 task done, task edit, task is now pending
-          (thanks to Eric Hymowitz).
+          Thanks to Eric Hymowitz
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
-          (thanks to Scott Kostyshak).
+          Thanks to Scott Kostyshak
 - TW-1881 Missing last character(s) in Description field
-          (thanks to Hubert Toullec).
+          Thanks to Hubert Toullec
 - TW-1881 default.scheduled seems not to work
-          (thanks to Onion).
+          Thanks to Onion
 - TW-1885 Task Sync does not send TLS SNI headers
-          (thanks to Dan Callahan).
+          Thanks to Dan Callahan
 - TW-1903 grammar error -- There are 1 local changes.
-          (thanks to Eric Hymowitz).
+          Thanks to Eric Hymowitz
 - TW-1906/#1919 sync sub-command is missing from task(1) manual page
-          (thanks to rjc).
+          Thanks to rjc
 - TW-1910 unreachable statement
-          (thanks to Martin Strunz).
+          Thanks to Martin Strunz
 = TW-1917/#1930 "above" does a string comparison, even when the value is numeric
-          (thanks to Dirk Deimeke).
+          Thanks to Dirk Deimeke
 - TW-1930 Typo in help
-          (thanks to Kai HTML).
+          Thanks to Kai HTML
 - TW-1935 Separate verbosity category for rc overrides
-          (thanks to Paul J. Fenwick).
+          Thanks to Paul J. Fenwick
 - TW-1936 Tweak tests to have fuller TAP compliance
-          (thanks to Paul J. Fenwick).
+          Thanks to Paul J. Fenwick
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
-          (thanks to Paul J. Fenwick).
+          Thanks to Paul J. Fenwick
 - TW-1947 "urgency.over" filter seems to not work correct
-          (thanks to Marc Richter).
+          Thanks to Marc Richter
 - #1964 task burndown shows extra brackets #1964
-          (thanks to php-coder).
+          Thanks to php-coder
+- #1966 Tests: Don't hardcode errno constants #1966
+          Thanks to Jakub Wilk
+- #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
+          Thanks to Lynoure Braakman
+- #1 URL formating
+          Thanks to buhtz
 - Added 'juhannus' as a synonym for 'midsommarafton'
-          (thanks to Lynoure Braakman).
+          Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
   virtual tag.
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
-          (thanks to Fidel Mato).
+          Thanks to Fidel Mato
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
   removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
-          (thanks to Ran Benita).
+          Thanks to Ran Benita
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
-          (thanks to jrabbit).
+          Thanks to jrabbit
 - Improved certificate validation diagnostics
-          (thanks to Jelle van der Waa).
+          Thanks to Jelle van der Waa
 - Improved portability for SunOS-like OSes.
-          (thanks to Antonio Huete Jimenez).
+          Thanks to Antonio Huete Jimenez
 - Updated the 'timesheet' command with a more compact report that accepts a
   filter, and has a default filter showing the last four weeks of completed and
   started tasks.
 - Added 'history.weekly', 'history.daily', 'ghistory.weekly', 'ghistory.daily'
   report variations, with code refactoring.
-          (thanks to Lukas Barth).
+          Thanks to Lukas Barth
 - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
   tw.width, tw.height, tw.version.
 - The message telling you to sync now indicates how many local changes will be

From 98175bac4bf4d55e519b2fc3ff112239e59c62ba Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Sat, 17 Feb 2018 23:00:46 +0100
Subject: [PATCH 753/879] Udated URL in .gitmodules to point to GH

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 675b3d498..fed3de512 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/libshared"]
 	path = src/libshared
-	url = https://git.tasktools.org/TM/libshared.git
+	url = https://github.com/GothenburgBitFactory/libshared.git

From a8c0646d1873cf8c2b52b59eb236f11c98a0b3bb Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Sun, 18 Feb 2018 00:02:20 +0100
Subject: [PATCH 754/879] Updated URLs and copyright year


From b97e1400e62c4462197e8aa593912856ec2f0e2d Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Sun, 18 Feb 2018 00:29:38 +0100
Subject: [PATCH 755/879] Updated URL references

---
 INSTALL   | 2 +-
 README.md | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 52d9b1a60..798201a4a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -156,7 +156,7 @@ OpenBSD
 
   and build normally.
 
-  See: https://bug.tasktools.org/browse/TW-1579
+  See: https://github.com/GothenburgBitFactory/taskwarrior/issues/1605
 
 WASM
   Using the Emscripten compiler, you can achieve it like this:
diff --git a/README.md b/README.md
index 49bea6097..fe189f6b6 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,17 @@ Or clone this repository:
     $ git clone --recursive -b 2.6.0 https://github.com/GothenburgBitFactory/taskwarrior.git
     $ cd taskwarrior
 
-In case of errors with libshared (URL pointing to git.tasktools.org):
+In case of errors with libshared - URL pointing to git.tasktools.org in either .git/config or .gitmodules:
 
     $ sed -i 's/git.tasktools.org\/TM/github.com\/GothenburgBitFactory/' .git/config
     $ git submodule update
 
+or
+
+    $ sed -i 's/git.tasktools.org\/TM/github.com\/GothenburgBitFactory/' .gitmodules
+    $ git submodule init
+    $ git submodule update
+
 Then build:
 
     $ cmake -DCMAKE_BUILD_TYPE=release .

From 11a281b862b4107a1e370acb9c442ff8be3f39fe Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Sun, 18 Feb 2018 00:30:13 +0100
Subject: [PATCH 756/879] Changed to a more generic URL for testing

---
 test/lexer.t.cpp | 4 ++--
 test/log.t       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index e16d12976..de9c1a92f 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -347,8 +347,8 @@ int main (int, char**)
     { "rc.foo",                                       { { "rc.foo",                                       Lexer::Type::dom          }, NO, NO, NO, NO }, },
 
     // URL
-    { "http://tasktools.org",                         { { "http://tasktools.org",                         Lexer::Type::url          }, NO, NO, NO, NO }, },
-    { "https://bug.tasktools.org",                    { { "https://bug.tasktools.org",                    Lexer::Type::url          }, NO, NO, NO, NO }, },
+    { "http://example.com",                         { { "http://example.com",                         Lexer::Type::url          }, NO, NO, NO, NO }, },
+    { "https://foo.example.com",                    { { "https://foo.example.com",                    Lexer::Type::url          }, NO, NO, NO, NO }, },
 
     // String
     { "'one two'",                                    { { "'one two'",                                    Lexer::Type::string       }, NO, NO, NO, NO }, },
diff --git a/test/log.t b/test/log.t
index de534ecc9..f692867f9 100755
--- a/test/log.t
+++ b/test/log.t
@@ -67,10 +67,10 @@ class TestBug1575(TestCase):
 
            tw-1575: `task log` mangles URLs when quoted
         """
-        self.t("log testing123 https://bug.tasktools.org")
+        self.t("log testing123 https://foo.example.com")
 
         code, out, err = self.t("completed")
-        self.assertIn("testing123 https://bug.tasktools.org", out)
+        self.assertIn("testing123 https://foo.example.com", out)
 
 
 if __name__ == "__main__":

From 95becc4f6f93a68a7cd6b5ec186d54571c217c9d Mon Sep 17 00:00:00 2001
From: Tiago Matias <tmatias10@gmail.com>
Date: Thu, 22 Feb 2018 22:16:22 -0300
Subject: [PATCH 757/879] typo -> very simply syntax -> very simple syntax

---
 doc/man/taskrc.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 06612dc3b..c9100fa44 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -55,7 +55,7 @@ default, sample
 .I .taskrc
 file in the user's home directory.
 
-The .taskrc file follows a very simply syntax defining name/value pairs:
+The .taskrc file follows a very simple syntax defining name/value pairs:
 
 .RS
 <name> = <value>

From 822909d0464b172353967c06020888ba95e7d84c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 22 Feb 2018 20:34:35 -0500
Subject: [PATCH 758/879] Docs: Added Tiago

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 2dde4c6fb..4dc5e7c89 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -143,6 +143,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Michael Neumann
   Mark Scannell
   buhtz
+  Tiago Matias
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:

From 8fdd18f897ef6455d975d731137b5712415261a1 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 10:55:17 +0100
Subject: [PATCH 759/879] Docs: fix typos in taskrc man page

---
 doc/man/taskrc.5.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index c9100fa44..666334a65 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -280,7 +280,7 @@ control specific occasions when output is generated. This list may contain:
     sync       Feedback about sync
     filter     Shows the filter used in the command
     unwait     Notification when a task leaves the 'waiting' state
-    override   Notification when configuration options are overriden
+    override   Notification when configuration options are overridden
     recur      Notification when a new recurring task instance is created
 
 "affected", "new-id", "new-uuid", "project", "override" and "unwait" imply "footnote".
@@ -450,7 +450,7 @@ The character or string to show in the <uda>.indicator column. Defaults to U.
 Controls whether recurrence is enabled, and whether recurring tasks continue to
 generate new task instances. Defaults to "1".
 
-If you are syncing multiple clients, then it is adviѕed that you set 'recurrence=1'
+If you are syncing multiple clients, then it is advised that you set 'recurrence=1'
 on your primary client, and 'recurrence=0' on ALL other clients. This is a workaround
 for a duplication bug.
 

From 243f613444367f3a16d61f40eb941e27cdcc4aca Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 11:02:18 +0100
Subject: [PATCH 760/879] Docs: "recur" also implies "footnote"

---
 doc/man/taskrc.5.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 666334a65..1148dc941 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -283,7 +283,8 @@ control specific occasions when output is generated. This list may contain:
     override   Notification when configuration options are overridden
     recur      Notification when a new recurring task instance is created
 
-"affected", "new-id", "new-uuid", "project", "override" and "unwait" imply "footnote".
+"affected", "new-id", "new-uuid", "project", "unwait", "override" and "recur"
+imply "footnote".
 
 Note that the "1" setting is equivalent to all the tokens being specified,
 and the "nothing" setting is equivalent to none of the tokens being specified.

From abc00ab6ca0f033738b229bdcf8b19814332248d Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 11:20:28 +0100
Subject: [PATCH 761/879] Docs: try to clarify what falls under header/footnote
 verbose settings

---
 doc/man/taskrc.5.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 1148dc941..886342cda 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -267,8 +267,8 @@ Alternatively, you can specify a comma-separated list of verbosity tokens that
 control specific occasions when output is generated. This list may contain:
 
     blank      Inserts extra blank lines in output, for clarity
-    header     Messages that appear before report output
-    footnote   Messages that appear after report output
+    header     Messages that appear before report output (this includes .taskrc/.task overrides and the "[task next]" message)
+    footnote   Messages that appear after report output (mostly status messages and change descriptions)
     label      Column labels on tabular reports
     new-id     Provides feedback of any new task IDs
     new-uuid   Provides feedback of any new task UUIDs. Deprecated, to be

From f492d423ddef2cff8eff71082e47ad6286b074d1 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 12:40:40 +0100
Subject: [PATCH 762/879] Docs: quote values for calendar.details in taskrc.5

---
 doc/man/taskrc.5.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 886342cda..01eb6a659 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -680,11 +680,11 @@ considered due, and is colored accordingly. The default value is 7.
 
 .TP
 .B calendar.details=sparse
-If set to full running "task calendar" will display the details of tasks with
+If set to "full" running "task calendar" will display the details of tasks with
 due dates that fall into the calendar period. The corresponding days will be
-color-coded in the calendar. If set to sparse only the corresponding days will
+color-coded in the calendar. If set to "sparse" only the corresponding days will
 be color coded and no details will be displayed. The displaying of due dates
-with details is turned off by setting the variable to none. The default value
+with details is turned off by setting the variable to "none". The default value
 is "sparse".
 
 .TP

From ef538ef9da308e1ac93142a4110cf86e4f8e70d7 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 12:41:49 +0100
Subject: [PATCH 763/879] Docs: use unabbreviated "task colors" command in
 taskrc.5

---
 doc/man/taskrc.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 01eb6a659..406c31e90 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -820,7 +820,7 @@ automatic coloring of that task. A list of valid colors, depending on your
 terminal, can be obtained by running the command:
 
 .RS
-.B task color
+.B task colors
 .RE
 
 .RS

From f98084bbd37522cd85aa9c853e59b2840e5c6d6f Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 13:24:01 +0100
Subject: [PATCH 764/879] Docs: always use <> tags for placeholders in man
 pages

---
 doc/man/task.1.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index f883a548f..110eb72c2 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -151,12 +151,12 @@ the specified month and year.  If the 'due' argument is provided, will show
 the starting month of the earliest due task.
 
 .TP
-.B task colors [sample | legend]
+.B task colors [<sample> | legend]
 Displays all possible colors, a named sample, or a legend containing all
 currently defined colors.
 
 .TP
-.B task columns [substring]
+.B task columns [<substring>]
 Displays all supported columns and formatting styles.  Useful when creating
 custom reports.  If a substring is provided, only matching column names are
 shown.
@@ -431,7 +431,7 @@ Examples:
     2015-03-31T23:59:59
 
 .TP
-.B task config [name [value | '']]
+.B task config [<name> [<value> | '']]
 Add, modify and remove settings directly in the Taskwarrior configuration.
 This command either modifies the 'name' setting with a new value of 'value',
 or adds a new entry that is equivalent to 'name=value':
@@ -516,7 +516,7 @@ Lists all supported reports.  This includes the built-in reports, and any custom
 reports you have defined.
 
 .TP
-.B task show [all | substring]
+.B task show [all | <substring>]
 Shows all the current settings.  If a
 substring is specified just the settings containing that substring will be
 displayed.
@@ -556,7 +556,7 @@ notation for other task metadata. It is an error to attempt to add or remove a
 virtual tag.
 
 .TP
-.B task timesheet [weeks]
+.B task timesheet [<weeks>]
 Shows a weekly report of tasks completed and started.
 
 .TP

From c7edf914e11ed2610eef28b3bc2ea94225d1fcea Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:41:01 +0100
Subject: [PATCH 765/879] Always use https:// link for opensource.org

It was already used in a few places, make this consistent.
---
 COPYING                            | 2 +-
 doc/man/task-color.5.in            | 2 +-
 doc/man/task-sync.5.in             | 2 +-
 doc/man/task.1.in                  | 2 +-
 doc/man/taskrc.5.in                | 2 +-
 doc/rc/dark-16.theme               | 2 +-
 doc/rc/dark-256.theme              | 2 +-
 doc/rc/dark-blue-256.theme         | 2 +-
 doc/rc/dark-gray-256.theme         | 2 +-
 doc/rc/dark-gray-blue-256.theme    | 2 +-
 doc/rc/dark-green-256.theme        | 2 +-
 doc/rc/dark-red-256.theme          | 2 +-
 doc/rc/dark-violets-256.theme      | 2 +-
 doc/rc/dark-yellow-green.theme     | 2 +-
 doc/rc/holidays.be-BY.rc           | 2 +-
 doc/rc/holidays.cs-CZ.rc           | 2 +-
 doc/rc/holidays.da-DK.rc           | 2 +-
 doc/rc/holidays.de-AT.rc           | 2 +-
 doc/rc/holidays.de-BE.rc           | 2 +-
 doc/rc/holidays.de-CH.rc           | 2 +-
 doc/rc/holidays.de-DE.rc           | 2 +-
 doc/rc/holidays.el-GR.rc           | 2 +-
 doc/rc/holidays.en-AU.rc           | 2 +-
 doc/rc/holidays.en-CA.rc           | 2 +-
 doc/rc/holidays.en-GB.rc           | 2 +-
 doc/rc/holidays.en-GL.rc           | 2 +-
 doc/rc/holidays.en-HK.rc           | 2 +-
 doc/rc/holidays.en-IN.rc           | 2 +-
 doc/rc/holidays.en-NZ.rc           | 2 +-
 doc/rc/holidays.en-US.rc           | 2 +-
 doc/rc/holidays.en-ZA.rc           | 2 +-
 doc/rc/holidays.es-CO.rc           | 2 +-
 doc/rc/holidays.es-EC.rc           | 2 +-
 doc/rc/holidays.es-ES.rc           | 2 +-
 doc/rc/holidays.es-MX.rc           | 2 +-
 doc/rc/holidays.es-US.rc           | 2 +-
 doc/rc/holidays.et-EE.rc           | 2 +-
 doc/rc/holidays.fi-FI.rc           | 2 +-
 doc/rc/holidays.fr-BE.rc           | 2 +-
 doc/rc/holidays.fr-FR.rc           | 2 +-
 doc/rc/holidays.ga-IE.rc           | 2 +-
 doc/rc/holidays.hr-HR.rc           | 2 +-
 doc/rc/holidays.is-IS.rc           | 2 +-
 doc/rc/holidays.it-IT.rc           | 2 +-
 doc/rc/holidays.jp-JP.rc           | 2 +-
 doc/rc/holidays.lt-LT.rc           | 2 +-
 doc/rc/holidays.lv-LV.rc           | 2 +-
 doc/rc/holidays.nb-NO.rc           | 2 +-
 doc/rc/holidays.nb-SJ.rc           | 2 +-
 doc/rc/holidays.nl-BE.rc           | 2 +-
 doc/rc/holidays.nl-NL.rc           | 2 +-
 doc/rc/holidays.pl-PL.rc           | 2 +-
 doc/rc/holidays.pt-BR.rc           | 2 +-
 doc/rc/holidays.pt-PT.rc           | 2 +-
 doc/rc/holidays.ru-RU.rc           | 2 +-
 doc/rc/holidays.sv-SE.rc           | 2 +-
 doc/rc/holidays.tr-TR.rc           | 2 +-
 doc/rc/light-16.theme              | 2 +-
 doc/rc/light-256.theme             | 2 +-
 doc/rc/no-color.theme              | 2 +-
 doc/rc/solarized-dark-256.theme    | 2 +-
 doc/rc/solarized-light-256.theme   | 2 +-
 scripts/add-ons/update-holidays.pl | 4 ++--
 scripts/bash/task.sh               | 2 +-
 scripts/fish/task.fish             | 2 +-
 scripts/vim/syntax/taskrc.vim      | 2 +-
 scripts/zsh/_task                  | 2 +-
 src/CLI2.cpp                       | 2 +-
 src/CLI2.h                         | 2 +-
 src/Context.cpp                    | 2 +-
 src/Context.h                      | 2 +-
 src/DOM.cpp                        | 2 +-
 src/DOM.h                          | 2 +-
 src/Eval.cpp                       | 2 +-
 src/Eval.h                         | 2 +-
 src/Filter.cpp                     | 2 +-
 src/Filter.h                       | 2 +-
 src/Hooks.cpp                      | 2 +-
 src/Hooks.h                        | 2 +-
 src/Lexer.cpp                      | 2 +-
 src/Lexer.h                        | 2 +-
 src/TDB2.cpp                       | 2 +-
 src/TDB2.h                         | 2 +-
 src/TLSClient.cpp                  | 2 +-
 src/TLSClient.h                    | 2 +-
 src/Task.cpp                       | 2 +-
 src/Task.h                         | 2 +-
 src/Variant.cpp                    | 2 +-
 src/Variant.h                      | 2 +-
 src/ViewTask.cpp                   | 2 +-
 src/ViewTask.h                     | 2 +-
 src/calc.cpp                       | 2 +-
 src/columns/ColDepends.cpp         | 2 +-
 src/columns/ColDepends.h           | 2 +-
 src/columns/ColDescription.cpp     | 2 +-
 src/columns/ColDescription.h       | 2 +-
 src/columns/ColDue.cpp             | 2 +-
 src/columns/ColDue.h               | 2 +-
 src/columns/ColEnd.cpp             | 2 +-
 src/columns/ColEnd.h               | 2 +-
 src/columns/ColEntry.cpp           | 2 +-
 src/columns/ColEntry.h             | 2 +-
 src/columns/ColID.cpp              | 2 +-
 src/columns/ColID.h                | 2 +-
 src/columns/ColIMask.cpp           | 2 +-
 src/columns/ColIMask.h             | 2 +-
 src/columns/ColLast.cpp            | 2 +-
 src/columns/ColMask.cpp            | 2 +-
 src/columns/ColMask.h              | 2 +-
 src/columns/ColModified.cpp        | 2 +-
 src/columns/ColModified.h          | 2 +-
 src/columns/ColParent.cpp          | 2 +-
 src/columns/ColParent.h            | 2 +-
 src/columns/ColProject.cpp         | 2 +-
 src/columns/ColProject.h           | 2 +-
 src/columns/ColRecur.cpp           | 2 +-
 src/columns/ColRecur.h             | 2 +-
 src/columns/ColScheduled.cpp       | 2 +-
 src/columns/ColScheduled.h         | 2 +-
 src/columns/ColStart.cpp           | 2 +-
 src/columns/ColStart.h             | 2 +-
 src/columns/ColStatus.cpp          | 2 +-
 src/columns/ColStatus.h            | 2 +-
 src/columns/ColTags.cpp            | 2 +-
 src/columns/ColTags.h              | 2 +-
 src/columns/ColTypeDate.cpp        | 2 +-
 src/columns/ColTypeDate.h          | 2 +-
 src/columns/ColTypeDuration.cpp    | 2 +-
 src/columns/ColTypeDuration.h      | 2 +-
 src/columns/ColTypeNumeric.cpp     | 2 +-
 src/columns/ColTypeNumeric.h       | 2 +-
 src/columns/ColTypeString.cpp      | 2 +-
 src/columns/ColTypeString.h        | 2 +-
 src/columns/ColUDA.cpp             | 2 +-
 src/columns/ColUDA.h               | 2 +-
 src/columns/ColUUID.cpp            | 2 +-
 src/columns/ColUUID.h              | 2 +-
 src/columns/ColUntil.cpp           | 2 +-
 src/columns/ColUntil.h             | 2 +-
 src/columns/ColUrgency.cpp         | 2 +-
 src/columns/ColUrgency.h           | 2 +-
 src/columns/ColWait.cpp            | 2 +-
 src/columns/ColWait.h              | 2 +-
 src/columns/Column.cpp             | 2 +-
 src/columns/Column.h               | 2 +-
 src/commands/CmdAdd.cpp            | 2 +-
 src/commands/CmdAdd.h              | 2 +-
 src/commands/CmdAliases.cpp        | 2 +-
 src/commands/CmdAliases.h          | 2 +-
 src/commands/CmdAnnotate.cpp       | 2 +-
 src/commands/CmdAnnotate.h         | 2 +-
 src/commands/CmdAppend.cpp         | 2 +-
 src/commands/CmdAppend.h           | 2 +-
 src/commands/CmdAttributes.cpp     | 2 +-
 src/commands/CmdAttributes.h       | 2 +-
 src/commands/CmdBurndown.cpp       | 2 +-
 src/commands/CmdBurndown.h         | 2 +-
 src/commands/CmdCalc.cpp           | 2 +-
 src/commands/CmdCalc.h             | 2 +-
 src/commands/CmdCalendar.cpp       | 2 +-
 src/commands/CmdCalendar.h         | 2 +-
 src/commands/CmdColor.cpp          | 2 +-
 src/commands/CmdColor.h            | 2 +-
 src/commands/CmdColumns.cpp        | 2 +-
 src/commands/CmdColumns.h          | 2 +-
 src/commands/CmdCommands.cpp       | 2 +-
 src/commands/CmdCommands.h         | 2 +-
 src/commands/CmdConfig.cpp         | 2 +-
 src/commands/CmdConfig.h           | 2 +-
 src/commands/CmdContext.cpp        | 2 +-
 src/commands/CmdContext.h          | 2 +-
 src/commands/CmdCount.cpp          | 2 +-
 src/commands/CmdCount.h            | 2 +-
 src/commands/CmdCustom.cpp         | 2 +-
 src/commands/CmdCustom.h           | 2 +-
 src/commands/CmdDelete.cpp         | 2 +-
 src/commands/CmdDelete.h           | 2 +-
 src/commands/CmdDenotate.cpp       | 2 +-
 src/commands/CmdDenotate.h         | 2 +-
 src/commands/CmdDiagnostics.cpp    | 2 +-
 src/commands/CmdDiagnostics.h      | 2 +-
 src/commands/CmdDone.cpp           | 2 +-
 src/commands/CmdDone.h             | 2 +-
 src/commands/CmdDuplicate.cpp      | 2 +-
 src/commands/CmdDuplicate.h        | 2 +-
 src/commands/CmdEdit.cpp           | 2 +-
 src/commands/CmdEdit.h             | 2 +-
 src/commands/CmdExec.cpp           | 2 +-
 src/commands/CmdExec.h             | 2 +-
 src/commands/CmdExport.cpp         | 2 +-
 src/commands/CmdExport.h           | 2 +-
 src/commands/CmdGet.cpp            | 2 +-
 src/commands/CmdGet.h              | 2 +-
 src/commands/CmdHelp.cpp           | 2 +-
 src/commands/CmdHelp.h             | 2 +-
 src/commands/CmdHistory.cpp        | 2 +-
 src/commands/CmdHistory.h          | 2 +-
 src/commands/CmdIDs.cpp            | 2 +-
 src/commands/CmdIDs.h              | 2 +-
 src/commands/CmdImport.cpp         | 2 +-
 src/commands/CmdImport.h           | 2 +-
 src/commands/CmdInfo.cpp           | 2 +-
 src/commands/CmdInfo.h             | 2 +-
 src/commands/CmdLog.cpp            | 2 +-
 src/commands/CmdLog.h              | 2 +-
 src/commands/CmdLogo.cpp           | 2 +-
 src/commands/CmdLogo.h             | 2 +-
 src/commands/CmdModify.cpp         | 2 +-
 src/commands/CmdModify.h           | 2 +-
 src/commands/CmdPrepend.cpp        | 2 +-
 src/commands/CmdPrepend.h          | 2 +-
 src/commands/CmdProjects.cpp       | 2 +-
 src/commands/CmdProjects.h         | 2 +-
 src/commands/CmdPurge.cpp          | 2 +-
 src/commands/CmdPurge.h            | 2 +-
 src/commands/CmdReports.cpp        | 2 +-
 src/commands/CmdReports.h          | 2 +-
 src/commands/CmdShow.cpp           | 2 +-
 src/commands/CmdShow.h             | 2 +-
 src/commands/CmdStart.cpp          | 2 +-
 src/commands/CmdStart.h            | 2 +-
 src/commands/CmdStats.cpp          | 2 +-
 src/commands/CmdStats.h            | 2 +-
 src/commands/CmdStop.cpp           | 2 +-
 src/commands/CmdStop.h             | 2 +-
 src/commands/CmdSummary.cpp        | 2 +-
 src/commands/CmdSummary.h          | 2 +-
 src/commands/CmdSync.cpp           | 2 +-
 src/commands/CmdSync.h             | 2 +-
 src/commands/CmdTags.cpp           | 2 +-
 src/commands/CmdTags.h             | 2 +-
 src/commands/CmdTimesheet.cpp      | 2 +-
 src/commands/CmdTimesheet.h        | 2 +-
 src/commands/CmdUDAs.cpp           | 2 +-
 src/commands/CmdUDAs.h             | 2 +-
 src/commands/CmdUndo.cpp           | 2 +-
 src/commands/CmdUndo.h             | 2 +-
 src/commands/CmdUnique.cpp         | 2 +-
 src/commands/CmdUnique.h           | 2 +-
 src/commands/CmdUrgency.cpp        | 2 +-
 src/commands/CmdUrgency.h          | 2 +-
 src/commands/CmdVersion.cpp        | 2 +-
 src/commands/CmdVersion.h          | 2 +-
 src/commands/Command.cpp           | 2 +-
 src/commands/Command.h             | 2 +-
 src/dependency.cpp                 | 2 +-
 src/feedback.cpp                   | 2 +-
 src/legacy.cpp                     | 2 +-
 src/main.cpp                       | 2 +-
 src/main.h                         | 2 +-
 src/nag.cpp                        | 2 +-
 src/recur.cpp                      | 2 +-
 src/rules.cpp                      | 2 +-
 src/sort.cpp                       | 2 +-
 src/util.cpp                       | 2 +-
 src/util.h                         | 2 +-
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/col.t.cpp                     | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom.t.cpp                     | 2 +-
 test/dom2.t                        | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/eval.t.cpp                    | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/lexer.t.cpp                   | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/simpletap/__init__.py         | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/t.t.cpp                       | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/tdb2.t.cpp                    | 2 +-
 test/template.t                    | 2 +-
 test/test.cpp                      | 2 +-
 test/test.h                        | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-1837.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/util.t.cpp                    | 2 +-
 test/uuid.t                        | 2 +-
 test/variant_add.t.cpp             | 2 +-
 test/variant_and.t.cpp             | 2 +-
 test/variant_cast.t.cpp            | 2 +-
 test/variant_divide.t.cpp          | 2 +-
 test/variant_equal.t.cpp           | 2 +-
 test/variant_exp.t.cpp             | 2 +-
 test/variant_gt.t.cpp              | 2 +-
 test/variant_gte.t.cpp             | 2 +-
 test/variant_inequal.t.cpp         | 2 +-
 test/variant_lt.t.cpp              | 2 +-
 test/variant_lte.t.cpp             | 2 +-
 test/variant_match.t.cpp           | 2 +-
 test/variant_math.t.cpp            | 2 +-
 test/variant_modulo.t.cpp          | 2 +-
 test/variant_multiply.t.cpp        | 2 +-
 test/variant_nomatch.t.cpp         | 2 +-
 test/variant_not.t.cpp             | 2 +-
 test/variant_or.t.cpp              | 2 +-
 test/variant_partial.t.cpp         | 2 +-
 test/variant_subtract.t.cpp        | 2 +-
 test/variant_xor.t.cpp             | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/view.t.cpp                    | 2 +-
 test/wait.t                        | 2 +-
 409 files changed, 410 insertions(+), 410 deletions(-)

diff --git a/COPYING b/COPYING
index c7aadec98..9d6090408 100644
--- a/COPYING
+++ b/COPYING
@@ -20,4 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-http://www.opensource.org/licenses/mit-license.php
+https://www.opensource.org/licenses/mit-license.php
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index ff7030af6..94411f491 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -306,7 +306,7 @@ on <http://taskwarrior.org>.
 Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 
 .SH SEE ALSO
 .BR task(1),
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index d58a1afbd..90fdf9de5 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -158,7 +158,7 @@ Weaknesses:
 Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 
 .SH SEE ALSO
 .BR task(1),
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 110eb72c2..18c9ed446 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1328,7 +1328,7 @@ The file that contains information needed by the "undo" command.
 Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 
 .SH SEE ALSO
 .BR taskrc(5),
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 406c31e90..8b3a41426 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1517,7 +1517,7 @@ Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 
 .SH SEE ALSO
 .BR task(1),
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index ed8fe7240..b31a687b3 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 0c05f1953..6a1ed1d6f 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 3eeca69ab..a030dca85 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index 1ba0a0768..0a920319d 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme
index 062e6686a..7d840f2cc 100644
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index 936fbec68..ad231310b 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index 11973ee7a..b57a67c4a 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme
index df6bd3e61..8a6f140fc 100644
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index 311f4bf96..2b5bc34ab 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.be-BY.rc b/doc/rc/holidays.be-BY.rc
index 92722c970..2c0117b09 100644
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.cs-CZ.rc b/doc/rc/holidays.cs-CZ.rc
index 653e80e7f..df2268ba4 100644
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.da-DK.rc b/doc/rc/holidays.da-DK.rc
index 86e0ce742..e1bdbe1e1 100644
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.de-AT.rc b/doc/rc/holidays.de-AT.rc
index 83c930385..3e9ecc120 100644
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.de-BE.rc b/doc/rc/holidays.de-BE.rc
index f5ca4a8fc..a26cbacdd 100644
--- a/doc/rc/holidays.de-BE.rc
+++ b/doc/rc/holidays.de-BE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.de-CH.rc b/doc/rc/holidays.de-CH.rc
index 76df9ccca..cff04043b 100644
--- a/doc/rc/holidays.de-CH.rc
+++ b/doc/rc/holidays.de-CH.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.de-DE.rc b/doc/rc/holidays.de-DE.rc
index 012cc9664..22481b000 100644
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.el-GR.rc b/doc/rc/holidays.el-GR.rc
index 93b1481bb..5e711a274 100644
--- a/doc/rc/holidays.el-GR.rc
+++ b/doc/rc/holidays.el-GR.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-AU.rc b/doc/rc/holidays.en-AU.rc
index 90bd939a9..a6ddca83b 100644
--- a/doc/rc/holidays.en-AU.rc
+++ b/doc/rc/holidays.en-AU.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-CA.rc b/doc/rc/holidays.en-CA.rc
index 8f4fda34c..57b2a0141 100644
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-GB.rc b/doc/rc/holidays.en-GB.rc
index 40278b73a..ed7c218f7 100644
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-GL.rc b/doc/rc/holidays.en-GL.rc
index c66c7d7b3..edc936127 100644
--- a/doc/rc/holidays.en-GL.rc
+++ b/doc/rc/holidays.en-GL.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-HK.rc b/doc/rc/holidays.en-HK.rc
index 64de53b30..62c54c745 100644
--- a/doc/rc/holidays.en-HK.rc
+++ b/doc/rc/holidays.en-HK.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-IN.rc b/doc/rc/holidays.en-IN.rc
index 561b40ae0..87d27bc02 100644
--- a/doc/rc/holidays.en-IN.rc
+++ b/doc/rc/holidays.en-IN.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-NZ.rc b/doc/rc/holidays.en-NZ.rc
index 7a05018d2..39af7d61f 100644
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-US.rc b/doc/rc/holidays.en-US.rc
index cb0587e87..03ca9c499 100644
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.en-ZA.rc b/doc/rc/holidays.en-ZA.rc
index 2386a158e..2078c40dd 100644
--- a/doc/rc/holidays.en-ZA.rc
+++ b/doc/rc/holidays.en-ZA.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.es-CO.rc b/doc/rc/holidays.es-CO.rc
index 659b93037..dd606af78 100644
--- a/doc/rc/holidays.es-CO.rc
+++ b/doc/rc/holidays.es-CO.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.es-EC.rc b/doc/rc/holidays.es-EC.rc
index 2643098b3..98cd9ecef 100644
--- a/doc/rc/holidays.es-EC.rc
+++ b/doc/rc/holidays.es-EC.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.es-ES.rc b/doc/rc/holidays.es-ES.rc
index 4044eecd0..ed701c1a5 100644
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.es-MX.rc b/doc/rc/holidays.es-MX.rc
index 322e80dee..1e5b23257 100644
--- a/doc/rc/holidays.es-MX.rc
+++ b/doc/rc/holidays.es-MX.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.es-US.rc b/doc/rc/holidays.es-US.rc
index 98a6592ad..b96596d6b 100644
--- a/doc/rc/holidays.es-US.rc
+++ b/doc/rc/holidays.es-US.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.et-EE.rc b/doc/rc/holidays.et-EE.rc
index 0455ba44a..60620b2f5 100644
--- a/doc/rc/holidays.et-EE.rc
+++ b/doc/rc/holidays.et-EE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.fi-FI.rc b/doc/rc/holidays.fi-FI.rc
index b05671ee6..95a11c120 100644
--- a/doc/rc/holidays.fi-FI.rc
+++ b/doc/rc/holidays.fi-FI.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.fr-BE.rc b/doc/rc/holidays.fr-BE.rc
index 7f7ed30e4..090d265fb 100644
--- a/doc/rc/holidays.fr-BE.rc
+++ b/doc/rc/holidays.fr-BE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.fr-FR.rc b/doc/rc/holidays.fr-FR.rc
index 78426dd98..9b5d961ff 100644
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.ga-IE.rc b/doc/rc/holidays.ga-IE.rc
index 5a13d9ada..3bb328bf9 100644
--- a/doc/rc/holidays.ga-IE.rc
+++ b/doc/rc/holidays.ga-IE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.hr-HR.rc b/doc/rc/holidays.hr-HR.rc
index 09bfaab43..9195b7ba6 100644
--- a/doc/rc/holidays.hr-HR.rc
+++ b/doc/rc/holidays.hr-HR.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.is-IS.rc b/doc/rc/holidays.is-IS.rc
index ca08273bc..a7369826f 100644
--- a/doc/rc/holidays.is-IS.rc
+++ b/doc/rc/holidays.is-IS.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.it-IT.rc b/doc/rc/holidays.it-IT.rc
index 4d83610ae..750369257 100644
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.jp-JP.rc b/doc/rc/holidays.jp-JP.rc
index 66c05d4ff..0857be5d2 100644
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.lt-LT.rc b/doc/rc/holidays.lt-LT.rc
index 13ed0790f..dee3e33b1 100644
--- a/doc/rc/holidays.lt-LT.rc
+++ b/doc/rc/holidays.lt-LT.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.lv-LV.rc b/doc/rc/holidays.lv-LV.rc
index 9ba43134e..b8968ae04 100644
--- a/doc/rc/holidays.lv-LV.rc
+++ b/doc/rc/holidays.lv-LV.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.nb-NO.rc b/doc/rc/holidays.nb-NO.rc
index fb0e2ae7c..5b38b4bfa 100644
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.nb-SJ.rc b/doc/rc/holidays.nb-SJ.rc
index d3845fad6..cf0a63d39 100644
--- a/doc/rc/holidays.nb-SJ.rc
+++ b/doc/rc/holidays.nb-SJ.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.nl-BE.rc b/doc/rc/holidays.nl-BE.rc
index 868c38507..795d4eaec 100644
--- a/doc/rc/holidays.nl-BE.rc
+++ b/doc/rc/holidays.nl-BE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.nl-NL.rc b/doc/rc/holidays.nl-NL.rc
index 2af6bd14a..232f6ee37 100644
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.pl-PL.rc b/doc/rc/holidays.pl-PL.rc
index 5aba73caf..021ce2109 100644
--- a/doc/rc/holidays.pl-PL.rc
+++ b/doc/rc/holidays.pl-PL.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.pt-BR.rc b/doc/rc/holidays.pt-BR.rc
index 515b7d426..6a9c5af74 100644
--- a/doc/rc/holidays.pt-BR.rc
+++ b/doc/rc/holidays.pt-BR.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.pt-PT.rc b/doc/rc/holidays.pt-PT.rc
index 531d0b8e9..0ed912e4f 100644
--- a/doc/rc/holidays.pt-PT.rc
+++ b/doc/rc/holidays.pt-PT.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.ru-RU.rc b/doc/rc/holidays.ru-RU.rc
index 2b8455d51..1d55ff3bb 100644
--- a/doc/rc/holidays.ru-RU.rc
+++ b/doc/rc/holidays.ru-RU.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.sv-SE.rc b/doc/rc/holidays.sv-SE.rc
index cbbb9bc9c..25f64cd81 100644
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/holidays.tr-TR.rc b/doc/rc/holidays.tr-TR.rc
index 453a5698e..3285f0fca 100644
--- a/doc/rc/holidays.tr-TR.rc
+++ b/doc/rc/holidays.tr-TR.rc
@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index 2ac3f0d1f..59ba4ef70 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index b9b870509..578b9df0a 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme
index 7c5901d54..32d750351 100644
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme
index 246e839c8..29c99681f 100644
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme
index ec370d7e2..edbcbb592 100644
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index 51a50f5ce..b3a5ae8bc 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -21,7 +21,7 @@
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
-## http://www.opensource.org/licenses/mit-license.php
+## https://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 
@@ -209,7 +209,7 @@ if (open my $fh, '>:utf8', $file)
         "# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n",
         "# SOFTWARE.\n",
         "#\n",
-        "# http://www.opensource.org/licenses/mit-license.php\n",
+        "# https://www.opensource.org/licenses/mit-license.php\n",
         "#\n",
         "###############################################################################\n",
         "\n",
diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index 05dd4f3b3..4029e1173 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ################################################################################
 #
diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index 83808ff8b..78ed7a176 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -53,7 +53,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 
 # NOTE: remember that sed on OS X is different in some aspects. E.g. it does
 #       not understand \t for tabs.
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index 0279424ba..a602e91ee 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -21,7 +21,7 @@
 " OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 " SOFTWARE.
 "
-" http://www.opensource.org/licenses/mit-license.php
+" https://www.opensource.org/licenses/mit-license.php
 "
 
 if version < 600
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index ce240d9a4..603a9fc0c 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 484527c34..e8667a5b4 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/CLI2.h b/src/CLI2.h
index c918cd30d..410037d7e 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_CLI2
diff --git a/src/Context.cpp b/src/Context.cpp
index 94f39eab4..01b1e4477 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Context.h b/src/Context.h
index 9b9b7346c..c31ebe37f 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/DOM.cpp b/src/DOM.cpp
index aa677de51..b641ce855 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/DOM.h b/src/DOM.h
index 65601888e..28716e9b3 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 51e52dc69..ec9af4668 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Eval.h b/src/Eval.h
index 94d645b3c..802beeada 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 238dfea16..eca2bfd71 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Filter.h b/src/Filter.h
index be74f4d84..8bb862a51 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 8c5f183d7..d01420029 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Hooks.h b/src/Hooks.h
index bfc484cc4..c7712bddc 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index c0931dc06..4d71abf73 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Lexer.h b/src/Lexer.h
index dad17c5d4..14be25029 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index ad3e80f6c..1fb973d66 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/TDB2.h b/src/TDB2.h
index ca2db5193..7ee3b8b05 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 5e94f43cc..04baf78e3 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/TLSClient.h b/src/TLSClient.h
index 64e01dd3a..f0b5fd022 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TLSCLIENT
diff --git a/src/Task.cpp b/src/Task.cpp
index 650079bc5..04bdf5f1c 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Task.h b/src/Task.h
index 88180ffe6..0d537044c 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 81e517d9d..ab6bb3a61 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Variant.h b/src/Variant.h
index 8cc566a0e..4abe74ba8 100644
--- a/src/Variant.h
+++ b/src/Variant.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 1ae01d711..54f6566b0 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ViewTask.h b/src/ViewTask.h
index 89789c436..8b8009976 100644
--- a/src/ViewTask.h
+++ b/src/ViewTask.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/calc.cpp b/src/calc.cpp
index 919764e55..564d3bfe4 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 91d243910..2bb3a0f01 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index 4b3efde46..b3a276437 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index c26a97308..3db411e0f 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index 926827065..e5894d355 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 68976c2d7..0fe892fe5 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index ea5fb98fe..276e3e0eb 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index db143d2d2..2c520ffb2 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index c06e8a661..13200592c 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 64b87643e..272723cfb 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index 3700d0aad..434e41044 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 76a22c7b6..1f08c4d87 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index c0f880435..284de8a6d 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 20c574547..5a3d61108 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index 86e169d64..09a5af90f 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp
index 511b65428..9b508d6dc 100644
--- a/src/columns/ColLast.cpp
+++ b/src/columns/ColLast.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index aa029421b..eb5c2b7b5 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index c2429e4ac..833c723b6 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index ca04e8651..1a614558c 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index 19d485fd0..a48db7f83 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index e51fc28fb..185de506a 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index 518819916..ec952785e 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index af011ea42..208877fcb 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index d9e03869d..7ac32587c 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index a70a9cb5d..249f95c86 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index b3205e341..599e19d6c 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index 2f55a0298..ca86ebfc9 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index 031d11916..d8ef8b16e 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 833b59448..1ea2c2281 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index 1baf9cf24..7815d7cfd 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 4adc23e87..019fd5f6b 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index a2534ea28..f81924483 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 185c83316..4d0d43058 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index fcd409718..de3451582 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 4aeaa0db1..6d2c4b78e 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index 732c007ea..dc3b290f1 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index bfd2d2051..37e15b8b7 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index a5a657933..41c4b9447 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 033381ca5..cc1937009 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index b44cc3d4e..5f982ee65 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index f6d5e8933..f25b8539b 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index dc306716b..a8626c897 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 7a36812e7..523506ff1 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index f76da0702..07611441a 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 87341e5a7..87905b7f0 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index 84258eb0e..eb71b602c 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index b41fb43e7..9dc7308e9 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index 2ee0bf7fa..32640559d 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 7b32d5081..65d1cc369 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 5f1733c66..87f522017 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index 377047917..bd1e1f9a8 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index 0de886ab7..0221de9ad 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 7fee381e6..3ef5b129a 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/columns/Column.h b/src/columns/Column.h
index a276763f3..9e4d5afe9 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 9f3335a0f..2a81e833f 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAdd.h b/src/commands/CmdAdd.h
index 8f7363984..1a1c3f1f1 100644
--- a/src/commands/CmdAdd.h
+++ b/src/commands/CmdAdd.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index b6004e3df..fd5981fd2 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAliases.h b/src/commands/CmdAliases.h
index 0b86ac2ca..09a3c8339 100644
--- a/src/commands/CmdAliases.h
+++ b/src/commands/CmdAliases.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 0c27f02bb..fabc526ce 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAnnotate.h b/src/commands/CmdAnnotate.h
index 4ea691bbf..73bbc78ee 100644
--- a/src/commands/CmdAnnotate.h
+++ b/src/commands/CmdAnnotate.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 93f7369c5..cd1eea943 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAppend.h b/src/commands/CmdAppend.h
index 35818480c..8ad43d7f9 100644
--- a/src/commands/CmdAppend.h
+++ b/src/commands/CmdAppend.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index b50bd221f..f73d43c9b 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdAttributes.h b/src/commands/CmdAttributes.h
index 3e6526f0a..faa98d8e3 100644
--- a/src/commands/CmdAttributes.h
+++ b/src/commands/CmdAttributes.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index c745bd423..16c9748e8 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdBurndown.h b/src/commands/CmdBurndown.h
index 1c1e6d192..afb0ad479 100644
--- a/src/commands/CmdBurndown.h
+++ b/src/commands/CmdBurndown.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 52f7b5b4c..e00af1cd6 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCalc.h b/src/commands/CmdCalc.h
index ba7776e5a..eea7f77b0 100644
--- a/src/commands/CmdCalc.h
+++ b/src/commands/CmdCalc.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 284842754..e77311a73 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index 6276b2389..bd27f1261 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 2bc4ea388..c5d9676f2 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdColor.h b/src/commands/CmdColor.h
index d0160ab38..b8f65b0e1 100644
--- a/src/commands/CmdColor.h
+++ b/src/commands/CmdColor.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 941096505..15326cc9e 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdColumns.h b/src/commands/CmdColumns.h
index 8a16d2edd..e9309ee7a 100644
--- a/src/commands/CmdColumns.h
+++ b/src/commands/CmdColumns.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index fa623cb11..919c127ba 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCommands.h b/src/commands/CmdCommands.h
index 1468ffbfe..4b909cb1d 100644
--- a/src/commands/CmdCommands.h
+++ b/src/commands/CmdCommands.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index bb6edf444..48f66ed02 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 3db265547..79d8bcc20 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index d1657327b..b3c92cc93 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdContext.h b/src/commands/CmdContext.h
index 9a7d611d5..dd4237b56 100644
--- a/src/commands/CmdContext.h
+++ b/src/commands/CmdContext.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 7b40532e3..cb15547c2 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCount.h b/src/commands/CmdCount.h
index 67b5e5184..a0ebf222e 100644
--- a/src/commands/CmdCount.h
+++ b/src/commands/CmdCount.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 4402574ad..5ab0825b5 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h
index 73337e4b6..c5927c5a3 100644
--- a/src/commands/CmdCustom.h
+++ b/src/commands/CmdCustom.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index abb58a703..3f859337e 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDelete.h b/src/commands/CmdDelete.h
index 8ebefcccb..35624b19c 100644
--- a/src/commands/CmdDelete.h
+++ b/src/commands/CmdDelete.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 5b5941a14..faa8ca4c8 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDenotate.h b/src/commands/CmdDenotate.h
index f07c674da..39fe43385 100644
--- a/src/commands/CmdDenotate.h
+++ b/src/commands/CmdDenotate.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 303c129d2..e36efa9ae 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDiagnostics.h b/src/commands/CmdDiagnostics.h
index c19e74ecf..89cd1ba99 100644
--- a/src/commands/CmdDiagnostics.h
+++ b/src/commands/CmdDiagnostics.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 0c7a898a3..2c2663d89 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDone.h b/src/commands/CmdDone.h
index 2e76e5097..6e5d3a00f 100644
--- a/src/commands/CmdDone.h
+++ b/src/commands/CmdDone.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index a13bd38ed..ef92e3655 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdDuplicate.h b/src/commands/CmdDuplicate.h
index 6b749d113..953b5f997 100644
--- a/src/commands/CmdDuplicate.h
+++ b/src/commands/CmdDuplicate.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 536d11302..2e5700f59 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdEdit.h b/src/commands/CmdEdit.h
index 48d6e874e..e4c54ff32 100644
--- a/src/commands/CmdEdit.h
+++ b/src/commands/CmdEdit.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 117ed7443..d1991a4ad 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h
index 3d59b89e3..3087e689e 100644
--- a/src/commands/CmdExec.h
+++ b/src/commands/CmdExec.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 51524f5bb..dc2836818 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdExport.h b/src/commands/CmdExport.h
index 7e44b53a1..30655049b 100644
--- a/src/commands/CmdExport.h
+++ b/src/commands/CmdExport.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 6be5500f5..0dad80e03 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdGet.h b/src/commands/CmdGet.h
index 870d22d9f..d1b368028 100644
--- a/src/commands/CmdGet.h
+++ b/src/commands/CmdGet.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 7f0e97658..522b0b4c7 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h
index 7241ca1eb..084904875 100644
--- a/src/commands/CmdHelp.h
+++ b/src/commands/CmdHelp.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 64aaa0cd1..95e36eaea 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index b51a2303c..0b72175c8 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index 0b7c06552..00a4e8ba5 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdIDs.h b/src/commands/CmdIDs.h
index 4557532eb..e8e2e269a 100644
--- a/src/commands/CmdIDs.h
+++ b/src/commands/CmdIDs.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 15e78eecd..6eb133ff4 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdImport.h b/src/commands/CmdImport.h
index cb32da704..e18ee8178 100644
--- a/src/commands/CmdImport.h
+++ b/src/commands/CmdImport.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 9050bf921..d74d60189 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index 9c2dd9358..c0dc0861e 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 922c697d6..c244eb93c 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdLog.h b/src/commands/CmdLog.h
index 28df12d79..62b7a91c9 100644
--- a/src/commands/CmdLog.h
+++ b/src/commands/CmdLog.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index a6f1b1273..7d9de7359 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h
index 2bcd22216..f8f37c999 100644
--- a/src/commands/CmdLogo.h
+++ b/src/commands/CmdLogo.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 3745d04a0..1d473047d 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index e5e65ecae..0c6d4adb6 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index cfd1376f7..75fe9b9df 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdPrepend.h b/src/commands/CmdPrepend.h
index 687dbf9f7..4810f0336 100644
--- a/src/commands/CmdPrepend.h
+++ b/src/commands/CmdPrepend.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 2228bdcab..5e2f22b6f 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdProjects.h b/src/commands/CmdProjects.h
index 2a5934681..6efee88f0 100644
--- a/src/commands/CmdProjects.h
+++ b/src/commands/CmdProjects.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index ffb7ada19..2bf899746 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index e4ef797fb..f9da43090 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index de7716ade..e2e9ba05f 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdReports.h b/src/commands/CmdReports.h
index 5c12a72b6..8aab838c5 100644
--- a/src/commands/CmdReports.h
+++ b/src/commands/CmdReports.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index ec6863b61..d7fa8c388 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h
index 0fa553642..710fa5c79 100644
--- a/src/commands/CmdShow.h
+++ b/src/commands/CmdShow.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 0c67d5ab4..938759de4 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStart.h b/src/commands/CmdStart.h
index 04d499148..46a087b91 100644
--- a/src/commands/CmdStart.h
+++ b/src/commands/CmdStart.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 87ecf07e5..0786a6902 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStats.h b/src/commands/CmdStats.h
index fbe8d520a..f4ef23b27 100644
--- a/src/commands/CmdStats.h
+++ b/src/commands/CmdStats.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 7ff5beeba..6b76019f9 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdStop.h b/src/commands/CmdStop.h
index 2e8212755..cde72b5e9 100644
--- a/src/commands/CmdStop.h
+++ b/src/commands/CmdStop.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 9e8c2ae5c..c9be6df0b 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdSummary.h b/src/commands/CmdSummary.h
index c1a62461e..f38eb0efb 100644
--- a/src/commands/CmdSummary.h
+++ b/src/commands/CmdSummary.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 126980e4a..1f865ab7c 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdSync.h b/src/commands/CmdSync.h
index 551b5d5b6..bc9321d86 100644
--- a/src/commands/CmdSync.h
+++ b/src/commands/CmdSync.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index ed4b38470..7116f6a36 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h
index 086124fab..b3cbc9131 100644
--- a/src/commands/CmdTags.h
+++ b/src/commands/CmdTags.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 26e5a7d5a..bb35b45f2 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdTimesheet.h b/src/commands/CmdTimesheet.h
index 15d0ad4f4..d1371847f 100644
--- a/src/commands/CmdTimesheet.h
+++ b/src/commands/CmdTimesheet.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 9acef008e..1c7d0398a 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUDAs.h b/src/commands/CmdUDAs.h
index dbce4df71..4f1425bcb 100644
--- a/src/commands/CmdUDAs.h
+++ b/src/commands/CmdUDAs.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index b0431166e..3c9a92204 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUndo.h b/src/commands/CmdUndo.h
index 75dda965b..9b5bbd8bb 100644
--- a/src/commands/CmdUndo.h
+++ b/src/commands/CmdUndo.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 0b67dbdc6..9e181b901 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUnique.h b/src/commands/CmdUnique.h
index e0e390d87..c1e39af77 100644
--- a/src/commands/CmdUnique.h
+++ b/src/commands/CmdUnique.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 0f4e8f130..9ec5d8419 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdUrgency.h b/src/commands/CmdUrgency.h
index a885a1007..d80b3d238 100644
--- a/src/commands/CmdUrgency.h
+++ b/src/commands/CmdUrgency.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index 77706a3ad..dd35e7789 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h
index 882f60278..40edcc9e1 100644
--- a/src/commands/CmdVersion.h
+++ b/src/commands/CmdVersion.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 830c81a13..a07f4537a 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/commands/Command.h b/src/commands/Command.h
index 7fe10b721..877a284e8 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/dependency.cpp b/src/dependency.cpp
index af51f314e..0927cf528 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/feedback.cpp b/src/feedback.cpp
index d656494c2..a6a06da21 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 5f8426028..e34befc70 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/main.cpp b/src/main.cpp
index f3778c22c..c40108814 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/main.h b/src/main.h
index d7f8ad25a..8b7c5fe9f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/nag.cpp b/src/nag.cpp
index 3e06e5746..4b8a1d8ca 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/recur.cpp b/src/recur.cpp
index 0381b1ee3..efb3cf234 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/rules.cpp b/src/rules.cpp
index 8517f5a5e..f55fb5cbd 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/sort.cpp b/src/sort.cpp
index ef1fb1950..02bc9eb00 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/util.cpp b/src/util.cpp
index 0f4c9a09a..5d4e9efb2 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/util.h b/src/util.h
index d91314a6e..a3f660464 100644
--- a/src/util.h
+++ b/src/util.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/abbreviation.t b/test/abbreviation.t
index cec801c9f..22b90e454 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/add.t b/test/add.t
index 0ec10f816..0e6929ff4 100755
--- a/test/add.t
+++ b/test/add.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/alias.t b/test/alias.t
index d147b44f1..740148b7b 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/annotate.t b/test/annotate.t
index 49ed0f40d..e3af0910d 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/append.t b/test/append.t
index f06b9717a..20c5378d4 100755
--- a/test/append.t
+++ b/test/append.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/args.t b/test/args.t
index f8c328d95..aff507000 100755
--- a/test/args.t
+++ b/test/args.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/backlog.t b/test/backlog.t
index 0c4bd1cfb..61e6c702a 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/bash_completion.t b/test/bash_completion.t
index b4e01cb75..2049f69d3 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/blocked.t b/test/blocked.t
index 2561df130..2e77376ba 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/bulk.t b/test/bulk.t
index 45890a676..00cdd55c0 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/burndown.t b/test/burndown.t
index ddee43831..0c98e3e42 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/calc.t b/test/calc.t
index cebaae1a9..241d9a39e 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/calendar.t b/test/calendar.t
index 29f7d8ed9..a83a34b0a 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/caseless.t b/test/caseless.t
index 8ac5c4e99..79fd55c0e 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/col.t.cpp b/test/col.t.cpp
index d65ad891c..e7355771e 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/color.cmd.t b/test/color.cmd.t
index f29afe5df..8943d7965 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/color.rules.t b/test/color.rules.t
index 3379244be..30de59ceb 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/columns.t b/test/columns.t
index 9573c11a3..b22007570 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/commands.t b/test/commands.t
index aa950a7f6..669aa6237 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/completed.t b/test/completed.t
index 816f8ef15..e60114ad7 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/configuration.t b/test/configuration.t
index 6ecca25e0..21bf8b3c4 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/confirmation.t b/test/confirmation.t
index 7d311fc36..f5fb2232b 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/context.t b/test/context.t
index c0495b200..c9d790d2b 100755
--- a/test/context.t
+++ b/test/context.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/count.t b/test/count.t
index 55a2fae66..f34bd2f36 100755
--- a/test/count.t
+++ b/test/count.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/custom.config.t b/test/custom.config.t
index cdf8690e2..5fa62a55e 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index b1c4d3471..549dfff0e 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/custom.t b/test/custom.t
index f3d8d416d..c7edc29c2 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index b4aa37b77..8b65d3397 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/date.iso.t b/test/date.iso.t
index 89cda212d..83ff61972 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/dateformat.t b/test/dateformat.t
index cfa70f7c1..4c6fd7ad1 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/datesort.t b/test/datesort.t
index 03ac1d429..1cab82105 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index fce9a7370..46d3ddd0a 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/debug.t b/test/debug.t
index 6193f70c1..ce2025a43 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/default.t b/test/default.t
index ac50548b3..a7872939b 100755
--- a/test/default.t
+++ b/test/default.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/delete.t b/test/delete.t
index 419f2f64e..22b5b6e6a 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/denotate.t b/test/denotate.t
index fb52a4123..ad718efbc 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/dependencies.t b/test/dependencies.t
index 3c4519bcd..9882087f6 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/diag.t b/test/diag.t
index 2360e4936..fafaf326c 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/diag_color.t b/test/diag_color.t
index ab4f19f9c..f955e278f 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 398dd9d01..365268459 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/dom2.t b/test/dom2.t
index 3c960f709..656d6b08a 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/due.t b/test/due.t
index 9197fb249..b3ddf281f 100755
--- a/test/due.t
+++ b/test/due.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/duplicate.t b/test/duplicate.t
index 36294a828..41fdbcc10 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/edit.t b/test/edit.t
index 050d2a54a..18b84d09b 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/encoding.t b/test/encoding.t
index 1ad71bd20..0b696c29e 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/enpassant.t b/test/enpassant.t
index e06340a80..23f7119a6 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 907ce8fb5..334f9dd63 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/exec.t b/test/exec.t
index 9e123158b..70f72d0d3 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/export.t b/test/export.t
index 8cc7318c5..62b617832 100755
--- a/test/export.t
+++ b/test/export.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/feature.559.t b/test/feature.559.t
index 84023499c..9bff3d16c 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index f1df831bd..438c51f27 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 56dc7e0c0..72b99a1f6 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 780d8f858..52a21285d 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/feedback.t b/test/feedback.t
index 5dc9b7fe9..6a80e587d 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/filter.t b/test/filter.t
index 97afdff7d..74a9d9abb 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/fontunderline.t b/test/fontunderline.t
index 5dda96366..fab9a8274 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/format.t b/test/format.t
index ee2a38b6c..6e1203b20 100755
--- a/test/format.t
+++ b/test/format.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/gc.t b/test/gc.t
index 510f0bf64..a8efbdd6b 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/helpers.t b/test/helpers.t
index e6e829652..ea3ac2d4c 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/history.t b/test/history.t
index 56b7f688c..f3b14733f 100755
--- a/test/history.t
+++ b/test/history.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hooks.env.t b/test/hooks.env.t
index 4b027e760..efd28840b 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index 73f26b91e..876e7955a 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index d88cb4732..334ee92bd 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 8b8fc2c37..affc53fa6 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index 995dda703..49753460b 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/hyphenate.t b/test/hyphenate.t
index 173840522..a09c41e74 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/ids.t b/test/ids.t
index 53999d1d0..b5d21c6ac 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/import.t b/test/import.t
index 243676c9a..9454a7f1c 100755
--- a/test/import.t
+++ b/test/import.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/info.t b/test/info.t
index 2fe7fdde1..5c93db5a6 100755
--- a/test/info.t
+++ b/test/info.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index de9c1a92f..a7da105f9 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/limit.t b/test/limit.t
index 3c0c94901..e7e819382 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 83ab40cfd..f52a40a8d 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/log.t b/test/log.t
index f692867f9..ad7dcab99 100755
--- a/test/log.t
+++ b/test/log.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/logo.t b/test/logo.t
index 1e69b6c7a..e1341bbe8 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/math.t b/test/math.t
index e7e1e2b3a..32a63962c 100755
--- a/test/math.t
+++ b/test/math.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/modify.t b/test/modify.t
index 1f2296d74..74a3d4957 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/nag.t b/test/nag.t
index 1b6424c77..c970ecdbb 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/obfuscate.t b/test/obfuscate.t
index 487d84107..884bb17af 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/oldest.t b/test/oldest.t
index 81607f3ab..e0e4e6fcc 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/operators.t b/test/operators.t
index 91cb16ffd..cb59a2121 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/overdue.t b/test/overdue.t
index 591f09aaa..779541997 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/partial.t b/test/partial.t
index fcf342c3c..5dc99d85e 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/prepend.t b/test/prepend.t
index 5019c3236..3c5a9daa9 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/pri_sort.t b/test/pri_sort.t
index 68f3bce03..e75d478e1 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/project.t b/test/project.t
index 41d1815cc..83b646c5a 100755
--- a/test/project.t
+++ b/test/project.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/purge.t b/test/purge.t
index 646a3c76a..e66b86ebe 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/quotes.t b/test/quotes.t
index 5c550c6ea..0c186e834 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/rc.override.t b/test/rc.override.t
index 111b34daa..e22841e05 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/recurrence.t b/test/recurrence.t
index 291ac44fc..f7e30f51f 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/reports.t b/test/reports.t
index 098592902..663413404 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/search.t b/test/search.t
index 544d119dd..7e75c20fe 100755
--- a/test/search.t
+++ b/test/search.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/sequence.t b/test/sequence.t
index eac71a0e7..2476bfb63 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/shell.t b/test/shell.t
index a01857963..3ef608559 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/show.t b/test/show.t
index a99b2aad8..b02e74c68 100755
--- a/test/show.t
+++ b/test/show.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index 110ae8417..0281b1f25 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/sorting.t b/test/sorting.t
index 1d9cc9031..1efdd7c70 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/special.t b/test/special.t
index d62547df5..69a3d99d0 100755
--- a/test/special.t
+++ b/test/special.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/start.t b/test/start.t
index 46209704c..31a824c69 100755
--- a/test/start.t
+++ b/test/start.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/stats.t b/test/stats.t
index ceaf0905b..2577490b4 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/substitute.t b/test/substitute.t
index e2bf66080..5ed1986c3 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/sugar.t b/test/sugar.t
index d8c07f31b..d6fc1dead 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/summary.t b/test/summary.t
index a038e1e8c..b9173c5a7 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/t.t.cpp b/test/t.t.cpp
index 7aa3c3d1e..2f90b354d 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/tag.t b/test/tag.t
index 681b76c2f..95ce8b8b0 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/taskrc.t b/test/taskrc.t
index bba5008c1..fdbd25ad2 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index 001a09cb0..3de04603c 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/template.t b/test/template.t
index f7a227a2a..93bc26caf 100644
--- a/test/template.t
+++ b/test/template.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/test.cpp b/test/test.cpp
index 299214731..292cc9583 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/test.h b/test/test.h
index 557d9f06d..bd8a3c0ff 100644
--- a/test/test.h
+++ b/test/test.h
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/timesheet.t b/test/timesheet.t
index b3c0fa610..c73587f64 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-1379.t b/test/tw-1379.t
index 093566254..b3d23af81 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-1837.t b/test/tw-1837.t
index 8d4521d9d..412bebf02 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-20.t b/test/tw-20.t
index e824cd95f..56587d56a 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-262.t b/test/tw-262.t
index cbba7a877..08741895c 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-295.t b/test/tw-295.t
index 65237fb9e..22d843ff9 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/tw-46.t b/test/tw-46.t
index 45926bc48..b91f31c75 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/uda.t b/test/uda.t
index 1cbae6120..077fa0f18 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index bfbe9833a..f53f2d6a1 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/uda_report.t b/test/uda_report.t
index d508b8963..c04856084 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 7f74f50b3..1297eb68a 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/undo.t b/test/undo.t
index 163f88935..94367f460 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/unicode.t b/test/unicode.t
index f72b48db7..c46fe079b 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/unique.t b/test/unique.t
index bf390d089..f87d5b14e 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/upgrade.t b/test/upgrade.t
index daf3f5ffe..4fcf3d4be 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/urgency.t b/test/urgency.t
index 6a29c4191..1f7c5da69 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index 4c3f77fc6..b5b7d8776 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 3ee45ae00..3ca201547 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/uuid.t b/test/uuid.t
index 576ad2f2c..07d536274 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index 048f9c44d..6f6e4cc79 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index cbf1eb3a7..550d4ba97 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 6ae0e4062..1ed89742c 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index 7b2cd4515..d9c5b728b 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index e8350f8de..e5383fcdb 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index a1ef6bf5d..10ee464ec 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index 35c591065..a86d53997 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index 42937570c..015a5913c 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index adced2a2e..8d9dc8338 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index e90b081b9..971a88aa1 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index e04f1cad0..5b6484cac 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index 2a2440122..e8c52d148 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index 6430e6f7e..9dd33a581 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index 53d2037cb..ecb8b976a 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index 506432418..76ff2f04d 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index 74861f055..5207009db 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index c0908579b..805ca5c6d 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index 7f1a5e3a4..89d48a737 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index 09e7cee0d..06bf6a97b 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index 382e296c0..371ae6035 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index 15365f4a6..4f5fe329b 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/verbose.t b/test/verbose.t
index aab5a65ca..e4e169f4f 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/version.t b/test/version.t
index 557c72064..614fe513f 100755
--- a/test/version.t
+++ b/test/version.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 45623fa8e..aa6d571d8 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// http://www.opensource.org/licenses/mit-license.php
+// https://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/wait.t b/test/wait.t
index 5aa89d83b..71864cf9b 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 

From 02470c56470ae929fdff378c0df7f25dc8d2cf1c Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:44:31 +0100
Subject: [PATCH 766/879] Docs: always use https:// link for taskwarrior.org

---
 ChangeLog               | 2 +-
 INSTALL                 | 2 +-
 README.md               | 4 ++--
 doc/man/task-color.5.in | 6 +++---
 doc/man/task-sync.5.in  | 6 +++---
 doc/man/task.1.in       | 6 +++---
 doc/man/taskrc.5.in     | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5549cac49..84a530ab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2069,7 +2069,7 @@ Bugs
 - Supports 'rc.name:value' for a command line override to .taskrc data
   (thanks to Federico Hernandez).
 - Removed obsolete DEVELOPERS file.  The online support forums at
-  http://taskwarrior.org will provide better information.
+  https://taskwarrior.org will provide better information.
 - Fixed bug that kept some deleted tasks showing up on the calendar report
   (thanks to Federico Hernandez).
 - Now asks the user to confirm large changes if configuration variable
diff --git a/INSTALL b/INSTALL
index 798201a4a..bd0bed844 100644
--- a/INSTALL
+++ b/INSTALL
@@ -141,7 +141,7 @@ Darwin, 32bit
     cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
 
   See:
-    http://taskwarrior.org/issues/817
+    https://taskwarrior.org/issues/817
     http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
     http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
     http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
diff --git a/README.md b/README.md
index fe189f6b6..d2355cff0 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ Source project.
 ## Documentation
 
 There is extensive online documentation.
-You'll find all the details at [taskwarrior.org/docs](http://taskwarrior.org/docs)
+You'll find all the details at [taskwarrior.org/docs](https://taskwarrior.org/docs)
 
 At the site you'll find online documentation, downloads, news and more.
 
 ## Support
 
-For support options, take a look at [taskwarrior.org/support](http://taskwarrior.org/support)
+For support options, take a look at [taskwarrior.org/support](https://taskwarrior.org/support)
 
 Please use pull requests, or alternately send your code patches to
 [support@gothenburgbitfactory.org](mailto:support@gothenburgbitfactory.org)
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 94411f491..32256161c 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -300,7 +300,7 @@ You can also see how the theme will color the various tasks with the command:
     $ task color legend
 
 Better yet, create your own, and share it.  We will gladly host the theme file
-on <http://taskwarrior.org>.
+on <https://taskwarrior.org>.
 
 .SH "CREDITS & COPYRIGHTS"
 Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
@@ -317,7 +317,7 @@ For more information regarding Taskwarrior, the following may be referenced:
 
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 
 .TP
 The official code repository at
@@ -330,4 +330,4 @@ You can contact the project by writing an email to
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 90fdf9de5..6199d34b7 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -87,7 +87,7 @@ done on demand.
 
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
-http://taskwarrior.org/docs/server_setup.html)
+https://taskwarrior.org/docs/server_setup.html)
 
 Once you have an account, you'll receive a certificate, key, and credentials.
 You'll need to put the certificate and key somewhere like this:
@@ -169,7 +169,7 @@ For more information regarding task, the following may be referenced:
 
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 
 .TP
 The official code repository at
@@ -182,4 +182,4 @@ You can contact the project by writing an email to
 .SH REPORTING BUGS
 .TP
 Bugs in task may be reported to the issue-tracker at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 18c9ed446..5d1cbb357 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -681,7 +681,7 @@ extracted by DOM references.
 
 For a full list of supported attribute-specific DOM references, consult
 the online documentation at:
-<http://taskwarrior.org/docs/dom.html>
+<https://taskwarrior.org/docs/dom.html>
 
 .SH ATTRIBUTES AND METADATA
 
@@ -1293,7 +1293,7 @@ the 'data.location' configuration setting of the task data directory.
 For examples please see the online documentation starting at
 
 .RS
-<http://taskwarrior.org/docs>
+<https://taskwarrior.org/docs>
 .RE
 
 Note that the online documentation can be more detailed and more current than
@@ -1339,7 +1339,7 @@ For more information regarding Taskwarrior, see the following:
 
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 
 .TP
 The official code repository at
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 8b3a41426..ae2e0145d 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1528,7 +1528,7 @@ For more information regarding Taskwarrior, see the following:
 
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 
 .TP
 The official code repository at

From a87dfe62ad025e963e5aa3d3bf0162d4a37bed4f Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:50:10 +0100
Subject: [PATCH 767/879] Docs: sync "SEE ALSO" sections of task-color.5 and
 task-sync.5

---
 doc/man/task-color.5.in |  8 ++++----
 doc/man/task-sync.5.in  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 32256161c..f1e92b268 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -313,7 +313,7 @@ https://www.opensource.org/licenses/mit-license.php for more information.
 .BR taskrc(5),
 .BR task-sync(5)
 
-For more information regarding Taskwarrior, the following may be referenced:
+For more information regarding Taskwarrior, see the following:
 
 .TP
 The official site at
@@ -324,10 +324,10 @@ The official code repository at
 <https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
-You can contact the project by writing an email to
-<support@gothenburgbitfactory.org>
+You can contact the project by emailing
+<support@GothenburgBitFactory.org>
 
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://taskwarrior.org>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 6199d34b7..94fa68792 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -165,7 +165,7 @@ https://www.opensource.org/licenses/mit-license.php for more information.
 .BR taskrc(5),
 .BR task-color(5),
 
-For more information regarding task, the following may be referenced:
+For more information regarding Taskwarrior, see the following:
 
 .TP
 The official site at
@@ -176,10 +176,10 @@ The official code repository at
 <https://github.com/GothenburgBitFactory/taskwarrior>
 
 .TP
-You can contact the project by writing an email to
-<support@gothenburgBitFactory.org>
+You can contact the project by emailing
+<support@GothenburgBitFactory.org>
 
 .SH REPORTING BUGS
 .TP
-Bugs in task may be reported to the issue-tracker at
-<https://taskwarrior.org>
+Bugs in Taskwarrior may be reported to the issue-tracker at
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>

From 7441e6cf74277c1a121a62c4daa01203a1578c71 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:50:55 +0100
Subject: [PATCH 768/879] Docs: remove insecure CA configuration from
 task-sync.5

The option taskd.trust is documented in taskrc.5 if the user really
needs it. But we shouldn't suggest an insecure configuration in the
default setup instructions.
---
 doc/man/task-sync.5.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 94fa68792..75cebaa84 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -108,12 +108,6 @@ certificate, which means you will need one of the following additional entries:
     $ task config taskd.ca          ~/.task/ca.cert.pem
 
 The CA (Certificate Authority) will be used to verify the server certificate.
-Alternatively, you can override the cert verification process using:
-
-    $ task config taskd.trust       'allow all'
-
-This is an insecure option that should be used with caution, because it directs
-Taskwarrior to trust any certificate.
 
 After setup, you run a one-time sync initialization, like this:
 

From d0bbe2a0e82e83e101943a902f6a62517a4f60bf Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:53:40 +0100
Subject: [PATCH 769/879] Docs: don't mark cloud provides as "always secure" in
 task-sync.5

The data is stored remotely and possibly (depending on the provider) not
transfered securely.
---
 doc/man/task-sync.5.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 75cebaa84..cddb4a565 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -62,8 +62,6 @@ configuration variable like this:
     $ task config data.location /path/to/shared/directory
 
 Strengths:
-.br
-  - Always secure
 .br
   - Good client support
 .br

From eabda340ef8af2bc334a14ca188c4df87f39cbec Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 14:54:52 +0100
Subject: [PATCH 770/879] Docs: remove instructions which are already default
 in task-color.5

The text even mentions, that it might not be necessary. So just remove
this section.
---
 doc/man/task-color.5.in | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index f1e92b268..1958735fd 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -3,20 +3,6 @@
 .SH NAME
 task-color \- A color tutorial for the Taskwarrior command line todo manager.
 
-.SH SETUP
-The first thing you need is make sure you tell Taskwarrior that you want to use
-color.  This is the default for Taskwarrior, so the following step may be
-unnecessary.
-
-    $ task config color on
-
-This command will make sure there is an entry in your ~/.taskrc file that looks
-like:
-
-    color=on
-
-Now Taskwarrior is ready.
-
 .SH AUTOMATIC MONOCHROME
 It should be mentioned that Taskwarrior is aware of whether its output is going
 to a terminal, or to a file or through a pipe.  When Taskwarrior output goes to

From e3dab66ad1a26943a96d5e00d3d45368533e7b61 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Mar 2018 13:21:44 -0500
Subject: [PATCH 771/879] Update task-sync.5.in

Downgraded 'Always secure' to 'Secure communication', for accuracy.
---
 doc/man/task-sync.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index cddb4a565..076c6a789 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -136,7 +136,7 @@ This protects you against the effects of a sync/duplication bug.
 
 Strengths:
 .br
-  - Always secure
+  - Secure communication
 .br
   - Minimal bandwidth
 .br

From 9bfc8c2ff66946e40721f7ff36ef7747cbe7beb9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 4 Mar 2018 13:26:43 -0500
Subject: [PATCH 772/879] Docs: Updated AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 4dc5e7c89..a7b5b6c44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,6 +144,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Mark Scannell
   buhtz
   Tiago Matias
+  Simon Ruderich
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:

From 286fca39351f669e10886dd5a1a9d8e80f32d4f2 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 4 Mar 2018 23:06:19 +0100
Subject: [PATCH 773/879] Docs: fix outdated link in task-sync.5

---
 doc/man/task-sync.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 076c6a789..2ec5f96dc 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -85,7 +85,7 @@ done on demand.
 
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
-https://taskwarrior.org/docs/server_setup.html)
+https://taskwarrior.org/docs/taskserver/setup.html)
 
 Once you have an account, you'll receive a certificate, key, and credentials.
 You'll need to put the certificate and key somewhere like this:

From 90cc2a441d7527c8cd35f550821e355b4b9a5da1 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:54:08 +0100
Subject: [PATCH 774/879] Context: remove duplicate default value for
 rule.precedence.color

---
 src/Context.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 01b1e4477..17903dcda 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -165,6 +165,9 @@ std::string configurationDefaults =
   "# Color controls.\n"
   "color=1                                        # Enable color\n"
   "\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=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
   "\n"
   "# General decoration\n"
@@ -248,11 +251,6 @@ std::string configurationDefaults =
   "urgency.uda.priority.M.coefficient=3.9         # UDA priority coefficient for value 'M'\n"
   "urgency.uda.priority.L.coefficient=1.8         # UDA priority coefficient for value 'L'\n"
   "\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=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
-  "\n"
   "#default.project=foo                           # Default project for 'add' command\n"
   "#default.due=eom                               # Default due date for 'add' command\n"
   "#default.scheduled=eom                         # Default scheduled date for 'add' command\n"

From c6267c526d501a728cb3455daffad0fb3a396a53 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:58:29 +0100
Subject: [PATCH 775/879] Docs: fix incorrect value in task-color.5

---
 doc/man/task-color.5.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 1958735fd..b516d6f0e 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -222,7 +222,7 @@ variable 'rule.precedence.color', which by default contains:
     deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 
 These are just the color rules with the 'color.' prefix removed.  The
-rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
+rule 'color.deleted' has the highest precedence, and 'color.uda.' the lowest.
 
 The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
 meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly

From 6f19a3fbae79091ab1526532b59da002bb6eb1e6 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 6 Mar 2018 21:59:12 +0100
Subject: [PATCH 776/879] Docs: remove duplication in task-color.5

In the example there are more than the three listed wildcard patterns.
Instead of listing them all, list just one. This is enough to describe
the idea.
---
 doc/man/task-color.5.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index b516d6f0e..cc024442d 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -225,8 +225,7 @@ These are just the color rules with the 'color.' prefix removed.  The
 rule 'color.deleted' has the highest precedence, and 'color.uda.' the lowest.
 
 The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
-meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly
-for the 'color.tag.*' and 'color.project.*' rules.
+meaning 'color.keyword.*', or in other words all the keyword rules.
 
 There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
 specifically represent missing data.

From 511a23521522aa05bc990ee9d8d022e74b7bfcf7 Mon Sep 17 00:00:00 2001
From: Kirill Bobyrev <kbobyrev.opensource@gmail.com>
Date: Wed, 7 Mar 2018 22:21:28 +0300
Subject: [PATCH 777/879] Use nullptr instead lf C-styled NULL

---
 src/CLI2.cpp                    |  4 ++--
 src/Context.cpp                 |  2 +-
 src/DOM.cpp                     |  6 +++---
 src/TDB2.cpp                    |  2 +-
 src/TLSClient.cpp               |  8 ++++----
 src/TLSClient.h                 |  2 +-
 src/Task.cpp                    | 14 +++++++-------
 src/Variant.cpp                 |  4 ++--
 src/columns/ColDepends.cpp      |  4 ++--
 src/columns/ColDescription.cpp  |  4 ++--
 src/columns/ColUDA.cpp          |  4 ++--
 src/columns/Column.cpp          |  2 +-
 src/commands/CmdCalendar.cpp    |  6 +++---
 src/commands/CmdDiagnostics.cpp |  4 ++--
 src/commands/CmdEdit.cpp        |  4 ++--
 src/commands/CmdInfo.cpp        |  4 ++--
 src/commands/CmdModify.h        |  6 +++---
 src/commands/CmdStats.cpp       |  6 +++---
 src/commands/CmdSummary.cpp     |  8 ++++----
 src/feedback.cpp                |  2 +-
 src/recur.cpp                   |  8 ++++----
 src/sort.cpp                    |  8 ++++----
 22 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index e8667a5b4..3a7b13c72 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1734,8 +1734,8 @@ void CLI2::insertIDExpr ()
           else
           {
             bool ascending = true;
-            int low  = strtol (r->first.c_str (),  NULL, 10);
-            int high = strtol (r->second.c_str (), NULL, 10);
+            int low  = strtol (r->first.c_str (),  nullptr, 10);
+            int high = strtol (r->second.c_str (), nullptr, 10);
             if (low <= high)
               ascending = true;
             else
diff --git a/src/Context.cpp b/src/Context.cpp
index 17903dcda..6779065aa 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1027,7 +1027,7 @@ void Context::getLimits (int& rows, int& lines)
     }
     else
     {
-      rows = (int) strtol (limit.c_str (), NULL, 10);
+      rows = (int) strtol (limit.c_str (), nullptr, 10);
       lines = 0;
     }
   }
diff --git a/src/DOM.cpp b/src/DOM.cpp
index b641ce855..54d97eeac 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -279,7 +279,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
     else if (type == Lexer::Type::number &&
              token.find ('.') == std::string::npos)
     {
-      auto id = strtol (token.c_str (), NULL, 10);
+      auto id = strtol (token.c_str (), nullptr, 10);
       if (id && id != ref.id)
         Context::getContext ().tdb2.get (id, ref);
 
@@ -375,7 +375,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
   {
     auto annos = ref.getAnnotations ();
 
-    int a = strtol (elements[1].c_str (), NULL, 10);
+    int a = strtol (elements[1].c_str (), nullptr, 10);
     int count = 0;
 
     // Count off the 'a'th annotation.
@@ -403,7 +403,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
   {
     auto annos = ref.getAnnotations ();
 
-    int a = strtol (elements[1].c_str (), NULL, 10);
+    int a = strtol (elements[1].c_str (), nullptr, 10);
     int count = 0;
 
     // Count off the 'a'th annotation.
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 1fb973d66..b07cee2c7 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1026,7 +1026,7 @@ void TDB2::show_diff (
   const std::string& prior,
   const std::string& when)
 {
-  Datetime lastChange (strtol (when.c_str (), NULL, 10));
+  Datetime lastChange (strtol (when.c_str (), nullptr, 10));
 
   // Set the colors.
   Color color_red   (Context::getContext ().color () ? Context::getContext ().config.get ("color.undo.before") : "");
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 04baf78e3..e984a72c7 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -218,7 +218,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 #if GNUTLS_VERSION_NUMBER >= 0x030406
   // For _trust == TLSClient::allow_all we perform no action
   if (_trust == TLSClient::ignore_hostname)
-    gnutls_session_set_verify_cert (_session, NULL, 0); // 3.4.6
+    gnutls_session_set_verify_cert (_session, nullptr, 0); // 3.4.6
   else if (_trust == TLSClient::strict)
     gnutls_session_set_verify_cert (_session, _host.c_str (), 0); // 3.4.6
 #endif
@@ -251,7 +251,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 
   // Try them all, stop on success.
   struct addrinfo* p;
-  for (p = res; p != NULL; p = p->ai_next)
+  for (p = res; p != nullptr; p = p->ai_next)
   {
     if ((_socket = ::socket (p->ai_family, p->ai_socktype, p->ai_protocol)) == -1)
       continue;
@@ -275,7 +275,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
 
   free (res);
 
-  if (p == NULL)
+  if (p == nullptr)
     throw format ("Could not connect to {1} {2}", host, port);
 
 #if GNUTLS_VERSION_NUMBER >= 0x030100
@@ -362,7 +362,7 @@ int TLSClient::verify_certificate () const
   const char* hostname = _host.c_str();
 #if GNUTLS_VERSION_NUMBER >= 0x030104
   if (_trust == TLSClient::ignore_hostname)
-    hostname = NULL;
+    hostname = nullptr;
 
   int ret = gnutls_certificate_verify_peers3 (_session, hostname, &status); // 3.1.4
   if (ret < 0)
diff --git a/src/TLSClient.h b/src/TLSClient.h
index f0b5fd022..307fd76b0 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -58,7 +58,7 @@ private:
   std::string                      _host        {""};
   std::string                      _port        {""};
   gnutls_certificate_credentials_t _credentials {};
-  gnutls_session_t                 _session     {0};
+  gnutls_session_t                 _session     {nullptr};
   int                              _socket      {0};
   int                              _limit       {0};
   bool                             _debug       {false};
diff --git a/src/Task.cpp b/src/Task.cpp
index 04bdf5f1c..327f5b911 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -181,7 +181,7 @@ const std::string Task::identifier (bool shortened /* = false */) const
 void Task::setAsNow (const std::string& att)
 {
   char now[16];
-  snprintf (now, 16, "%u", (unsigned int) time (NULL));
+  snprintf (now, 16, "%u", (unsigned int) time (nullptr));
   set (att, now);
 
   recalc_urgency = true;
@@ -231,7 +231,7 @@ int Task::get_int (const std::string& name) const
 {
   auto i = data.find (name);
   if (i != data.end ())
-    return strtol (i->second.c_str (), NULL, 10);
+    return strtol (i->second.c_str (), nullptr, 10);
 
   return 0;
 }
@@ -241,7 +241,7 @@ unsigned long Task::get_ulong (const std::string& name) const
 {
   auto i = data.find (name);
   if (i != data.end ())
-    return strtoul (i->second.c_str (), NULL, 10);
+    return strtoul (i->second.c_str (), nullptr, 10);
 
   return 0;
 }
@@ -251,7 +251,7 @@ float Task::get_float (const std::string& name) const
 {
   auto i = data.find (name);
   if (i != data.end ())
-    return strtof (i->second.c_str (), NULL);
+    return strtof (i->second.c_str (), nullptr);
 
   return 0.0;
 }
@@ -261,7 +261,7 @@ time_t Task::get_date (const std::string& name) const
 {
   auto i = data.find (name);
   if (i != data.end ())
-    return (time_t) strtoul (i->second.c_str (), NULL, 10);
+    return (time_t) strtoul (i->second.c_str (), nullptr, 10);
 
   return 0;
 }
@@ -1060,7 +1060,7 @@ bool Task::hasAnnotations () const
 // timestamp.
 void Task::addAnnotation (const std::string& description)
 {
-  time_t now = time (NULL);
+  time_t now = time (nullptr);
   std::string key;
 
   do
@@ -1930,7 +1930,7 @@ float Task::urgency_active () const
 float Task::urgency_scheduled () const
 {
   if (has ("scheduled") &&
-      get_date ("scheduled") < time (NULL))
+      get_date ("scheduled") < time (nullptr))
     return 1.0;
 
   return 0.0;
diff --git a/src/Variant.cpp b/src/Variant.cpp
index ab6bb3a61..630264f7a 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1864,9 +1864,9 @@ void Variant::cast (const enum type new_type)
                _string == "0.0") ? false : true;
       break;
     case type_integer:
-      _integer = (int) strtol (_string.c_str (), NULL, (_string.substr (0, 2) == "0x" ? 16 : 10));
+      _integer = (int) strtol (_string.c_str (), nullptr, (_string.substr (0, 2) == "0x" ? 16 : 10));
       break;
-    case type_real:     _real = strtod (_string.c_str (), NULL);              break;
+    case type_real:     _real = strtod (_string.c_str (), nullptr);              break;
     case type_string:                                                         break;
     case type_date:
       {
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 2bb3a0f01..da1a24423 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -154,14 +154,14 @@ void ColumnDepends::modify (Task& task, const std::string& value)
       if (dep.length () == 37)
         task.removeDependency (dep.substr (1));
       else
-        task.removeDependency (strtol (dep.substr (1).c_str (), NULL, 10));
+        task.removeDependency (strtol (dep.substr (1).c_str (), nullptr, 10));
     }
     else
     {
       if (dep.length () == 36)
         task.addDependency (dep);
       else
-        task.addDependency (strtol (dep.c_str (), NULL, 10));
+        task.addDependency (strtol (dep.c_str (), nullptr, 10));
     }
   }
 }
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 3db411e0f..27c7dea0c 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -171,7 +171,7 @@ void ColumnDescription::render (
     {
       for (const auto& i : task.getAnnotations ())
       {
-        Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
+        Datetime dt (strtol (i.first.substr (11).c_str (), nullptr, 10));
         description += '\n' + std::string (_indent, ' ') + dt.toString (_dateformat) + ' ' + i.second;
       }
     }
@@ -200,7 +200,7 @@ void ColumnDescription::render (
     {
       for (const auto& i : task.getAnnotations ())
       {
-        Datetime dt (strtol (i.first.substr (11).c_str (), NULL, 10));
+        Datetime dt (strtol (i.first.substr (11).c_str (), nullptr, 10));
         description += ' ' + dt.toString (_dateformat) + ' ' + i.second;
       }
     }
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 523506ff1..f68d68d66 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -241,7 +241,7 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
         //   rc.report.<report>.dateformat
         //   rc.dateformat.report
         //   rc.dateformat
-        Datetime date ((time_t) strtol (value.c_str (), NULL, 10));
+        Datetime date ((time_t) strtol (value.c_str (), nullptr, 10));
         auto format = Context::getContext ().config.get ("report." + _report + ".dateformat");
         if (format == "")
           format = Context::getContext ().config.get ("dateformat.report");
@@ -287,7 +287,7 @@ void ColumnUDADate::render (
           format = Context::getContext ().config.get ("dateformat");
       }
 
-      renderStringLeft (lines, width, color, Datetime ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
+      renderStringLeft (lines, width, color, Datetime ((time_t) strtol (value.c_str (), nullptr, 10)).toString (format));
     }
     else if (_style == "indicator")
     {
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 3ef5b129a..ccf7cfa5a 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -213,7 +213,7 @@ Column* Column::uda (const std::string& name)
   else if (type != "")
     throw std::string ("User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'.");
 
-  return NULL;
+  return nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index e77311a73..8c24fbe67 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -121,12 +121,12 @@ int CmdCalendar::execute (std::string& output)
 
     // YYYY.
     else if (Lexer::isAllDigits (arg) && arg.length () == 4)
-      argYear = strtol (arg.c_str (), NULL, 10);
+      argYear = strtol (arg.c_str (), nullptr, 10);
 
     // MM.
     else if (Lexer::isAllDigits (arg) && arg.length () <= 2)
     {
-      argMonth = strtol (arg.c_str (), NULL, 10);
+      argMonth = strtol (arg.c_str (), nullptr, 10);
       if (argMonth < 1 || argMonth > 12)
         throw format ("Argument '{1}' is not a valid month.", arg);
     }
@@ -564,7 +564,7 @@ std::string CmdCalendar::renderMonths (
                 task.has ("due"))
             {
               std::string due = task.get ("due");
-              Datetime duedmy (strtol (due.c_str(), NULL, 10));
+              Datetime duedmy (strtol (due.c_str(), nullptr, 10));
 
               if (duedmy.day   () == d           &&
                   duedmy.month () == months[mpl] &&
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index e36efa9ae..3a20abeb9 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -211,9 +211,9 @@ int CmdDiagnostics::execute (std::string& output)
   char* peditor;
   if (Context::getContext ().config.get ("editor") != "")
     out << "  rc.editor: " << Context::getContext ().config.get ("editor") << '\n';
-  else if ((peditor = getenv ("VISUAL")) != NULL)
+  else if ((peditor = getenv ("VISUAL")) != nullptr)
     out << "    $VISUAL: " << peditor << '\n';
-  else if ((peditor = getenv ("EDITOR")) != NULL)
+  else if ((peditor = getenv ("EDITOR")) != nullptr)
     out << "    $EDITOR: " << peditor << '\n';
 
   out << "     Server: "
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 2e5700f59..7baf33b07 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -249,7 +249,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
   for (auto& anno : task.getAnnotations ())
   {
-    Datetime dt (strtol (anno.first.substr (11).c_str (), NULL, 10));
+    Datetime dt (strtol (anno.first.substr (11).c_str (), nullptr, 10));
     before << "  Annotation:        " << dt.toString (dateformat)
            << " -- "                  << json::encode (anno.second) << '\n';
   }
@@ -652,7 +652,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     if (dep.length () >= 7)
       task.addDependency (dep);
     else
-      task.addDependency ((int) strtol (dep.c_str (), NULL, 10));
+      task.addDependency ((int) strtol (dep.c_str (), nullptr, 10));
   }
 
   // UDAs
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index d74d60189..78c80542d 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -217,7 +217,7 @@ int CmdInfo::execute (std::string& output)
     auto created = task.get ("entry");
     if (created.length ())
     {
-      Datetime dt (strtol (created.c_str (), NULL, 10));
+      Datetime dt (strtol (created.c_str (), nullptr, 10));
       age = Duration (now - dt).formatVague ();
     }
 
@@ -531,7 +531,7 @@ int CmdInfo::execute (std::string& output)
           {
             int row = journal.addRow ();
 
-            Datetime timestamp (strtol (undo[when].substr (5).c_str (), NULL, 10));
+            Datetime timestamp (strtol (undo[when].substr (5).c_str (), nullptr, 10));
             journal.set (row, 0, timestamp.toString (dateformat));
 
             Task before (undo[previous].substr (4));
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index 0c6d4adb6..7f42fc3dc 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -37,11 +37,11 @@ public:
   int execute (std::string&);
   void checkConsistency (Task &before, Task &after);
   int modifyAndUpdate (Task &before, Task &after,
-    std::map <std::string, std::string> *projectChanges = NULL);
+    std::map <std::string, std::string> *projectChanges = nullptr);
   int modifyRecurrenceSiblings (Task &task,
-    std::map <std::string, std::string> *projectChanges = NULL);
+    std::map <std::string, std::string> *projectChanges = nullptr);
   int modifyRecurrenceParent (Task &task,
-    std::map <std::string, std::string> *projectChanges = NULL);
+    std::map <std::string, std::string> *projectChanges = nullptr);
 };
 
 #endif
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 0786a6902..129037ae8 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -89,7 +89,7 @@ int CmdStats::execute (std::string& output)
   filter.subset (all, filtered);
 
   Datetime now;
-  time_t earliest   = time (NULL);
+  time_t earliest   = time (nullptr);
   time_t latest     = 1;
   int totalT        = 0;
   int deletedT      = 0;
@@ -123,13 +123,13 @@ int CmdStats::execute (std::string& output)
     if (task.is_blocked)  ++blockedT;
     if (task.is_blocking) ++blockingT;
 
-    time_t entry = strtol (task.get ("entry").c_str (), NULL, 10);
+    time_t entry = strtol (task.get ("entry").c_str (), nullptr, 10);
     if (entry < earliest) earliest = entry;
     if (entry > latest)   latest   = entry;
 
     if (status == Task::completed)
     {
-      time_t end = strtol (task.get ("end").c_str (), NULL, 10);
+      time_t end = strtol (task.get ("end").c_str (), nullptr, 10);
       daysPending += (end - entry) / 86400.0;
     }
 
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index c9be6df0b..3aacf8657 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -79,7 +79,7 @@ int CmdSummary::execute (std::string& output)
   std::map <std::string, int> countCompleted;
   std::map <std::string, double> sumEntry;
   std::map <std::string, int> counter;
-  time_t now = time (NULL);
+  time_t now = time (nullptr);
 
   // Initialize counters.
   for (auto& project : allProjects)
@@ -107,7 +107,7 @@ int CmdSummary::execute (std::string& output)
       {
         ++countPending[parent];
 
-        time_t entry = strtol (task.get ("entry").c_str (), NULL, 10);
+        time_t entry = strtol (task.get ("entry").c_str (), nullptr, 10);
         if (entry)
           sumEntry[parent] = sumEntry[parent] + (double) (now - entry);
       }
@@ -119,8 +119,8 @@ int CmdSummary::execute (std::string& output)
       {
         ++countCompleted[parent];
 
-        time_t entry = strtol (task.get ("entry").c_str (), NULL, 10);
-        time_t end   = strtol (task.get ("end").c_str (), NULL, 10);
+        time_t entry = strtol (task.get ("entry").c_str (), nullptr, 10);
+        time_t end   = strtol (task.get ("end").c_str (), nullptr, 10);
         if (entry && end)
           sumEntry[parent] = sumEntry[parent] + (double) (end - entry);
       }
diff --git a/src/feedback.cpp b/src/feedback.cpp
index a6a06da21..4eb9c9b1d 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -247,7 +247,7 @@ std::string renderAttribute (const std::string& name, const std::string& value,
         col->type () == "date" &&
         value != "")
     {
-      Datetime d ((time_t)strtol (value.c_str (), NULL, 10));
+      Datetime d ((time_t)strtol (value.c_str (), nullptr, 10));
       if (format == "")
         return d.toString (Context::getContext ().config.get ("dateformat"));
 
diff --git a/src/recur.cpp b/src/recur.cpp
index efb3cf234..95445a462 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -239,7 +239,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
   else if (unicodeLatinDigit (period[0]) &&
            period[period.length () - 1] == 'm')
   {
-    int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
+    int increment = strtol (period.substr (0, period.length () - 1).c_str (), nullptr, 10);
 
     m += increment;
     while (m > 12)
@@ -258,7 +258,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
            Lexer::isAllDigits (period.substr (1, period.length () - 2)) &&
            period[period.length () - 1] == 'M')
   {
-    int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
+    int increment = strtol (period.substr (0, period.length () - 1).c_str (), nullptr, 10);
 
     m += increment;
     while (m > 12)
@@ -291,7 +291,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period)
 
   else if (unicodeLatinDigit (period[0]) && period[period.length () - 1] == 'q')
   {
-    int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
+    int increment = strtol (period.substr (0, period.length () - 1).c_str (), nullptr, 10);
 
     m += 3 * increment;
     while (m > 12)
@@ -381,7 +381,7 @@ void updateRecurrenceMask (Task& task)
   if (uuid != "" &&
       Context::getContext ().tdb2.get (uuid, parent))
   {
-    unsigned int index = strtol (task.get ("imask").c_str (), NULL, 10);
+    unsigned int index = strtol (task.get ("imask").c_str (), nullptr, 10);
     auto mask = parent.get ("mask");
     if (mask.length () > index)
     {
diff --git a/src/sort.cpp b/src/sort.cpp
index 02bc9eb00..1f2c3b780 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -35,7 +35,7 @@
 #include <shared.h>
 #include <format.h>
 
-static std::vector <Task>* global_data = NULL;
+static std::vector <Task>* global_data = nullptr;
 static std::vector <std::string> global_keys;
 static bool sort_compare (int, int);
 
@@ -194,13 +194,13 @@ static bool sort_compare (int left, int right)
     }
 
     // UDAs.
-    else if ((column = Context::getContext ().columns[field]) != NULL)
+    else if ((column = Context::getContext ().columns[field]) != nullptr)
     {
       std::string type = column->type ();
       if (type == "numeric")
       {
-        auto left_real  = strtof (((*global_data)[left].get_ref  (field)).c_str (), NULL);
-        auto right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL);
+        auto left_real  = strtof (((*global_data)[left].get_ref  (field)).c_str (), nullptr);
+        auto right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), nullptr);
 
         if (left_real == right_real)
           continue;

From aacf75d4145473a8eea18a2e8fc2f07fbef58473 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 7 Mar 2018 19:42:39 -0500
Subject: [PATCH 778/879] Updated AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index a7b5b6c44..6373063c2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -145,6 +145,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   buhtz
   Tiago Matias
   Simon Ruderich
+  Kirill Bobyrev
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:

From 3594e1886f3c837ca2c45ab475bb8eb057c61303 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 13 Mar 2018 20:28:54 -0400
Subject: [PATCH 779/879] libshared: Upgraded to
 999c824cf1139d208e884042eddef87a1d76fb7e

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 1fa5dcbf5..999c824cf 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 1fa5dcbf53a280857e35436aef6beb6a37266e33
+Subproject commit 999c824cf1139d208e884042eddef87a1d76fb7e

From 06521a1b55193883f951388d0ccd3e82d1590f78 Mon Sep 17 00:00:00 2001
From: Kirill Bobyrev <kbobyrev.opensource@gmail.com>
Date: Thu, 8 Mar 2018 02:42:28 +0300
Subject: [PATCH 780/879] Update notes regarding C++14 support

4a929197ae8c32d62a109e1ab063217d0c57c01b introduced C++14 support.
The build will now terminate unless the compiler supports C++14
dialect. The documentation does not reflect that: this commit updates
few reference files to actually say that the building process requires
a C++14-compliant compiler.
---
 DEVELOPER.md | 2 +-
 INSTALL      | 2 +-
 README.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DEVELOPER.md b/DEVELOPER.md
index fa405b350..937a5062c 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -2,7 +2,7 @@
 
 ## Satisfy the Requirements:
  * CMake 3.0 or later
- * gcc 5.0 or later, clang 3.4 or later, or a compiler with full C++11 support
+ * gcc 5.0 or later, clang 3.4 or later, or a compiler with full C++14 support
  * libuuid (if not on macOS)
  * gnutls (optional)
  * python 2.7 or 3 (optional, for running the test suite)
diff --git a/INSTALL b/INSTALL
index bd0bed844..1dd26dcc6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ from source. More information on CMake can be obtained at https://cmake.org
 You will also need:
   - make
 
-You will need a C++ compiler that supports full C++11, which includes:
+You will need a C++ compiler that supports full C++14, which includes:
   - gcc 5.0   (released 2013-12-23)
   - clang 3.4 (released 2014-01-02)
 
diff --git a/README.md b/README.md
index d2355cff0..6d711a698 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ There are many binary packages available, but to install from source requires:
 * git
 * cmake
 * make
-* C++ compiler, currently gcc 5.0+ or clang 3.4+ for full C++11 support
+* C++ compiler, currently gcc 5.0+ or clang 3.4+ for full C++14 support
 
 Download the tarball, and expand it:
 

From 24a68b2ad8b8a826b8396d12de3e26e8b8200f1b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 18 Mar 2018 11:09:34 -0400
Subject: [PATCH 781/879] TW #1973: Don't nag when no tasks are READY

- Thanks to Martin F. Krafft
---
 AUTHORS     |  1 +
 ChangeLog   | 20 +++++++++++---------
 src/nag.cpp |  3 ++-
 test/nag.t  | 27 ++++++++++++++++++++++-----
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6373063c2..eb2e98c5b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -326,3 +326,4 @@ suggestions:
   Marc Richter
   rjc
   php-coder
+  Martin F. Krafft
diff --git a/ChangeLog b/ChangeLog
index 84a530ab9..2c60a9df3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,7 +69,7 @@
           Thanks to rjc
 - TW-1910 unreachable statement
           Thanks to Martin Strunz
-= TW-1917/#1930 "above" does a string comparison, even when the value is numeric
+- TW-1917/#1930 "above" does a string comparison, even when the value is numeric
           Thanks to Dirk Deimeke
 - TW-1930 Typo in help
           Thanks to Kai HTML
@@ -81,14 +81,16 @@
           Thanks to Paul J. Fenwick
 - TW-1947 "urgency.over" filter seems to not work correct
           Thanks to Marc Richter
-- #1964 task burndown shows extra brackets #1964
-          Thanks to php-coder
-- #1966 Tests: Don't hardcode errno constants #1966
-          Thanks to Jakub Wilk
-- #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
-          Thanks to Lynoure Braakman
-- #1 URL formating
-          Thanks to buhtz
+- TW #1964 task burndown shows extra brackets #1964
+           Thanks to php-coder
+- TW #1966 Tests: Don't hardcode errno constants #1966
+           Thanks to Jakub Wilk
+- TW #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
+           Thanks to Lynoure Braakman
+- TW #1 URL formating
+           Thanks to buhtz
+- TW #1973 Don't nag when no tasks are READY
+           Thanks to Martin F. Krafft
 - Added 'juhannus' as a synonym for 'midsommarafton'
           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/nag.cpp b/src/nag.cpp
index 4b8a1d8ca..880b7e8a8 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -47,8 +47,9 @@ bool nag (Task& task)
     auto pending = Context::getContext ().tdb2.pending.get_tasks ();
     for (auto& t : pending)
     {
-      if ((t.getStatus () == Task::pending ||
+      if ((t.getStatus () == Task::pending  ||
            t.getStatus () == Task::waiting) &&
+          t.hasTag ("READY")                &&
           t.urgency () > task.urgency ())
       {
         Context::getContext ().footnote (msg);
diff --git a/test/nag.t b/test/nag.t
index c970ecdbb..98c982571 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -36,11 +36,13 @@ from basetest import Task, TestCase
 
 
 class TestNagging(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-        cls.t = Task()
-        cls.t.config("nag", "NAG")
+
+    def setUp(self):
+        """Executed before each test in the class"""
+        # Used to initialize objects that should be re-initialized or
+        # re-created for each individual test
+        self.t = Task()
+        self.t.config("nag", "NAG")
 
     def test_nagging(self):
         """Verify that nagging works when tasks are done in the 'wrong' order"""
@@ -73,6 +75,21 @@ class TestNagging(TestCase):
         code, out, err = self.t("1 done")
         self.assertNotIn("NAG", err)
 
+    def test_nagging_ready(self):
+        """Verify that nagging occurs when there are READY tasks of higher urgency"""
+        self.t("add one")                                # low urgency
+        self.t("add two due:10days scheduled:yesterday") # medium urgency, ready
+
+        code, out, err = self.t("1 done")
+        self.assertIn("NAG", err)
+
+    def test_nagging_not_ready(self):
+        """Verify that nagging does not occur when there are unREADY tasks of higher urgency"""
+        self.t("add one")                             # low urgency
+        self.t("add two due:10days scheduled:10days") # medium urgency, not ready
+
+        code, out, err = self.t("1 done")
+        self.assertNotIn("NAG", err)
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner

From ce924349c182bb93f6c2e8324a22cf3ae1659008 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 18 Mar 2018 11:10:13 -0400
Subject: [PATCH 782/879] Code cleanup: used auto

---
 src/commands/CmdDiagnostics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 3a20abeb9..21dae85df 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -329,7 +329,7 @@ int CmdDiagnostics::execute (std::string& output)
       Path p (hook);
       if (! p.is_directory ())
       {
-        std::string name = p.name ();
+        auto name = p.name ();
 
         if (p.executable () &&
             (name.substr (0, 6) == "on-add"    ||
@@ -358,7 +358,7 @@ int CmdDiagnostics::execute (std::string& output)
       Path p (hook);
       if (! p.is_directory ())
       {
-        std::string name = p.name ();
+        auto name = p.name ();
 
         if (! p.executable () ||
             (name.substr (0, 6) != "on-add"    &&

From 1133f02df7551df39fed796772c8cda400908a56 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 18 Mar 2018 11:19:56 -0400
Subject: [PATCH 783/879] TW #1986: [Nit] Update DEVELOPER.md after migration
 to Github

- Thanks to Kirill Bobyrev
---
 ChangeLog    | 10 ++++++----
 DEVELOPER.md |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c60a9df3..bd58ae06c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
           Thanks to Markus Beppler, Konstantin Vorobyev
 - TI-91   Timewarrior does not compile on DragonFly
           Thanks to Michael Neumann
+- TW #1 URL formating
+           Thanks to buhtz
+- TW #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
+           Thanks to Lynoure Braakman
 - TW-54/#115 Reduce output for timesheet
           Thanks to Aikido guy
 - TW-61   Extract only tasks with annotations
@@ -85,12 +89,10 @@
            Thanks to php-coder
 - TW #1966 Tests: Don't hardcode errno constants #1966
            Thanks to Jakub Wilk
-- TW #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
-           Thanks to Lynoure Braakman
-- TW #1 URL formating
-           Thanks to buhtz
 - TW #1973 Don't nag when no tasks are READY
            Thanks to Martin F. Krafft
+- TW #1986 [Nit] Update DEVELOPER.md after migration to Github
+           Thanks to Kirill Bobyrev
 - Added 'juhannus' as a synonym for 'midsommarafton'
           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 937a5062c..c7abcc88f 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -125,16 +125,16 @@
   All new unit tests should follow the test/template.t standard.
 
 # Patches
-  Patches are encouraged and welcomed. Either attach them to the appropriate
-  Jira issue, or send them to support@taskwarrior.org. A good patch:
+  Patches are encouraged and welcomed. Either send a pull request on Github or
+  email a patch to support@taskwarrior.org. A good patch:
 
     * Maintains the MIT license, and does not contain code lifted from other
       sources. You will have written 100% of the code in the patch, otherwise
       we cannot maintain the license.
     * Precisely addresses one issue only.
-    * Doesn't break unit tests.
+    * Doesn't break unit tests. This means yes, run the unit tests.
     * Doesn't introduce dependencies.
-    * Is accompanied by unit tests, where appropriate.
+    * Is accompanied by new or updated unit tests, where appropriate.
     * Is accompanied by documentation changes, where appropriate.
     * Conforms to the prevailing coding standards - in other words, it should
       fit in with the existing code.

From 75ad38f2445887fee1c683405c5e968c5b08b7e2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 18 Mar 2018 11:29:27 -0400
Subject: [PATCH 784/879] TW #1922: Can't find export scripts

- Thanks to tom-doerr
---
 AUTHORS           | 1 +
 ChangeLog         | 2 ++
 doc/man/task.1.in | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index eb2e98c5b..006eb3302 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -327,3 +327,4 @@ suggestions:
   rjc
   php-coder
   Martin F. Krafft
+  tom-doerr
diff --git a/ChangeLog b/ChangeLog
index bd58ae06c..3ab790bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,8 @@
            Thanks to Martin F. Krafft
 - TW #1986 [Nit] Update DEVELOPER.md after migration to Github
            Thanks to Kirill Bobyrev
+- TW #1922 Can't find export scripts
+           Thanks to tom-doerr
 - Added 'juhannus' as a synonym for 'midsommarafton'
           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 5d1cbb357..3cfa4bbf7 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -177,8 +177,8 @@ Displays only a count of tasks matching the filter.
 .B task <filter> export
 Exports all tasks in the JSON format.  Redirect the output to a file, if you
 wish to save it, or pipe it to another command or script to convert it to
-another format. The standard task release comes with a few example scripts,
-such as:
+another format. You'll find these example scripts online at
+<https://taskwarrior.org/tools/>:
 
   export-csv.pl
   export-sql.py

From c5ac2e2d0076ef768be7cad5b165e55131348b60 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 9 Apr 2018 10:19:46 +0200
Subject: [PATCH 785/879] Docs: mention "urgency" as possible attribute for
 filters

---
 doc/man/task.1.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 3cfa4bbf7..458444068 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -828,6 +828,13 @@ Attribute modifiers improve filters.  Supported modifiers are:
 .B  noword
 .RE
 
+They can be applied to all regular attributes (see above) and the following
+calculated attributes:
+
+.RS
+\fBurgency\fR (or short \fBurg\fR)
+.RE
+
 For example:
 
 .RS

From 9fefe4a3788be3cf2b96e824a137c9a60ae7bbe7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 10:41:27 -0400
Subject: [PATCH 786/879] Docs: Removed incorrect URL

---
 scripts/add-ons/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/add-ons/README b/scripts/add-ons/README
index 0a9799cde..45a9cc00b 100644
--- a/scripts/add-ons/README
+++ b/scripts/add-ons/README
@@ -1,3 +1,3 @@
 The import/export add-on scripts have been relocated online. Please see:
 
-https://taskwarrior.org/tools/#exts
+https://taskwarrior.org/tools

From 27055ea1b9116f1cefeb5d314119dc8b0aa0965f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 13 May 2018 13:54:04 -0400
Subject: [PATCH 787/879] TW #2020: reserved.lines is not affecting the
 burndown height
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Thanks to ad₋si.
---
 AUTHORS                      | 1 +
 ChangeLog                    | 2 ++
 src/commands/CmdBurndown.cpp | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 006eb3302..f2858d62f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -328,3 +328,4 @@ suggestions:
   php-coder
   Martin F. Krafft
   tom-doerr
+  ad-si
diff --git a/ChangeLog b/ChangeLog
index 3ab790bd6..384b9e6ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,8 @@
            Thanks to Kirill Bobyrev
 - TW #1922 Can't find export scripts
            Thanks to tom-doerr
+- TW #2020 reserved.lines is not affecting the burndown height
+           Thanks to ad₋si
 - Added 'juhannus' as a synonym for 'midsommarafton'
           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 16c9748e8..9047c3397 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -171,7 +171,9 @@ Chart::Chart (char type)
   // How much space is there to render in?  This chart will occupy the
   // maximum space, and the width drives various other parameters.
   _width = Context::getContext ().getWidth ();
-  _height = Context::getContext ().getHeight () - 1;  // Allow for new line with prompt.
+  _height = Context::getContext ().getHeight ()
+          - Context::getContext ().config.getInteger ("reserved.lines")
+          - 1;  // Allow for new line with prompt.
   _graph_height = _height - 7;
   _graph_width = _width - _max_label - 14;
 

From 09f9b9e625bac6d14e3134bc90bbef79dd84b295 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 14 May 2018 01:12:19 -0400
Subject: [PATCH 788/879] Build: Fixed missed context reference

---
 src/recur.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/recur.cpp b/src/recur.cpp
index 95445a462..f50d51ed8 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -139,8 +139,8 @@ void handleRecurrence ()
           Datetime (t.get_date ("until")) < now)
       {
         t.setStatus (Task::deleted);
-        context.tdb2.modify(t);
-        context.footnote (onExpiration (t));
+        Context::getContext ().tdb2.modify(t);
+        Context::getContext ().footnote (onExpiration (t));
       }
     }
   }

From edfa8ed4eaa898e2b93a66e213d8760715d38445 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 26 May 2018 09:50:50 -0400
Subject: [PATCH 789/879] Cleanup: Removed file that was accidentally
 cherry-picked

---
 src/columns/ColLast.cpp | 62 -----------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 src/columns/ColLast.cpp

diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp
deleted file mode 100644
index 9b508d6dc..000000000
--- a/src/columns/ColLast.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// https://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <ColLast.h>
-#include <format.h>
-
-////////////////////////////////////////////////////////////////////////////////
-ColumnLast::ColumnLast ()
-{
-  _name       = "last";
-  _style      = "number";
-  _label      = "Last instance";
-  _modifiable = false;
-  _styles     = {"number"};
-  _examples   = {"12"};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Set the minimum and maximum widths for the value.
-void ColumnLast::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
-{
-  minimum = maximum = 0;
-  if (task.has (_name))
-    minimum = maximum = task.get (_name).length ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ColumnLast::render (
-  std::vector <std::string>& lines,
-  Task& task,
-  int width,
-  Color& color)
-{
-  if (task.has (_name))
-    renderStringRight (lines, width, color, task.get (_name));
-}
-
-////////////////////////////////////////////////////////////////////////////////

From 376d3365251e0870aba4b8c5d994876a283904b1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 26 May 2018 10:00:05 -0400
Subject: [PATCH 790/879] libshared: Upgraded to
 230c63bd385b2a5a6ee5eb431df54b0c5c229b4d

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 999c824cf..230c63bd3 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 999c824cf1139d208e884042eddef87a1d76fb7e
+Subproject commit 230c63bd385b2a5a6ee5eb431df54b0c5c229b4d

From 08d985f40cab9361055d4d5287f105ea31f7a8e7 Mon Sep 17 00:00:00 2001
From: Vladimir Shulyak <vshulyak2003@hotmail.com>
Date: Sun, 27 May 2018 23:17:30 +0100
Subject: [PATCH 791/879] Display task ID when unwaiting task

---
 src/TDB2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index b07cee2c7..3bfdfc22e 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -367,7 +367,7 @@ void TF2::load_gc (Task& task)
       Context::getContext ().tdb2.pending._dirty = true;
 
       if (Context::getContext ().verbose ("unwait"))
-        Context::getContext ().footnote (format ("Un-waiting task '{1}'", task.get ("description")));
+        Context::getContext ().footnote (format ("Un-waiting task {1} '{2}'", task.id, task.get ("description")));
     }
 
     Context::getContext ().tdb2.pending._tasks.push_back (task);

From 78033ea2d3195cc70e5fac8e49e282eac0964556 Mon Sep 17 00:00:00 2001
From: Alexandre Provencio <alexandreprovencio@gmail.com>
Date: Sun, 17 Jun 2018 20:14:59 -0300
Subject: [PATCH 792/879] Updates vim's ftdetect

As described on issue #2032.
---
 scripts/vim/ftdetect/task.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim
index 23ac0500c..e9840a455 100644
--- a/scripts/vim/ftdetect/task.vim
+++ b/scripts/vim/ftdetect/task.vim
@@ -16,6 +16,7 @@ au BufRead,BufNewFile backlog.data	set filetype=javascript
 
 " Taskwarrior configuration file
 au BufRead,BufNewFile .taskrc				set filetype=taskrc
+au BufRead,BufNewFile taskrc				set filetype=taskrc
 
 " Taskwarrior handling of 'task 42 edit'
 au BufRead,BufNewFile *.task				set filetype=taskedit

From df70bb01732b2d86bb5005b8d2f3c9fc22500133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= <sim.desaulniers@gmail.com>
Date: Fri, 27 Jul 2018 17:37:54 -0400
Subject: [PATCH 793/879] doc/man: ready tasks sorted with started tasks 1st

---
 doc/man/task.1.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 458444068..7ef3a987b 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -294,9 +294,9 @@ value.
 
 .TP
 .B task <filter> ready
-Shows a page of the most urgent ready tasks, sorted by urgency.  A ready task is
-one that is either unscheduled, or has a scheduled date that is past and has no
-wait date.
+Shows a page of the most urgent ready tasks, sorted by urgency with started
+tasks first. A ready task is one that is either unscheduled, or has a scheduled
+date that is past and has no wait date.
 
 .TP
 .B task <filter> oldest

From 3c4b27608e8127768ce43bf9ff4fdf20a255982d Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 08:48:29 -0500
Subject: [PATCH 794/879] test: Add fedora28 and ubuntu1604 dockerfiles

These dockerfiles can be used to run taskwarrior's test suite on the
respective platforms using the following commands:

$ cd taskwarrior.git
$ docker build -t test-tw-fedora28 -f test/docker/fedora28 .
$ docker run test-tw-fedora28

For ubuntu, replace fedora28 with ubuntu1604.
---
 test/docker/fedora28   | 26 ++++++++++++++++++++++++++
 test/docker/ubuntu1604 | 27 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 test/docker/fedora28
 create mode 100644 test/docker/ubuntu1604

diff --git a/test/docker/fedora28 b/test/docker/fedora28
new file mode 100644
index 000000000..da31b8793
--- /dev/null
+++ b/test/docker/fedora28
@@ -0,0 +1,26 @@
+FROM fedora:28
+
+RUN dnf update -y
+RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; ./problems ; cat all.log | grep 'not ok'"]
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
new file mode 100644
index 000000000..5ebe52fa1
--- /dev/null
+++ b/test/docker/ubuntu1604
@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y python
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; ./problems ; cat all.log | grep 'not ok'"]

From a07169432455745bbf25f4756e0abd9492c1784a Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 08:59:46 -0500
Subject: [PATCH 795/879] test: Workaround the cyclic dependencies between the
 libraries

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3e34ef778..f1f79bd12 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -25,7 +25,7 @@ add_custom_target (build_tests DEPENDS ${test_SRCS}
 
 foreach (src_FILE ${test_SRCS})
   add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
-  target_link_libraries (${src_FILE} task commands task columns libshared ${TASK_LIBRARIES})
+  target_link_libraries (${src_FILE} task commands columns libshared task commands columns libshared task commands columns libshared ${TASK_LIBRARIES})
 endforeach (src_FILE)
 
 configure_file(run_all run_all COPYONLY)

From b5cf4ca56ea2bbbb8f51db232a252775a3dee050 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 09:33:27 -0500
Subject: [PATCH 796/879] tests: Change default command of the test containers
 to end with ./problems

This makes sure that non-zero return code is propagated out of the
container.
---
 test/docker/fedora28   | 2 +-
 test/docker/ubuntu1604 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/docker/fedora28 b/test/docker/fedora28
index da31b8793..6912f2b97 100644
--- a/test/docker/fedora28
+++ b/test/docker/fedora28
@@ -23,4 +23,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; ./problems ; cat all.log | grep 'not ok'"]
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
index 5ebe52fa1..295f61d19 100644
--- a/test/docker/ubuntu1604
+++ b/test/docker/ubuntu1604
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; ./problems ; cat all.log | grep 'not ok'"]
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From a1b3cfece439e65938eb9d7266406679e3bdb0c0 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:13:31 -0500
Subject: [PATCH 797/879] tests: Add docker-compose file

---
 docker-compose.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..5d3ca2f0b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+  test-f28:
+    build:
+        context: .
+        dockerfile: test/docker/fedora28
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
+  test-ubuntu1604:
+    build:
+        context: .
+        dockerfile: test/docker/ubuntu1604
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
+  test-debianstable:
+    build:
+        context: .
+        dockerfile: test/docker/debianstable
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true

From c2e1a9216d5082175895bb65caf35430290a18b9 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:19:32 -0500
Subject: [PATCH 798/879] tests: Rename docker-compose service to keep naming
 consistent

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5d3ca2f0b..1f988381f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 version: '3'
 services:
-  test-f28:
+  test-fedora28:
     build:
         context: .
         dockerfile: test/docker/fedora28

From cf9f6e958c3ec74502a36faf8cd0cc16569a8ea1 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 09:34:09 -0500
Subject: [PATCH 799/879] tests: Add test container for Debian Stable

---
 test/docker/debianstable | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 test/docker/debianstable

diff --git a/test/docker/debianstable b/test/docker/debianstable
new file mode 100644
index 000000000..e107043e6
--- /dev/null
+++ b/test/docker/debianstable
@@ -0,0 +1,27 @@
+FROM debian:stable
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y python
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From f6e7ac2e5e42f0c794160b71556f065241036fc4 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:19:45 -0500
Subject: [PATCH 800/879] tests: Add intial version of the Travis CI file

---
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..fab586f60
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+sudo: required
+env:
+  - CONTAINER=fedora28
+  - CONTAINER=debianstable
+  - CONTAINER=ubuntu1604
+services:
+  - docker
+install:
+  # Build the docker container
+  - pushd $TRAVIS_BUILD_DIR
+  - docker-compose build test-$CONTAINER
+script:
+  - docker-compose run test-$CONTAINER

From 0ef837bc19eabc050dc298befa00fd16b3f41ee2 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:22:34 -0500
Subject: [PATCH 801/879] README: Add travis badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 6d711a698..75ae2c40f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Travis build status](https://travis-ci.org/tbabej/taskwarrior.svg?branch=2.6.0)](https://travis-ci.org/tbabej/taskwarrior)
+
 # Taskwarrior
 
 Thank you for taking a look at Taskwarrior!

From 276039cf35e044d35398c416ad3706b4b571275f Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:23:19 -0500
Subject: [PATCH 802/879] README: Move badges below the heading

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 75ae2c40f..5b0130d1e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![Travis build status](https://travis-ci.org/tbabej/taskwarrior.svg?branch=2.6.0)](https://travis-ci.org/tbabej/taskwarrior)
-
 # Taskwarrior
 
+[![Travis build status](https://travis-ci.org/tbabej/taskwarrior.svg?branch=2.6.0)](https://travis-ci.org/tbabej/taskwarrior)
+
 Thank you for taking a look at Taskwarrior!
 
 Taskwarrior is a GTD, todo list, task management, command line utility with a

From 4fdb042ad4248f5f9e946d37096662c8916abf72 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:38:16 -0500
Subject: [PATCH 803/879] travis: Specify test matrix explicitly and add OS X

---
 .travis.yml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fab586f60..edb7f5760 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,25 @@
 sudo: required
-env:
-  - CONTAINER=fedora28
-  - CONTAINER=debianstable
-  - CONTAINER=ubuntu1604
-services:
-  - docker
+language: python
+matrix:
+  include:
+    - name: "Fedora 28"
+      os: linux
+      env: CONTAINER=fedora28
+      services: docker
+    - name: "Debian Stable"
+    - os: linux
+      env: CONTAINER=debianstable
+      services: docker
+    - name: "Ubuntu 16.04"
+    - os: linux
+      env: CONTAINER=ubuntu1604
+      services: docker
+    - name: "Mac OS X"
+      os: osx
+      env: CONTAINER=osx
 install:
   # Build the docker container
   - pushd $TRAVIS_BUILD_DIR
-  - docker-compose build test-$CONTAINER
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; done
 script:
-  - docker-compose run test-$CONTAINER
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; else uname -a; done

From d543b4c62572cda087f5690b8b137c49c8645c10 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:49:05 -0500
Subject: [PATCH 804/879] travis: Fix bash syntax error

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index edb7f5760..a8b031760 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,6 @@ matrix:
 install:
   # Build the docker container
   - pushd $TRAVIS_BUILD_DIR
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; done
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; fi
 script:
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; else uname -a; done
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; else uname -a; fi

From 534303795a347b547b3a1bb06854ad67a45b82ba Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:49:56 -0500
Subject: [PATCH 805/879] travis: Remove language

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a8b031760..b1c481569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: required
-language: python
 matrix:
   include:
     - name: "Fedora 28"

From d19b3aa837ce1825eb3d97a8b30bb4def5ad8579 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:54:02 -0500
Subject: [PATCH 806/879] travis: Remove syntax errors

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1c481569..2628c0d7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,11 @@ matrix:
       env: CONTAINER=fedora28
       services: docker
     - name: "Debian Stable"
-    - os: linux
+      os: linux
       env: CONTAINER=debianstable
       services: docker
     - name: "Ubuntu 16.04"
-    - os: linux
+      os: linux
       env: CONTAINER=ubuntu1604
       services: docker
     - name: "Mac OS X"

From e8508238096b9bdd684f0099650710322dbe1389 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 10:55:46 -0500
Subject: [PATCH 807/879] travis: Set generic language to avoid Ruby default

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 2628c0d7d..e0552112e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: required
+language: generic
 matrix:
   include:
     - name: "Fedora 28"

From d748650691ff20c915f8e8153cc7dc12a84dc57c Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:04:24 -0500
Subject: [PATCH 808/879] tests: Add OS X test sript

---
 test/scripts/test_osx.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 test/scripts/test_osx.sh

diff --git a/test/scripts/test_osx.sh b/test/scripts/test_osx.sh
new file mode 100644
index 000000000..9b6e46e65
--- /dev/null
+++ b/test/scripts/test_osx.sh
@@ -0,0 +1,17 @@
+set +x
+
+brew install gnutls
+brew install cmake
+git clean -dfx
+git submodule init
+git submodule update
+cmake -DCMAKE_BUILD_TYPE=debug .
+make -j2
+make install
+task --version
+
+pushd test
+make
+./run_all
+cat all.log | grep 'not ok'
+./problems

From 53b5e5c8ee401ea4e8d9ec2e826810b10b1b40f7 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:07:02 -0500
Subject: [PATCH 809/879] travis: Execute tests instead of rebuilding the
 container again in the script phase

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e0552112e..6fbcfaada 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ install:
   - pushd $TRAVIS_BUILD_DIR
   - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; fi
 script:
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; else uname -a; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi

From 7153a03a5f0dabf4bd0344c70b834c93fcc63fbe Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:12:02 -0500
Subject: [PATCH 810/879] tests: Properly set the xtrace flag

---
 test/scripts/test_osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/scripts/test_osx.sh b/test/scripts/test_osx.sh
index 9b6e46e65..612c2c371 100644
--- a/test/scripts/test_osx.sh
+++ b/test/scripts/test_osx.sh
@@ -1,4 +1,4 @@
-set +x
+set -x
 
 brew install gnutls
 brew install cmake

From 420892d7a996db5430c042cdccbbc0ac7d078177 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:19:30 -0500
Subject: [PATCH 811/879] travis: Make sure error codes propagate outside of
 the if clause

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fbcfaada..dee0cb657 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,6 @@ matrix:
 install:
   # Build the docker container
   - pushd $TRAVIS_BUILD_DIR
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER || exit 1; fi
 script:
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER || exit 1; else bash test/scripts/test_osx.sh || exit 1 ; fi

From 290fb4380c8df502ee1b8e085148316bba3a93b2 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:53:21 -0500
Subject: [PATCH 812/879] travis: Use travis_terminate instead of exit

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dee0cb657..bcb01551a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,6 @@ matrix:
 install:
   # Build the docker container
   - pushd $TRAVIS_BUILD_DIR
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER || exit 1; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER || travis_terminate 1; fi
 script:
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER || exit 1; else bash test/scripts/test_osx.sh || exit 1 ; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER || travis_terminate 1; else bash test/scripts/test_osx.sh || travis_terminate 1 ; fi

From 9518cdc1e9553e45b363c4c82016738e05183419 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 11:56:51 -0500
Subject: [PATCH 813/879] tests: Add testing support for Ubuntu 18.04

---
 .travis.yml            |  4 ++++
 docker-compose.yml     |  8 ++++++++
 test/docker/ubuntu1804 | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 test/docker/ubuntu1804

diff --git a/.travis.yml b/.travis.yml
index bcb01551a..c151af61b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,10 @@ matrix:
       os: linux
       env: CONTAINER=ubuntu1604
       services: docker
+    - name: "Ubuntu 18.04"
+      os: linux
+      env: CONTAINER=ubuntu1804
+      services: docker
     - name: "Mac OS X"
       os: osx
       env: CONTAINER=osx
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f988381f..3ee587461 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-ubuntu1804:
+    build:
+        context: .
+        dockerfile: test/docker/ubuntu1804
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-debianstable:
     build:
         context: .
diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu1804
new file mode 100644
index 000000000..ed857a441
--- /dev/null
+++ b/test/docker/ubuntu1804
@@ -0,0 +1,27 @@
+FROM ubuntu:18.04
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y python
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From ea2c4d96b44fd985e011bf4dc9685deffff2e3bb Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 12:01:24 -0500
Subject: [PATCH 814/879] tests: Add support for Fedora 29

---
 .travis.yml          |  4 ++++
 docker-compose.yml   |  8 ++++++++
 test/docker/fedora29 | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 test/docker/fedora29

diff --git a/.travis.yml b/.travis.yml
index c151af61b..3741d3cc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,10 @@ matrix:
       os: linux
       env: CONTAINER=fedora28
       services: docker
+    - name: "Fedora 29"
+      os: linux
+      env: CONTAINER=fedora28
+      services: docker
     - name: "Debian Stable"
       os: linux
       env: CONTAINER=debianstable
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ee587461..79aab1f79 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-fedora29:
+    build:
+        context: .
+        dockerfile: test/docker/fedora29
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-ubuntu1604:
     build:
         context: .
diff --git a/test/docker/fedora29 b/test/docker/fedora29
new file mode 100644
index 000000000..08848bce4
--- /dev/null
+++ b/test/docker/fedora29
@@ -0,0 +1,26 @@
+FROM fedora:29
+
+RUN dnf update -y
+RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From d3d7055103980b94951cb1347216d26ebf3c895d Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 12:12:11 -0500
Subject: [PATCH 815/879] travis: Use docker run instead of docker up

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3741d3cc4..16604e3f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,6 @@ matrix:
 install:
   # Build the docker container
   - pushd $TRAVIS_BUILD_DIR
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER || travis_terminate 1; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER ; fi
 script:
-  - if [[ $CONTAINER != "osx" ]]; then docker-compose up test-$CONTAINER || travis_terminate 1; else bash test/scripts/test_osx.sh || travis_terminate 1 ; fi
+  - if [[ $CONTAINER != "osx" ]]; then docker-compose run test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi

From 539dae214882068335d21897aab36330b71b59ea Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 12:19:05 -0500
Subject: [PATCH 816/879] travis: Be explicit about Mac OS X version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 16604e3f7..5caa38cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
       os: linux
       env: CONTAINER=ubuntu1804
       services: docker
-    - name: "Mac OS X"
+    - name: "Mac OS X 10.13"
       os: osx
       env: CONTAINER=osx
 install:

From 82102f59ba958162601a5cc8b3c2e9ab3ff1b697 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 13:25:07 -0500
Subject: [PATCH 817/879] tests: Add gentoo platform

---
 .travis.yml        |  4 ++++
 docker-compose.yml |  8 ++++++++
 test/docker/gentoo | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 test/docker/gentoo

diff --git a/.travis.yml b/.travis.yml
index 5caa38cbc..dcf0e189f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ matrix:
       os: linux
       env: CONTAINER=ubuntu1804
       services: docker
+    - name: "Gentoo (latest)"
+      os: linux
+      env: CONTAINER=gentoo
+      services: docker
     - name: "Mac OS X 10.13"
       os: osx
       env: CONTAINER=osx
diff --git a/docker-compose.yml b/docker-compose.yml
index 79aab1f79..027cabcd5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,3 +40,11 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-gentoo:
+    build:
+        context: .
+        dockerfile: test/docker/gentoo
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
diff --git a/test/docker/gentoo b/test/docker/gentoo
new file mode 100644
index 000000000..1a24b2db8
--- /dev/null
+++ b/test/docker/gentoo
@@ -0,0 +1,32 @@
+# name the portage image
+FROM gentoo/portage:latest as portage
+
+# image is based on stage3-x86
+FROM gentoo/stage3-x86:latest
+
+# copy the entire portage volume in
+COPY --from=portage /usr/portage /usr/portage
+
+RUN emerge -qv sys-libs/readline:0 net-libs/gnutls:0= sys-apps/util-linux dev-util/cmake sys-devel/make dev-vcs/git
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From 0b20a7eef8b8473a3ddb9e45f7e3e3550b828ca3 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 13:51:47 -0500
Subject: [PATCH 818/879] tests: Add Debian Testing as a platform

---
 .travis.yml               |  4 ++++
 docker-compose.yml        |  8 ++++++++
 test/docker/debiantesting | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 test/docker/debiantesting

diff --git a/.travis.yml b/.travis.yml
index dcf0e189f..64313b3f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,10 @@ matrix:
       os: linux
       env: CONTAINER=debianstable
       services: docker
+    - name: "Debian Testing"
+      os: linux
+      env: CONTAINER=debiantesting
+      services: docker
     - name: "Ubuntu 16.04"
       os: linux
       env: CONTAINER=ubuntu1604
diff --git a/docker-compose.yml b/docker-compose.yml
index 027cabcd5..95499e36d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-debiantesting:
+    build:
+        context: .
+        dockerfile: test/docker/debiantesting
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-gentoo:
     build:
         context: .
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
new file mode 100644
index 000000000..9c60198ac
--- /dev/null
+++ b/test/docker/debiantesting
@@ -0,0 +1,27 @@
+FROM debian:testing
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y python
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From 012430cfb68a78ec5a8f75e74dc2c21c0c524089 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 14:10:23 -0500
Subject: [PATCH 819/879] tests: Add OpenSUSE platform

---
 .travis.yml              |  4 ++++
 docker-compose.yml       |  8 ++++++++
 test/docker/opensuse1500 | 25 +++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 test/docker/opensuse1500

diff --git a/.travis.yml b/.travis.yml
index 64313b3f0..f360b01a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,10 @@ matrix:
       os: linux
       env: CONTAINER=gentoo
       services: docker
+    - name: "OpenSUSE 15.0"
+      os: linux
+      env: CONTAINER=opensuse1500
+      services: docker
     - name: "Mac OS X 10.13"
       os: osx
       env: CONTAINER=osx
diff --git a/docker-compose.yml b/docker-compose.yml
index 95499e36d..cd9a0c1df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,3 +56,11 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-opensuse1500:
+    build:
+        context: .
+        dockerfile: test/docker/opensuse1500
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
diff --git a/test/docker/opensuse1500 b/test/docker/opensuse1500
new file mode 100644
index 000000000..9ca7ee2e4
--- /dev/null
+++ b/test/docker/opensuse1500
@@ -0,0 +1,25 @@
+FROM opensuse/leap:15
+
+RUN zypper install -y python awk coreutils git gcc gcc-c++ cmake make libgnutls-devel libuuid-devel
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From adece30891ab893e41383b943efc28cba3f0dec8 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 14:25:57 -0500
Subject: [PATCH 820/879] tests: Add Archlinux 2018 platform

---
 .travis.yml            |  4 ++++
 docker-compose.yml     |  8 ++++++++
 test/docker/arch180101 | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 test/docker/arch180101

diff --git a/.travis.yml b/.travis.yml
index f360b01a7..f4696390e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,10 @@ matrix:
       os: linux
       env: CONTAINER=opensuse1500
       services: docker
+    - name: "Archlinux 2018.01.01"
+      os: linux
+      env: CONTAINER=arch180101
+      services: docker
     - name: "Mac OS X 10.13"
       os: osx
       env: CONTAINER=osx
diff --git a/docker-compose.yml b/docker-compose.yml
index cd9a0c1df..e0ea1a8f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,3 +64,11 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-arch180101:
+    build:
+        context: .
+        dockerfile: test/docker/arch180101
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
diff --git a/test/docker/arch180101 b/test/docker/arch180101
new file mode 100644
index 000000000..0bca4de3c
--- /dev/null
+++ b/test/docker/arch180101
@@ -0,0 +1,27 @@
+FROM base/archlinux:2018.01.01
+
+RUN pacman -Sy --noconfirm archlinux-keyring
+RUN pacman -Syyu --noconfirm
+RUN pacman -S --noconfirm gnutls util-linux bash-completion cmake python git
+RUN pacman -S --noconfirm make gcc
+
+# Setup language environment
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]

From 2140298af2c135f49266ab9aff57270db4e5e7fd Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 14:53:44 -0500
Subject: [PATCH 821/879] tests: Do not explicitly require Python 2.7

---
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom2.t                        | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/template.t                    | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-1837.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/uuid.t                        | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/wait.t                        | 2 +-
 121 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/test/abbreviation.t b/test/abbreviation.t
index 22b90e454..505e0a824 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/add.t b/test/add.t
index 0e6929ff4..2f1aa1192 100755
--- a/test/add.t
+++ b/test/add.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/alias.t b/test/alias.t
index 740148b7b..530f9b320 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/annotate.t b/test/annotate.t
index e3af0910d..9cc566222 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/append.t b/test/append.t
index 20c5378d4..08445684e 100755
--- a/test/append.t
+++ b/test/append.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/args.t b/test/args.t
index aff507000..20127730d 100755
--- a/test/args.t
+++ b/test/args.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/backlog.t b/test/backlog.t
index 61e6c702a..c21ae0ccd 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/bash_completion.t b/test/bash_completion.t
index 2049f69d3..bbbf18e90 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/blocked.t b/test/blocked.t
index 2e77376ba..c0601d00b 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/bulk.t b/test/bulk.t
index 00cdd55c0..12920a643 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/burndown.t b/test/burndown.t
index 0c98e3e42..874e2bff3 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/calc.t b/test/calc.t
index 241d9a39e..f13bebd31 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/calendar.t b/test/calendar.t
index a83a34b0a..97bef64c2 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/caseless.t b/test/caseless.t
index 79fd55c0e..051c1c4db 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 8943d7965..0a94fb7dc 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/color.rules.t b/test/color.rules.t
index 30de59ceb..cf652426d 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/columns.t b/test/columns.t
index b22007570..910691c9f 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/commands.t b/test/commands.t
index 669aa6237..68831cf32 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/completed.t b/test/completed.t
index e60114ad7..adab21846 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/configuration.t b/test/configuration.t
index 21bf8b3c4..efb0838c0 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/confirmation.t b/test/confirmation.t
index f5fb2232b..f97fc603c 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/context.t b/test/context.t
index c9d790d2b..84772b65d 100755
--- a/test/context.t
+++ b/test/context.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/count.t b/test/count.t
index f34bd2f36..5fb848e02 100755
--- a/test/count.t
+++ b/test/count.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/custom.config.t b/test/custom.config.t
index 5fa62a55e..18f7ec438 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index 549dfff0e..58cc4aa0a 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/custom.t b/test/custom.t
index c7edc29c2..7c5ba5ea0 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index 8b65d3397..f5fef7bc3 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/date.iso.t b/test/date.iso.t
index 83ff61972..29fd76882 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/dateformat.t b/test/dateformat.t
index 4c6fd7ad1..3e0e42f6a 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/datesort.t b/test/datesort.t
index 1cab82105..2555c9cbf 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index 46d3ddd0a..b15f9b6c5 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/debug.t b/test/debug.t
index ce2025a43..447630994 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/default.t b/test/default.t
index a7872939b..7437873f7 100755
--- a/test/default.t
+++ b/test/default.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/delete.t b/test/delete.t
index 22b5b6e6a..4b5e4f6e0 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/denotate.t b/test/denotate.t
index ad718efbc..8b3e5c4b4 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/dependencies.t b/test/dependencies.t
index 9882087f6..b1997a313 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/diag.t b/test/diag.t
index fafaf326c..daefed033 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/diag_color.t b/test/diag_color.t
index f955e278f..cbfb5018b 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/dom2.t b/test/dom2.t
index 656d6b08a..34141b7e2 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/due.t b/test/due.t
index b3ddf281f..cb426add8 100755
--- a/test/due.t
+++ b/test/due.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/duplicate.t b/test/duplicate.t
index 41fdbcc10..b930fbef6 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/edit.t b/test/edit.t
index 18b84d09b..25d0694f3 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/encoding.t b/test/encoding.t
index 0b696c29e..8c3a6da2e 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/enpassant.t b/test/enpassant.t
index 23f7119a6..61cee8202 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/exec.t b/test/exec.t
index 70f72d0d3..c734f1faf 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/export.t b/test/export.t
index 62b617832..b93a1b975 100755
--- a/test/export.t
+++ b/test/export.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/feature.559.t b/test/feature.559.t
index 9bff3d16c..f16dc94d1 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index 438c51f27..094f7c23e 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 72b99a1f6..d8b58e5e2 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 52a21285d..8bc9309b1 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/feedback.t b/test/feedback.t
index 6a80e587d..a2fb02f88 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/filter.t b/test/filter.t
index 74a9d9abb..b1cf0faad 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/fontunderline.t b/test/fontunderline.t
index fab9a8274..a7e29c5d5 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/format.t b/test/format.t
index 6e1203b20..f540ea734 100755
--- a/test/format.t
+++ b/test/format.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/gc.t b/test/gc.t
index a8efbdd6b..ebc19b77d 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/helpers.t b/test/helpers.t
index ea3ac2d4c..20c4ed013 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/history.t b/test/history.t
index f3b14733f..c68fc42ee 100755
--- a/test/history.t
+++ b/test/history.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hooks.env.t b/test/hooks.env.t
index efd28840b..76fdacd59 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index 876e7955a..f94a1755a 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index 334ee92bd..47a8c7f66 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index affc53fa6..12045a811 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index 49753460b..228430947 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/hyphenate.t b/test/hyphenate.t
index a09c41e74..00d1daf14 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/ids.t b/test/ids.t
index b5d21c6ac..45c6085c4 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/import.t b/test/import.t
index 9454a7f1c..8edf1321a 100755
--- a/test/import.t
+++ b/test/import.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/info.t b/test/info.t
index 5c93db5a6..655581482 100755
--- a/test/info.t
+++ b/test/info.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/limit.t b/test/limit.t
index e7e819382..69a2c0db1 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index f52a40a8d..8864a00de 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/log.t b/test/log.t
index ad7dcab99..48792c95b 100755
--- a/test/log.t
+++ b/test/log.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/logo.t b/test/logo.t
index e1341bbe8..d97debe9d 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/math.t b/test/math.t
index 32a63962c..1cb77a9d2 100755
--- a/test/math.t
+++ b/test/math.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/modify.t b/test/modify.t
index 74a3d4957..ed5b75716 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/nag.t b/test/nag.t
index 98c982571..08194ef1e 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/obfuscate.t b/test/obfuscate.t
index 884bb17af..a8bbc814c 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/oldest.t b/test/oldest.t
index e0e4e6fcc..4371f308f 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/operators.t b/test/operators.t
index cb59a2121..bbda578ed 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/overdue.t b/test/overdue.t
index 779541997..6d59197aa 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/partial.t b/test/partial.t
index 5dc99d85e..778f18f3a 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/prepend.t b/test/prepend.t
index 3c5a9daa9..adc47d60b 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/pri_sort.t b/test/pri_sort.t
index e75d478e1..a8b40d52f 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/project.t b/test/project.t
index 83b646c5a..d9243a2f2 100755
--- a/test/project.t
+++ b/test/project.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/purge.t b/test/purge.t
index e66b86ebe..9d14a74ba 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/quotes.t b/test/quotes.t
index 0c186e834..822fb8de4 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/rc.override.t b/test/rc.override.t
index e22841e05..0f4cdbef3 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/recurrence.t b/test/recurrence.t
index f7e30f51f..a21611bc9 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/reports.t b/test/reports.t
index 663413404..2fb73c383 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/search.t b/test/search.t
index 7e75c20fe..8879a0057 100755
--- a/test/search.t
+++ b/test/search.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/sequence.t b/test/sequence.t
index 2476bfb63..6949da821 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/shell.t b/test/shell.t
index 3ef608559..05003f475 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/show.t b/test/show.t
index b02e74c68..b8f662f36 100755
--- a/test/show.t
+++ b/test/show.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/sorting.t b/test/sorting.t
index 1efdd7c70..f4ee5a5ca 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/special.t b/test/special.t
index 69a3d99d0..b4f82171c 100755
--- a/test/special.t
+++ b/test/special.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/start.t b/test/start.t
index 31a824c69..02edd495f 100755
--- a/test/start.t
+++ b/test/start.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/stats.t b/test/stats.t
index 2577490b4..0a055c8a1 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/substitute.t b/test/substitute.t
index 5ed1986c3..a5ec1231b 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/sugar.t b/test/sugar.t
index d6fc1dead..47efe836c 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/summary.t b/test/summary.t
index b9173c5a7..5d86798ce 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tag.t b/test/tag.t
index 95ce8b8b0..483a1e890 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/taskrc.t b/test/taskrc.t
index fdbd25ad2..900ee0097 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/template.t b/test/template.t
index 93bc26caf..07c2e93ca 100644
--- a/test/template.t
+++ b/test/template.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/timesheet.t b/test/timesheet.t
index c73587f64..ba703e393 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-1379.t b/test/tw-1379.t
index b3d23af81..c217ceb06 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-1837.t b/test/tw-1837.t
index 412bebf02..5c2d6f91a 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-20.t b/test/tw-20.t
index 56587d56a..e6d956ca5 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-262.t b/test/tw-262.t
index 08741895c..0be3f0bcb 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-295.t b/test/tw-295.t
index 22d843ff9..c1b0458ab 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/tw-46.t b/test/tw-46.t
index b91f31c75..045231a8c 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/uda.t b/test/uda.t
index 077fa0f18..8d49cad94 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index f53f2d6a1..08410c85f 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/uda_report.t b/test/uda_report.t
index c04856084..7727ee400 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 1297eb68a..4d2541202 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/undo.t b/test/undo.t
index 94367f460..f7db034a7 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/unicode.t b/test/unicode.t
index c46fe079b..fe9ada27a 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/unique.t b/test/unique.t
index f87d5b14e..a65c4c833 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/upgrade.t b/test/upgrade.t
index 4fcf3d4be..7e3ca7389 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/urgency.t b/test/urgency.t
index 1f7c5da69..ca5bf5c9d 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index b5b7d8776..bbaecc959 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/uuid.t b/test/uuid.t
index 07d536274..1cef104f5 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/verbose.t b/test/verbose.t
index e4e169f4f..7c8c08396 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/version.t b/test/version.t
index 614fe513f..6612a7f7e 100755
--- a/test/version.t
+++ b/test/version.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
diff --git a/test/wait.t b/test/wait.t
index 71864cf9b..d08286c77 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
 #

From e171c0aa9b02db2a86fa517f60b81a430989c32d Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 14:59:44 -0500
Subject: [PATCH 822/879] travis: Reorder platform entries, move Gentoo to the
 top

Since the Gentoo build takes the longest, it makes sense to start
executing it as first.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4696390e..a75335f6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ sudo: required
 language: generic
 matrix:
   include:
+    - name: "Gentoo (latest)"
+      os: linux
+      env: CONTAINER=gentoo
+      services: docker
     - name: "Fedora 28"
       os: linux
       env: CONTAINER=fedora28
@@ -26,10 +30,6 @@ matrix:
       os: linux
       env: CONTAINER=ubuntu1804
       services: docker
-    - name: "Gentoo (latest)"
-      os: linux
-      env: CONTAINER=gentoo
-      services: docker
     - name: "OpenSUSE 15.0"
       os: linux
       env: CONTAINER=opensuse1500

From 928befeea2afdf40117448cdb51361585fdb39d8 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 15:44:19 -0500
Subject: [PATCH 823/879] tests: Use verbose output when running the tests

---
 test/docker/arch180101    | 2 +-
 test/docker/debianstable  | 2 +-
 test/docker/debiantesting | 2 +-
 test/docker/fedora28      | 2 +-
 test/docker/fedora29      | 2 +-
 test/docker/gentoo        | 2 +-
 test/docker/opensuse1500  | 2 +-
 test/docker/ubuntu1604    | 2 +-
 test/docker/ubuntu1804    | 2 +-
 test/scripts/test_osx.sh  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/docker/arch180101 b/test/docker/arch180101
index 0bca4de3c..9387ebf44 100644
--- a/test/docker/arch180101
+++ b/test/docker/arch180101
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/debianstable b/test/docker/debianstable
index e107043e6..06a6ca58f 100644
--- a/test/docker/debianstable
+++ b/test/docker/debianstable
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
index 9c60198ac..6e50b45eb 100644
--- a/test/docker/debiantesting
+++ b/test/docker/debiantesting
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/fedora28 b/test/docker/fedora28
index 6912f2b97..6ce4f3f5d 100644
--- a/test/docker/fedora28
+++ b/test/docker/fedora28
@@ -23,4 +23,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/fedora29 b/test/docker/fedora29
index 08848bce4..9dc293fe0 100644
--- a/test/docker/fedora29
+++ b/test/docker/fedora29
@@ -23,4 +23,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/gentoo b/test/docker/gentoo
index 1a24b2db8..9eef70c82 100644
--- a/test/docker/gentoo
+++ b/test/docker/gentoo
@@ -29,4 +29,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/opensuse1500 b/test/docker/opensuse1500
index 9ca7ee2e4..ea923db25 100644
--- a/test/docker/opensuse1500
+++ b/test/docker/opensuse1500
@@ -22,4 +22,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
index 295f61d19..5f47f7b73 100644
--- a/test/docker/ubuntu1604
+++ b/test/docker/ubuntu1604
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu1804
index ed857a441..98b42ff98 100644
--- a/test/docker/ubuntu1804
+++ b/test/docker/ubuntu1804
@@ -24,4 +24,4 @@ RUN task --version
 WORKDIR /root/code/test/
 RUN make
 
-CMD ["bash", "-c", "./run_all ; cat all.log | grep 'not ok' ; ./problems"]
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/scripts/test_osx.sh b/test/scripts/test_osx.sh
index 612c2c371..b63a0a3c9 100644
--- a/test/scripts/test_osx.sh
+++ b/test/scripts/test_osx.sh
@@ -12,6 +12,6 @@ task --version
 
 pushd test
 make
-./run_all
+./run_all -v
 cat all.log | grep 'not ok'
 ./problems

From b8b06e668064aa84617813a32401088f53deb01e Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 19:09:38 -0500
Subject: [PATCH 824/879] tests: Encode input data for the subprocess

Needed for Python2/3 compatibility.
---
 test/basetest/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 3efaebc1b..240b1ddb0 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -124,7 +124,7 @@ def _queue_output(arguments, pidq, outputq):
     This function is meant to be executed in a thread as it may block
     """
     kwargs = arguments["process"]
-    input = arguments["input"]
+    input_data = arguments["input"].encode("utf-8") if arguments["input"] else None
 
     try:
         proc = Popen(**kwargs)
@@ -146,7 +146,7 @@ def _queue_output(arguments, pidq, outputq):
     pidq.put(proc.pid)
 
     # Send input and wait for finish
-    out, err = proc.communicate(input)
+    out, err = proc.communicate(input_data)
 
     if sys.version_info > (3,):
         out, err = out.decode('utf-8'), err.decode('utf-8')

From 9e7f259d03edfca384949bd6f55d5b1eda209afa Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 19:32:51 -0500
Subject: [PATCH 825/879] tests: Do not use filter objects

The filter objects are not well handled by the unittest framework, pass
a concrete number of occurences instead.
---
 test/context.t | 35 ++++++++++++++++-------------------
 test/verbose.t |  2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/test/context.t b/test/context.t
index 84772b65d..4d525ac7e 100755
--- a/test/context.t
+++ b/test/context.t
@@ -60,11 +60,11 @@ class ContextManagementTest(TestCase):
         self.assertIn("Context 'work' defined.", out)
 
         # Assert the config contains context definition
-        self.assertIn('context.work=project:Work\n', self.t.taskrc_content)
+        context_line = 'context.work=project:Work\n'
+        self.assertIn(context_line, self.t.taskrc_content)
 
         # Assert that it contains the definition only once
-        is_context_line = lambda x: x == 'context.work=project:Work\n'
-        self.assertEqual(len(filter(is_context_line, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count(context_line), 1)
 
     def test_context_redefine_same_definition(self):
         """Test re-defining the context with the same definition."""
@@ -73,11 +73,11 @@ class ContextManagementTest(TestCase):
         self.assertIn("Context 'work' defined.", out)
 
         # Assert the config contains context definition
-        self.assertIn('context.work=project:Work\n', self.t.taskrc_content)
+        context_line = 'context.work=project:Work\n'
+        self.assertIn(context_line, self.t.taskrc_content)
 
         # Assert that it contains the definition only once
-        is_context_line = lambda x: x == 'context.work=project:Work\n'
-        self.assertEqual(len(filter(is_context_line, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count(context_line), 1)
 
     def test_context_redefine_different_definition(self):
         """Test re-defining the context with different definition."""
@@ -89,11 +89,11 @@ class ContextManagementTest(TestCase):
         self.assertNotIn('context.work=project:Work\n', self.t.taskrc_content)
 
         # Assert the config contains context definition
-        self.assertIn('context.work=+work\n', self.t.taskrc_content)
+        context_line = 'context.work=+work\n'
+        self.assertIn(context_line, self.t.taskrc_content)
 
         # Assert that it contains the definition only once
-        is_context_line = lambda x: x == 'context.work=+work\n'
-        self.assertEqual(len(filter(is_context_line, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count(context_line), 1)
 
     def test_context_delete(self):
         """Test simple context deletion."""
@@ -138,8 +138,8 @@ class ContextManagementTest(TestCase):
 
         # Assert that output contains work and home context definitions exactly
         # once
-        self.assertEqual(len(filter(contains_work, out.splitlines())), 1)
-        self.assertEqual(len(filter(contains_home, out.splitlines())), 1)
+        self.assertEqual(len(list(filter(contains_work, out.splitlines()))), 1)
+        self.assertEqual(len(list(filter(contains_home, out.splitlines()))), 1)
 
     def test_context_initially_empty(self):
         """Test that no context is set initially."""
@@ -168,33 +168,30 @@ class ContextManagementTest(TestCase):
         code, out, err = self.t('context home')
         self.assertIn("Context 'home' set.", out)
 
-        contains_home = lambda line: line == "context=home\n"
-        self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)
+        context_line = "context=home\n"
+        self.assertEqual(self.t.taskrc_content.count(context_line), 1)
 
     def test_context_switching(self):
         """Test changing the context."""
         self.t('context define work project:Work')
         self.t('context define home +home')
 
-        contains_home = lambda line: line == "context=home\n"
-        contains_work = lambda line: line == "context=work\n"
-
         # Switch to home context
         code, out, err = self.t('context home')
         self.assertIn("Context 'home' set.", out)
-        self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count("context=home\n"), 1)
 
         # Switch to work context
         code, out, err = self.t('context work')
         self.assertIn("Context 'work' set.", out)
         self.assertNotIn("context=home\n", self.t.taskrc_content)
-        self.assertEqual(len(filter(contains_work, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count("context=work\n"), 1)
 
         # Switch back to home context
         code, out, err = self.t('context home')
         self.assertIn("Context 'home' set.", out)
         self.assertNotIn("context=work\n", self.t.taskrc_content)
-        self.assertEqual(len(filter(contains_home, self.t.taskrc_content)), 1)
+        self.assertEqual(self.t.taskrc_content.count("context=home\n"), 1)
 
     def test_context_unsetting(self):
         """Test removing the context."""
diff --git a/test/verbose.t b/test/verbose.t
index 7c8c08396..31188d0a6 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -94,7 +94,7 @@ class TestVerbosity(TestCase):
         """Verbosity blank"""
 
         def count_blank_lines(x):
-            return len(filter(operator.not_, x.splitlines()))
+            return x.splitlines().count('')
 
         code, out, err = self.t("rc.verbose:nothing ls")
         self.assertEqual(count_blank_lines(out), 0)

From 74949bb0498372e1ebed95a8063e440e809df4ae Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 19:34:24 -0500
Subject: [PATCH 826/879] tests: Fix incorrect assert method

---
 test/uda.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/uda.t b/test/uda.t
index 8d49cad94..dabe58ec6 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -174,7 +174,7 @@ class TestUdaDuration(TestBaseUda):
 
         # Ensure 'extra' is stored in original form.
         code, out, err = self.t("1 export")
-        self.assertRaisesRegexp(out, '"extra":"P1D"')
+        self.assertRegexpMatches(out, '"extra":"P1D"')
 
     def test_uda_bad_duration_task(self):
         """Add tasks with an invalid UDA duration"""

From 3f97a034c75cd547cf34268bc1508a9926aa5e2d Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 19:41:31 -0500
Subject: [PATCH 827/879] tests: mkstemp_exec needs argument in bytes

---
 test/edit.t  | 2 +-
 test/tw-20.t | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/edit.t b/test/edit.t
index 25d0694f3..9af04cee4 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -41,7 +41,7 @@ class TestTaskEdit(TestCase):
         self.t = Task()
 
         # Workaround to always assume changes were introduced via "task edit"
-        self.editor = mkstemp_exec("echo '' >> $1\n")
+        self.editor = mkstemp_exec(b"echo '' >> $1\n")
 
         self.t.env["VISUAL"] = self.editor
 
diff --git a/test/tw-20.t b/test/tw-20.t
index e6d956ca5..217184d47 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -44,7 +44,7 @@ class TestBug20(TestCase):
         self.t = Task()
 
         # Workaround to always assume changes were introduced via "task edit"
-        self.editor = mkstemp_exec("echo '' >> $1\n")
+        self.editor = mkstemp_exec(b"echo '' >> $1\n")
 
         self.t.env["VISUAL"] = self.editor
 

From b8347821c4beefee14b759a1486b36409bb7897e Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 20:02:20 -0500
Subject: [PATCH 828/879] tests: due:yesterday does not match current year on
 1st of January

---
 test/tag.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tag.t b/test/tag.t
index 483a1e890..4e1c7e258 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -85,7 +85,7 @@ class TestVirtualTags(TestCase):
         cls.t("add deleted")
         cls.t("1 delete", input="y\n")
         cls.t("add minimal")
-        cls.t("add maximal +tag pro:PRO pri:H due:yesterday")
+        cls.t("add maximal +tag pro:PRO pri:H due:today")
         cls.t("3 start")
         cls.t("3 annotate note")
         cls.t("add blocked depends:2")

From a4ce40add4ee4bfd07d81a8de6e206b67c1c498e Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 20:11:13 -0500
Subject: [PATCH 829/879] tests: Improve bytes python3 compatibility

---
 test/basetest/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 240b1ddb0..200066c94 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -464,7 +464,7 @@ def mkstemp(data):
             pass
 
     f = tempfile.NamedTemporaryFile(delete=False)
-    f.write(data)
+    f.write(data.encode('utf-8') if not isinstance(data, bytes) else data)
     f.close()
 
     # Ensure removal at end of python session

From 8f8a04fdb534e302d0681274cd6690791faa79b2 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 20:18:24 -0500
Subject: [PATCH 830/879] tests: Install libfaketime in all containers

---
 test/docker/arch180101    | 2 +-
 test/docker/debianstable  | 2 +-
 test/docker/debiantesting | 2 +-
 test/docker/fedora28      | 2 +-
 test/docker/fedora29      | 2 +-
 test/docker/gentoo        | 2 +-
 test/docker/opensuse1500  | 2 +-
 test/docker/ubuntu1604    | 2 +-
 test/docker/ubuntu1804    | 2 +-
 test/scripts/test_osx.sh  | 1 +
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/docker/arch180101 b/test/docker/arch180101
index 9387ebf44..6bf64969b 100644
--- a/test/docker/arch180101
+++ b/test/docker/arch180101
@@ -2,7 +2,7 @@ FROM base/archlinux:2018.01.01
 
 RUN pacman -Sy --noconfirm archlinux-keyring
 RUN pacman -Syyu --noconfirm
-RUN pacman -S --noconfirm gnutls util-linux bash-completion cmake python git
+RUN pacman -S --noconfirm gnutls util-linux bash-completion cmake python git libfaketime
 RUN pacman -S --noconfirm make gcc
 
 # Setup language environment
diff --git a/test/docker/debianstable b/test/docker/debianstable
index 06a6ca58f..a5d0af2de 100644
--- a/test/docker/debianstable
+++ b/test/docker/debianstable
@@ -1,7 +1,7 @@
 FROM debian:stable
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev libfaketime
 RUN apt-get install -y python
 
 # Setup language environment
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
index 6e50b45eb..5652571ce 100644
--- a/test/docker/debiantesting
+++ b/test/docker/debiantesting
@@ -1,7 +1,7 @@
 FROM debian:testing
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev libfaketime
 RUN apt-get install -y python
 
 # Setup language environment
diff --git a/test/docker/fedora28 b/test/docker/fedora28
index 6ce4f3f5d..d8e30b6e1 100644
--- a/test/docker/fedora28
+++ b/test/docker/fedora28
@@ -1,7 +1,7 @@
 FROM fedora:28
 
 RUN dnf update -y
-RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime -y
 
 # Setup language environment
 ENV LC_ALL en_US.UTF-8
diff --git a/test/docker/fedora29 b/test/docker/fedora29
index 9dc293fe0..3bb6f0def 100644
--- a/test/docker/fedora29
+++ b/test/docker/fedora29
@@ -1,7 +1,7 @@
 FROM fedora:29
 
 RUN dnf update -y
-RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime -y
 
 # Setup language environment
 ENV LC_ALL en_US.UTF-8
diff --git a/test/docker/gentoo b/test/docker/gentoo
index 9eef70c82..2eb352527 100644
--- a/test/docker/gentoo
+++ b/test/docker/gentoo
@@ -7,7 +7,7 @@ FROM gentoo/stage3-x86:latest
 # copy the entire portage volume in
 COPY --from=portage /usr/portage /usr/portage
 
-RUN emerge -qv sys-libs/readline:0 net-libs/gnutls:0= sys-apps/util-linux dev-util/cmake sys-devel/make dev-vcs/git
+RUN emerge -qv sys-libs/readline:0 net-libs/gnutls:0= sys-apps/util-linux dev-util/cmake sys-devel/make dev-vcs/git sys-libs/libfaketime
 
 # Setup language environment
 ENV LC_ALL en_US.UTF-8
diff --git a/test/docker/opensuse1500 b/test/docker/opensuse1500
index ea923db25..70ebaa1cf 100644
--- a/test/docker/opensuse1500
+++ b/test/docker/opensuse1500
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15
 
-RUN zypper install -y python awk coreutils git gcc gcc-c++ cmake make libgnutls-devel libuuid-devel
+RUN zypper install -y python awk coreutils git gcc gcc-c++ cmake make libgnutls-devel libuuid-devel libfaketime
 
 # Setup language environment
 ENV LC_ALL en_US.UTF-8
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
index 5f47f7b73..11019329b 100644
--- a/test/docker/ubuntu1604
+++ b/test/docker/ubuntu1604
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev libfaketime
 RUN apt-get install -y python
 
 # Setup language environment
diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu1804
index 98b42ff98..a53301411 100644
--- a/test/docker/ubuntu1804
+++ b/test/docker/ubuntu1804
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev libfaketime
 RUN apt-get install -y python
 
 # Setup language environment
diff --git a/test/scripts/test_osx.sh b/test/scripts/test_osx.sh
index b63a0a3c9..62ca0478f 100644
--- a/test/scripts/test_osx.sh
+++ b/test/scripts/test_osx.sh
@@ -2,6 +2,7 @@ set -x
 
 brew install gnutls
 brew install cmake
+brew install libfaketime
 git clean -dfx
 git submodule init
 git submodule update

From d457bca59a661459202e072bcca013112843aba2 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Wed, 2 Jan 2019 10:59:34 -0500
Subject: [PATCH 831/879] tests: Add CentOS7 CI testing support

---
 .travis.yml         |  4 ++++
 docker-compose.yml  |  8 ++++++++
 test/docker/centos7 | 30 ++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 test/docker/centos7

diff --git a/.travis.yml b/.travis.yml
index a75335f6b..08c092ad7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,10 @@ matrix:
       os: linux
       env: CONTAINER=gentoo
       services: docker
+    - name: "Centos 7"
+      os: linux
+      env: CONTAINER=centos7
+      services: docker
     - name: "Fedora 28"
       os: linux
       env: CONTAINER=fedora28
diff --git a/docker-compose.yml b/docker-compose.yml
index e0ea1a8f5..3ddc1f830 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,13 @@
 version: '3'
 services:
+  test-centos7:
+    build:
+        context: .
+        dockerfile: test/docker/centos7
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-fedora28:
     build:
         context: .
diff --git a/test/docker/centos7 b/test/docker/centos7
new file mode 100644
index 000000000..d1f7415bf
--- /dev/null
+++ b/test/docker/centos7
@@ -0,0 +1,30 @@
+FROM centos:7
+
+RUN yum update -y
+RUN yum install python git gcc gcc-c++ make gnutls-devel libuuid-devel libfaketime -y
+RUN yum install epel-release centos-release-scl -y
+RUN yum install which cmake3 devtoolset-7-gcc* -y
+RUN source scl_source enable devtoolset-7; gcc --version; cmake3 --version
+RUN ln -s /usr/bin/cmake3 /usr/bin/cmake
+
+# Setup language environment
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN source scl_source enable devtoolset-7; cmake -DCMAKE_BUILD_TYPE=debug .
+RUN source scl_source enable devtoolset-7; make -j2
+RUN source scl_source enable devtoolset-7; make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN source scl_source enable devtoolset-7; make
+
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]

From a6405e8935446ffeceff4c5a93a93e1dc8085fea Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Wed, 2 Jan 2019 19:44:50 -0500
Subject: [PATCH 832/879] README: Make the build badge point to 2.5.2 branch

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b0130d1e..8a7429baa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Taskwarrior
 
-[![Travis build status](https://travis-ci.org/tbabej/taskwarrior.svg?branch=2.6.0)](https://travis-ci.org/tbabej/taskwarrior)
+[![Travis build status](https://travis-ci.org/GothenburgBitFactory/taskwarrior.svg?branch=2.5.2)](https://travis-ci.org/GothenburgBitFactory/taskwarrior)
 
 Thank you for taking a look at Taskwarrior!
 

From bf8fa9a504e04738a7ff7f0ad152d8c63c5c1195 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:01:12 -0500
Subject: [PATCH 833/879] libshared: Upgraded to
 4c0d722188a5362695064e443df505d23c524170

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 230c63bd3..4c0d72218 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 230c63bd385b2a5a6ee5eb431df54b0c5c229b4d
+Subproject commit 4c0d722188a5362695064e443df505d23c524170

From 49a5937ace2b30501bc37cf517c29445cd5e4de0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:03:34 -0500
Subject: [PATCH 834/879] Test: Updated diag test expectation

---
 test/diag.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/diag.t b/test/diag.t
index daefed033..210044457 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -48,7 +48,7 @@ class TestDiagnostics(TestCase):
         self.t.activate_hooks()
         code, out, err = self.t.diag()
         self.tap(out)
-        self.assertRegexpMatches(out, "Compliance:\s+C\+\+11")
+        self.assertRegexpMatches(out, "Compliance:\s+C\+\+14")
         self.assertRegexpMatches(out, "libgnutls:\s+\d+\.\d+\.\d+")
         self.assertIn("edlin", out)
         self.assertIn("strict", out)

From 9fd12498ed92e1bbda9b0b2a9dac010a6361e8b3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:06:39 -0500
Subject: [PATCH 835/879] CmdVersion: Updated YYYY

---
 src/commands/CmdVersion.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index dd35e7789..ede311c0d 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
@@ -78,7 +78,7 @@ int CmdVersion::execute (std::string& output)
       << format ("{1} {2} built for ", bold.colorize (PACKAGE), bold.colorize (VERSION))
       << osName ()
       << '\n'
-      << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
+      << "Copyright (C) 2006 - 2019 P. Beckingham, F. Hernandez."
       << '\n'
       << '\n'
       << disclaimer.render ()

From 3313e1f6cc253f7714c112ab1d6bf9ae9c2bf208 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:13:31 -0500
Subject: [PATCH 836/879] Updated copyright

---
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/col.t.cpp                     | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom.t.cpp                     | 2 +-
 test/dom2.t                        | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/eval.t.cpp                    | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/lexer.t.cpp                   | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/simpletap/__init__.py         | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/t.t.cpp                       | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/tdb2.t.cpp                    | 2 +-
 test/template.t                    | 2 +-
 test/test.cpp                      | 2 +-
 test/test.h                        | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-1837.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/util.t.cpp                    | 2 +-
 test/uuid.t                        | 2 +-
 test/variant_add.t.cpp             | 2 +-
 test/variant_and.t.cpp             | 2 +-
 test/variant_cast.t.cpp            | 2 +-
 test/variant_divide.t.cpp          | 2 +-
 test/variant_equal.t.cpp           | 2 +-
 test/variant_exp.t.cpp             | 2 +-
 test/variant_gt.t.cpp              | 2 +-
 test/variant_gte.t.cpp             | 2 +-
 test/variant_inequal.t.cpp         | 2 +-
 test/variant_lt.t.cpp              | 2 +-
 test/variant_lte.t.cpp             | 2 +-
 test/variant_match.t.cpp           | 2 +-
 test/variant_math.t.cpp            | 2 +-
 test/variant_modulo.t.cpp          | 2 +-
 test/variant_multiply.t.cpp        | 2 +-
 test/variant_nomatch.t.cpp         | 2 +-
 test/variant_not.t.cpp             | 2 +-
 test/variant_or.t.cpp              | 2 +-
 test/variant_partial.t.cpp         | 2 +-
 test/variant_subtract.t.cpp        | 2 +-
 test/variant_xor.t.cpp             | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/view.t.cpp                    | 2 +-
 test/wait.t                        | 2 +-
 153 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/test/abbreviation.t b/test/abbreviation.t
index 505e0a824..600bc18b4 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/add.t b/test/add.t
index 2f1aa1192..6e2c934db 100755
--- a/test/add.t
+++ b/test/add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/alias.t b/test/alias.t
index 530f9b320..e4e54bfae 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/annotate.t b/test/annotate.t
index 9cc566222..1acc879d2 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/append.t b/test/append.t
index 08445684e..1179aa995 100755
--- a/test/append.t
+++ b/test/append.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/args.t b/test/args.t
index 20127730d..3480bdaae 100755
--- a/test/args.t
+++ b/test/args.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/backlog.t b/test/backlog.t
index c21ae0ccd..516506d47 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/bash_completion.t b/test/bash_completion.t
index bbbf18e90..ff58efaf2 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/blocked.t b/test/blocked.t
index c0601d00b..b419e3143 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/bulk.t b/test/bulk.t
index 12920a643..488427d55 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/burndown.t b/test/burndown.t
index 874e2bff3..8f18d56d0 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/calc.t b/test/calc.t
index f13bebd31..8a4d8cea2 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/calendar.t b/test/calendar.t
index 97bef64c2..2249c6d95 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/caseless.t b/test/caseless.t
index 051c1c4db..8e9a26874 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/col.t.cpp b/test/col.t.cpp
index e7355771e..e26765258 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 0a94fb7dc..d4dd1d791 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/color.rules.t b/test/color.rules.t
index cf652426d..163b488a2 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/columns.t b/test/columns.t
index 910691c9f..16307e3cc 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/commands.t b/test/commands.t
index 68831cf32..d143b831a 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/completed.t b/test/completed.t
index adab21846..2bcf80e13 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/configuration.t b/test/configuration.t
index efb0838c0..8182917e7 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/confirmation.t b/test/confirmation.t
index f97fc603c..323ba1cba 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/context.t b/test/context.t
index 4d525ac7e..2da469d2f 100755
--- a/test/context.t
+++ b/test/context.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/count.t b/test/count.t
index 5fb848e02..312ebd220 100755
--- a/test/count.t
+++ b/test/count.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/custom.config.t b/test/custom.config.t
index 18f7ec438..b31d54d03 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index 58cc4aa0a..727bac4d8 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/custom.t b/test/custom.t
index 7c5ba5ea0..3ae702bca 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index f5fef7bc3..ed8217918 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/date.iso.t b/test/date.iso.t
index 29fd76882..96c1c20da 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/dateformat.t b/test/dateformat.t
index 3e0e42f6a..e95a4bbfe 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/datesort.t b/test/datesort.t
index 2555c9cbf..9bbf984ef 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index b15f9b6c5..86ee43a9b 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/debug.t b/test/debug.t
index 447630994..3054c6935 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/default.t b/test/default.t
index 7437873f7..cef949255 100755
--- a/test/default.t
+++ b/test/default.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/delete.t b/test/delete.t
index 4b5e4f6e0..15cd8f66d 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/denotate.t b/test/denotate.t
index 8b3e5c4b4..4ea1503ca 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/dependencies.t b/test/dependencies.t
index b1997a313..26254515e 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/diag.t b/test/diag.t
index 210044457..953b84cc5 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/diag_color.t b/test/diag_color.t
index cbfb5018b..150e12d4d 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 365268459..5b3f53b54 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/dom2.t b/test/dom2.t
index 34141b7e2..40458801d 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/due.t b/test/due.t
index cb426add8..7a3fe1473 100755
--- a/test/due.t
+++ b/test/due.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/duplicate.t b/test/duplicate.t
index b930fbef6..3ad205358 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/edit.t b/test/edit.t
index 9af04cee4..8ac144776 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/encoding.t b/test/encoding.t
index 8c3a6da2e..42d49b315 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/enpassant.t b/test/enpassant.t
index 61cee8202..e40319002 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 334f9dd63..0a568bc01 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/exec.t b/test/exec.t
index c734f1faf..800c98cb0 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/export.t b/test/export.t
index b93a1b975..f7ef9ba51 100755
--- a/test/export.t
+++ b/test/export.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/feature.559.t b/test/feature.559.t
index f16dc94d1..646f6d2e4 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index 094f7c23e..7fe44b1ba 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index d8b58e5e2..7ba146d0e 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 8bc9309b1..9c9d510e9 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/feedback.t b/test/feedback.t
index a2fb02f88..80e952c82 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/filter.t b/test/filter.t
index b1cf0faad..bc39fb0a4 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/fontunderline.t b/test/fontunderline.t
index a7e29c5d5..9502a2112 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/format.t b/test/format.t
index f540ea734..7e274e2ce 100755
--- a/test/format.t
+++ b/test/format.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/gc.t b/test/gc.t
index ebc19b77d..e278bd5b9 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/helpers.t b/test/helpers.t
index 20c4ed013..c990995f2 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/history.t b/test/history.t
index c68fc42ee..1dff59d6f 100755
--- a/test/history.t
+++ b/test/history.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hooks.env.t b/test/hooks.env.t
index 76fdacd59..5aac2f8f5 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index f94a1755a..50912e74c 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index 47a8c7f66..fd89da375 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 12045a811..0c7ed22e5 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index 228430947..55f037169 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/hyphenate.t b/test/hyphenate.t
index 00d1daf14..b1643b6d8 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/ids.t b/test/ids.t
index 45c6085c4..dfd3eb46b 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/import.t b/test/import.t
index 8edf1321a..817d72f0f 100755
--- a/test/import.t
+++ b/test/import.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/info.t b/test/info.t
index 655581482..19af3f844 100755
--- a/test/info.t
+++ b/test/info.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index a7da105f9..8912de85a 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/limit.t b/test/limit.t
index 69a2c0db1..9e26d682a 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 8864a00de..c1d2ca027 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/log.t b/test/log.t
index 48792c95b..ba9df31d7 100755
--- a/test/log.t
+++ b/test/log.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/logo.t b/test/logo.t
index d97debe9d..c6583fbfb 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/math.t b/test/math.t
index 1cb77a9d2..e5fc8189f 100755
--- a/test/math.t
+++ b/test/math.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/modify.t b/test/modify.t
index ed5b75716..f32925445 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/nag.t b/test/nag.t
index 08194ef1e..380366e5a 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/obfuscate.t b/test/obfuscate.t
index a8bbc814c..790fd47a1 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/oldest.t b/test/oldest.t
index 4371f308f..68867fa0e 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/operators.t b/test/operators.t
index bbda578ed..985141dec 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/overdue.t b/test/overdue.t
index 6d59197aa..6d6f8fc4b 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/partial.t b/test/partial.t
index 778f18f3a..968e72eb2 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/prepend.t b/test/prepend.t
index adc47d60b..adafa52eb 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/pri_sort.t b/test/pri_sort.t
index a8b40d52f..df1757c92 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/project.t b/test/project.t
index d9243a2f2..4ce43e6e7 100755
--- a/test/project.t
+++ b/test/project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/purge.t b/test/purge.t
index 9d14a74ba..29315c190 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/quotes.t b/test/quotes.t
index 822fb8de4..f30808114 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/rc.override.t b/test/rc.override.t
index 0f4cdbef3..8eb37f1eb 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/recurrence.t b/test/recurrence.t
index a21611bc9..dcb9afb0f 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/reports.t b/test/reports.t
index 2fb73c383..8574eb7fc 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/search.t b/test/search.t
index 8879a0057..90de10439 100755
--- a/test/search.t
+++ b/test/search.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/sequence.t b/test/sequence.t
index 6949da821..da3d23dc9 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/shell.t b/test/shell.t
index 05003f475..e224d11ed 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/show.t b/test/show.t
index b8f662f36..5f9d5a32e 100755
--- a/test/show.t
+++ b/test/show.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index 0281b1f25..6352b74b9 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -1,7 +1,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/sorting.t b/test/sorting.t
index f4ee5a5ca..696717465 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/special.t b/test/special.t
index b4f82171c..194ef57ba 100755
--- a/test/special.t
+++ b/test/special.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/start.t b/test/start.t
index 02edd495f..bf16d3258 100755
--- a/test/start.t
+++ b/test/start.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/stats.t b/test/stats.t
index 0a055c8a1..7534fcf07 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/substitute.t b/test/substitute.t
index a5ec1231b..160a8feff 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/sugar.t b/test/sugar.t
index 47efe836c..3f132da48 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/summary.t b/test/summary.t
index 5d86798ce..bfd2c8c88 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/t.t.cpp b/test/t.t.cpp
index 2f90b354d..e75140828 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/tag.t b/test/tag.t
index 4e1c7e258..bcd003144 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/taskrc.t b/test/taskrc.t
index 900ee0097..3e15fd84e 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index 3de04603c..34ca50254 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/template.t b/test/template.t
index 07c2e93ca..7a8a3cf6f 100644
--- a/test/template.t
+++ b/test/template.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/test.cpp b/test/test.cpp
index 292cc9583..49010350a 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/test.h b/test/test.h
index bd8a3c0ff..c5ffa1cb3 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/timesheet.t b/test/timesheet.t
index ba703e393..d9131344c 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-1379.t b/test/tw-1379.t
index c217ceb06..8f68a45ac 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-1837.t b/test/tw-1837.t
index 5c2d6f91a..a9ed05ad0 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-20.t b/test/tw-20.t
index 217184d47..9880ec226 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-262.t b/test/tw-262.t
index 0be3f0bcb..da1ef881e 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-295.t b/test/tw-295.t
index c1b0458ab..4908e451b 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/tw-46.t b/test/tw-46.t
index 045231a8c..df8f615c2 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/uda.t b/test/uda.t
index dabe58ec6..512b68f60 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index 08410c85f..e0b40cfbc 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/uda_report.t b/test/uda_report.t
index 7727ee400..c3fced113 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 4d2541202..200e5c8e0 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/undo.t b/test/undo.t
index f7db034a7..d90e34c54 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/unicode.t b/test/unicode.t
index fe9ada27a..4e7c6c3df 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/unique.t b/test/unique.t
index a65c4c833..cce4c13c5 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/upgrade.t b/test/upgrade.t
index 7e3ca7389..cca512658 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/urgency.t b/test/urgency.t
index ca5bf5c9d..a07f61539 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index bbaecc959..9b7f32451 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 3ca201547..0652161ec 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/uuid.t b/test/uuid.t
index 1cef104f5..9172dec8f 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index 6f6e4cc79..a915c5c08 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index 550d4ba97..191b9890c 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 1ed89742c..8a973d2bf 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index d9c5b728b..8265aaaf9 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index e5383fcdb..7204b1430 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index 10ee464ec..316cf2637 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index a86d53997..57d78d311 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index 015a5913c..9d076d7af 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index 8d9dc8338..90d4374f7 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index 971a88aa1..6c7d5bb0c 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index 5b6484cac..e73042ed5 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index e8c52d148..04786ad9c 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index 9dd33a581..bf0bae6bf 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index ecb8b976a..c941c0200 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018 Göteborg Bit Factory.
+// Copyright 2013 - 2019 Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index 76ff2f04d..d6b8d9b3e 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index 5207009db..7b33a800a 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index 805ca5c6d..4f8c5cd83 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index 89d48a737..19b91844e 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index 06bf6a97b..1f1f631d7 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index 371ae6035..962023df7 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index 4f5fe329b..154e76913 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/verbose.t b/test/verbose.t
index 31188d0a6..16dd76a54 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/version.t b/test/version.t
index 6612a7f7e..1076aad86 100755
--- a/test/version.t
+++ b/test/version.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/test/view.t.cpp b/test/view.t.cpp
index aa6d571d8..79982ccab 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/wait.t b/test/wait.t
index d08286c77..952778ddf 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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

From e8f183b403c763776d852ee88bd6aa9249f2ad28 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:21:00 -0500
Subject: [PATCH 837/879] libshared: Upgraded to
 aa4471478a88ad53ee8f087700726341a8a80157

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 4c0d72218..aa4471478 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 4c0d722188a5362695064e443df505d23c524170
+Subproject commit aa4471478a88ad53ee8f087700726341a8a80157

From 3c73af7964f2e638a3969bdb4d2d5085df922b28 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 2 Mar 2019 14:23:53 -0500
Subject: [PATCH 838/879] Updated Copyright

---
 COPYING                            | 2 +-
 LICENSE                            | 2 +-
 doc/man/task-color.5.in            | 2 +-
 doc/man/task-sync.5.in             | 2 +-
 doc/man/task.1.in                  | 2 +-
 doc/man/taskrc.5.in                | 2 +-
 doc/rc/dark-16.theme               | 2 +-
 doc/rc/dark-256.theme              | 2 +-
 doc/rc/dark-blue-256.theme         | 2 +-
 doc/rc/dark-gray-256.theme         | 2 +-
 doc/rc/dark-gray-blue-256.theme    | 2 +-
 doc/rc/dark-green-256.theme        | 2 +-
 doc/rc/dark-red-256.theme          | 2 +-
 doc/rc/dark-violets-256.theme      | 2 +-
 doc/rc/dark-yellow-green.theme     | 2 +-
 doc/rc/light-16.theme              | 2 +-
 doc/rc/light-256.theme             | 2 +-
 doc/rc/no-color.theme              | 2 +-
 doc/rc/solarized-dark-256.theme    | 2 +-
 doc/rc/solarized-light-256.theme   | 2 +-
 scripts/add-ons/update-holidays.pl | 4 ++--
 scripts/bash/task.sh               | 2 +-
 scripts/fish/task.fish             | 2 +-
 scripts/vim/README                 | 2 +-
 scripts/vim/ftdetect/task.vim      | 2 +-
 scripts/vim/syntax/taskdata.vim    | 2 +-
 scripts/vim/syntax/taskedit.vim    | 2 +-
 scripts/vim/syntax/taskrc.vim      | 2 +-
 scripts/zsh/_task                  | 2 +-
 src/CLI2.cpp                       | 2 +-
 src/CLI2.h                         | 2 +-
 src/Context.cpp                    | 2 +-
 src/Context.h                      | 2 +-
 src/DOM.cpp                        | 2 +-
 src/DOM.h                          | 2 +-
 src/Eval.cpp                       | 2 +-
 src/Eval.h                         | 2 +-
 src/Filter.cpp                     | 2 +-
 src/Filter.h                       | 2 +-
 src/Hooks.cpp                      | 2 +-
 src/Hooks.h                        | 2 +-
 src/Lexer.cpp                      | 2 +-
 src/Lexer.h                        | 2 +-
 src/TDB2.cpp                       | 2 +-
 src/TDB2.h                         | 2 +-
 src/TLSClient.cpp                  | 2 +-
 src/TLSClient.h                    | 2 +-
 src/Task.cpp                       | 2 +-
 src/Task.h                         | 2 +-
 src/Variant.cpp                    | 2 +-
 src/Variant.h                      | 2 +-
 src/ViewTask.cpp                   | 2 +-
 src/ViewTask.h                     | 2 +-
 src/calc.cpp                       | 4 ++--
 src/columns/ColDepends.cpp         | 2 +-
 src/columns/ColDepends.h           | 2 +-
 src/columns/ColDescription.cpp     | 2 +-
 src/columns/ColDescription.h       | 2 +-
 src/columns/ColDue.cpp             | 2 +-
 src/columns/ColDue.h               | 2 +-
 src/columns/ColEnd.cpp             | 2 +-
 src/columns/ColEnd.h               | 2 +-
 src/columns/ColEntry.cpp           | 2 +-
 src/columns/ColEntry.h             | 2 +-
 src/columns/ColID.cpp              | 2 +-
 src/columns/ColID.h                | 2 +-
 src/columns/ColIMask.cpp           | 2 +-
 src/columns/ColIMask.h             | 2 +-
 src/columns/ColMask.cpp            | 2 +-
 src/columns/ColMask.h              | 2 +-
 src/columns/ColModified.cpp        | 2 +-
 src/columns/ColModified.h          | 2 +-
 src/columns/ColParent.cpp          | 2 +-
 src/columns/ColParent.h            | 2 +-
 src/columns/ColProject.cpp         | 2 +-
 src/columns/ColProject.h           | 2 +-
 src/columns/ColRecur.cpp           | 2 +-
 src/columns/ColRecur.h             | 2 +-
 src/columns/ColScheduled.cpp       | 2 +-
 src/columns/ColScheduled.h         | 2 +-
 src/columns/ColStart.cpp           | 2 +-
 src/columns/ColStart.h             | 2 +-
 src/columns/ColStatus.cpp          | 2 +-
 src/columns/ColStatus.h            | 2 +-
 src/columns/ColTags.cpp            | 2 +-
 src/columns/ColTags.h              | 2 +-
 src/columns/ColTypeDate.cpp        | 2 +-
 src/columns/ColTypeDate.h          | 2 +-
 src/columns/ColTypeDuration.cpp    | 2 +-
 src/columns/ColTypeDuration.h      | 2 +-
 src/columns/ColTypeNumeric.cpp     | 2 +-
 src/columns/ColTypeNumeric.h       | 2 +-
 src/columns/ColTypeString.cpp      | 2 +-
 src/columns/ColTypeString.h        | 2 +-
 src/columns/ColUDA.cpp             | 2 +-
 src/columns/ColUDA.h               | 2 +-
 src/columns/ColUUID.cpp            | 2 +-
 src/columns/ColUUID.h              | 2 +-
 src/columns/ColUntil.cpp           | 2 +-
 src/columns/ColUntil.h             | 2 +-
 src/columns/ColUrgency.cpp         | 2 +-
 src/columns/ColUrgency.h           | 2 +-
 src/columns/ColWait.cpp            | 2 +-
 src/columns/ColWait.h              | 2 +-
 src/columns/Column.cpp             | 2 +-
 src/columns/Column.h               | 2 +-
 src/commands/CmdAdd.cpp            | 2 +-
 src/commands/CmdAdd.h              | 2 +-
 src/commands/CmdAliases.cpp        | 2 +-
 src/commands/CmdAliases.h          | 2 +-
 src/commands/CmdAnnotate.cpp       | 2 +-
 src/commands/CmdAnnotate.h         | 2 +-
 src/commands/CmdAppend.cpp         | 2 +-
 src/commands/CmdAppend.h           | 2 +-
 src/commands/CmdAttributes.cpp     | 2 +-
 src/commands/CmdAttributes.h       | 2 +-
 src/commands/CmdBurndown.cpp       | 2 +-
 src/commands/CmdBurndown.h         | 2 +-
 src/commands/CmdCalc.cpp           | 2 +-
 src/commands/CmdCalc.h             | 2 +-
 src/commands/CmdCalendar.cpp       | 2 +-
 src/commands/CmdCalendar.h         | 2 +-
 src/commands/CmdColor.cpp          | 2 +-
 src/commands/CmdColor.h            | 2 +-
 src/commands/CmdColumns.cpp        | 2 +-
 src/commands/CmdColumns.h          | 2 +-
 src/commands/CmdCommands.cpp       | 2 +-
 src/commands/CmdCommands.h         | 2 +-
 src/commands/CmdConfig.cpp         | 2 +-
 src/commands/CmdConfig.h           | 2 +-
 src/commands/CmdContext.cpp        | 2 +-
 src/commands/CmdContext.h          | 2 +-
 src/commands/CmdCount.cpp          | 2 +-
 src/commands/CmdCount.h            | 2 +-
 src/commands/CmdCustom.cpp         | 2 +-
 src/commands/CmdCustom.h           | 2 +-
 src/commands/CmdDelete.cpp         | 2 +-
 src/commands/CmdDelete.h           | 2 +-
 src/commands/CmdDenotate.cpp       | 2 +-
 src/commands/CmdDenotate.h         | 2 +-
 src/commands/CmdDiagnostics.cpp    | 2 +-
 src/commands/CmdDiagnostics.h      | 2 +-
 src/commands/CmdDone.cpp           | 2 +-
 src/commands/CmdDone.h             | 2 +-
 src/commands/CmdDuplicate.cpp      | 2 +-
 src/commands/CmdDuplicate.h        | 2 +-
 src/commands/CmdEdit.cpp           | 2 +-
 src/commands/CmdEdit.h             | 2 +-
 src/commands/CmdExec.cpp           | 2 +-
 src/commands/CmdExec.h             | 2 +-
 src/commands/CmdExport.cpp         | 2 +-
 src/commands/CmdExport.h           | 2 +-
 src/commands/CmdGet.cpp            | 2 +-
 src/commands/CmdGet.h              | 2 +-
 src/commands/CmdHelp.cpp           | 2 +-
 src/commands/CmdHelp.h             | 2 +-
 src/commands/CmdHistory.cpp        | 2 +-
 src/commands/CmdHistory.h          | 2 +-
 src/commands/CmdIDs.cpp            | 2 +-
 src/commands/CmdIDs.h              | 2 +-
 src/commands/CmdImport.cpp         | 2 +-
 src/commands/CmdImport.h           | 2 +-
 src/commands/CmdInfo.cpp           | 2 +-
 src/commands/CmdInfo.h             | 2 +-
 src/commands/CmdLog.cpp            | 2 +-
 src/commands/CmdLog.h              | 2 +-
 src/commands/CmdLogo.cpp           | 2 +-
 src/commands/CmdLogo.h             | 2 +-
 src/commands/CmdModify.cpp         | 2 +-
 src/commands/CmdModify.h           | 2 +-
 src/commands/CmdPrepend.cpp        | 2 +-
 src/commands/CmdPrepend.h          | 2 +-
 src/commands/CmdProjects.cpp       | 2 +-
 src/commands/CmdProjects.h         | 2 +-
 src/commands/CmdPurge.cpp          | 2 +-
 src/commands/CmdPurge.h            | 2 +-
 src/commands/CmdReports.cpp        | 2 +-
 src/commands/CmdReports.h          | 2 +-
 src/commands/CmdShow.cpp           | 2 +-
 src/commands/CmdShow.h             | 2 +-
 src/commands/CmdStart.cpp          | 2 +-
 src/commands/CmdStart.h            | 2 +-
 src/commands/CmdStats.cpp          | 2 +-
 src/commands/CmdStats.h            | 2 +-
 src/commands/CmdStop.cpp           | 2 +-
 src/commands/CmdStop.h             | 2 +-
 src/commands/CmdSummary.cpp        | 2 +-
 src/commands/CmdSummary.h          | 2 +-
 src/commands/CmdSync.cpp           | 2 +-
 src/commands/CmdSync.h             | 2 +-
 src/commands/CmdTags.cpp           | 2 +-
 src/commands/CmdTags.h             | 2 +-
 src/commands/CmdTimesheet.cpp      | 2 +-
 src/commands/CmdTimesheet.h        | 2 +-
 src/commands/CmdUDAs.cpp           | 2 +-
 src/commands/CmdUDAs.h             | 2 +-
 src/commands/CmdUndo.cpp           | 2 +-
 src/commands/CmdUndo.h             | 2 +-
 src/commands/CmdUnique.cpp         | 2 +-
 src/commands/CmdUnique.h           | 2 +-
 src/commands/CmdUrgency.cpp        | 2 +-
 src/commands/CmdUrgency.h          | 2 +-
 src/commands/CmdVersion.h          | 2 +-
 src/commands/Command.cpp           | 2 +-
 src/commands/Command.h             | 2 +-
 src/dependency.cpp                 | 2 +-
 src/feedback.cpp                   | 2 +-
 src/legacy.cpp                     | 2 +-
 src/main.cpp                       | 2 +-
 src/main.h                         | 2 +-
 src/nag.cpp                        | 2 +-
 src/recur.cpp                      | 2 +-
 src/rules.cpp                      | 2 +-
 src/sort.cpp                       | 2 +-
 src/util.cpp                       | 2 +-
 src/util.h                         | 2 +-
 test/bash_tap.sh                   | 2 +-
 test/bash_tap_tw.sh                | 2 +-
 218 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/COPYING b/COPYING
index 9d6090408..ed86152e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2019, 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
diff --git a/LICENSE b/LICENSE
index 9d6090408..ed86152e6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2019, 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
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index cc024442d..b2c0336cf 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -288,7 +288,7 @@ Better yet, create your own, and share it.  We will gladly host the theme file
 on <https://taskwarrior.org>.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 2ec5f96dc..6a13a0a76 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -147,7 +147,7 @@ Weaknesses:
   - You need to manage your own server, or gain access to a hosted server.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 7ef3a987b..49023a183 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1332,7 +1332,7 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" command.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index ae2e0145d..522fce5c4 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1512,7 +1512,7 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2018 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
 
 This man page was originally written by Federico Hernandez.
 
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index b31a687b3..40cff797f 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 6a1ed1d6f..26df05a06 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index a030dca85..9108153d3 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index 0a920319d..0d065af0b 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme
index 7d840f2cc..b0e4412bf 100644
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index ad231310b..725801be7 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index b57a67c4a..7ae5b0a4a 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme
index 8a6f140fc..33fcef3e3 100644
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index 2b5bc34ab..513457ce8 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index 59ba4ef70..b93c43f8f 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index 578b9df0a..ceb463bad 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme
index 32d750351..c20e0b565 100644
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme
index 29c99681f..3a8bddb73 100644
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme
index edbcbb592..5128f2b4d 100644
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index b3a5ae8bc..b7f494728 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2019, 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
@@ -189,7 +189,7 @@ if (open my $fh, '>:utf8', $file)
         "# ${url_current}\n",
         "# ${url_next}\n",
         "#\n",
-        "# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2019, 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",
diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index 4029e1173..114013e52 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2019, 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
diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index 78ed7a176..f67ed00e3 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2018, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2019, Roman Inflianskas <infroma@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/vim/README b/scripts/vim/README
index a9143ac1f..4efb8499c 100644
--- 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 - 2018 John Florian
+Copyright 2009 - 2019 John Florian
 
 and are available under the MIT license.
 For the full text of this license, see COPYING.
diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim
index e9840a455..9451e4b85 100644
--- 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 - 2018 John Florian
+" Copyright 2009 - 2019 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskdata.vim b/scripts/vim/syntax/taskdata.vim
index 55cbec701..89756b52b 100644
--- 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 - 2018 John Florian
+" Copyright 2009 - 2019 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskedit.vim b/scripts/vim/syntax/taskedit.vim
index 7291729b1..1cf6abaa3 100644
--- 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 - 2018 John Florian
+" Copyright 2009 - 2019 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index a602e91ee..6c71a6289 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 "
-" Copyright (c) 2014 - 2018 Taskwarrior Team
+" Copyright (c) 2014 - 2019 Taskwarrior Team
 " Copyright (c) 2009 - 2014 John Florian
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 603a9fc0c..61b6df24c 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -1,6 +1,6 @@
 #compdef task
 #
-# Copyright 2010 - 2018 Johannes Schlatow
+# Copyright 2010 - 2019 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 3a7b13c72..f76978327 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/CLI2.h b/src/CLI2.h
index 410037d7e..050aa723e 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Context.cpp b/src/Context.cpp
index 6779065aa..000b3e2c9 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Context.h b/src/Context.h
index c31ebe37f..0a5a8b7c6 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 54d97eeac..4af987639 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/DOM.h b/src/DOM.h
index 28716e9b3..e6fbcbe32 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Eval.cpp b/src/Eval.cpp
index ec9af4668..68b44c611 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/Eval.h b/src/Eval.h
index 802beeada..f3b3a0adb 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/Filter.cpp b/src/Filter.cpp
index eca2bfd71..ec9620e07 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Filter.h b/src/Filter.h
index 8bb862a51..ce251b434 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index d01420029..e8de61ee9 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Hooks.h b/src/Hooks.h
index c7712bddc..19212820d 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 4d71abf73..a95fb1171 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/Lexer.h b/src/Lexer.h
index 14be25029..d556bbb9b 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 3bfdfc22e..137c68b28 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/TDB2.h b/src/TDB2.h
index 7ee3b8b05..46572ffc2 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index e984a72c7..0080079d6 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/TLSClient.h b/src/TLSClient.h
index 307fd76b0..16f63d775 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Task.cpp b/src/Task.cpp
index 327f5b911..98f0b3dae 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Task.h b/src/Task.h
index 0d537044c..cbc7fd807 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 630264f7a..c02c273a2 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/Variant.h b/src/Variant.h
index 4abe74ba8..6c94ce0dc 100644
--- a/src/Variant.h
+++ b/src/Variant.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2019, 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
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 54f6566b0..6b441f1a3 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/ViewTask.h b/src/ViewTask.h
index 8b8009976..61be102db 100644
--- a/src/ViewTask.h
+++ b/src/ViewTask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/calc.cpp b/src/calc.cpp
index 564d3bfe4..427f58ddc 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2018, Göteborg Bit Factory.
+// Copyright 2013 - 2019, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -93,7 +93,7 @@ int main (int argc, char** argv)
                   << format ("calc {1} built for ", VERSION)
                   << osName ()
                   << '\n'
-                  << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez."
+                  << "Copyright (C) 2006 - 2019 P. Beckingham, F. Hernandez."
                   << '\n'
                   << '\n'
                   << "Taskwarrior may be copied only under the terms of the MIT license, which may be found in the Taskwarrior source kit."
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index da1a24423..cac9b2205 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index b3a276437..4ff8343b3 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 27c7dea0c..3619ce9db 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index e5894d355..4aa5fa565 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 0fe892fe5..e6af6c0a0 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 276e3e0eb..4b3f53346 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index 2c520ffb2..9ceb02f95 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index 13200592c..68ae38e14 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 272723cfb..d7f94474e 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index 434e41044..912be7048 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 1f08c4d87..9e5ff4e00 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 284de8a6d..38bd0f4e2 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 5a3d61108..1136875d5 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index 09a5af90f..e5549ac0c 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index eb5c2b7b5..6744a15e8 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index 833c723b6..ad479c1f1 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index 1a614558c..c4d0117b8 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index a48db7f83..21f78adc8 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 185de506a..ae5afe03c 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index ec952785e..082245137 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 208877fcb..6ecc2c770 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index 7ac32587c..8412a9f63 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 249f95c86..8ded6f4cd 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index 599e19d6c..a23824ed7 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index ca86ebfc9..a498b70e4 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index d8ef8b16e..6cb808760 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 1ea2c2281..9f9c0ddb3 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index 7815d7cfd..62a347ea9 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 019fd5f6b..89ee22efb 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index f81924483..ed7043c1a 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index 4d0d43058..d9dab5c62 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index de3451582..36325e4c2 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 6d2c4b78e..ff7c23d94 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index dc3b290f1..624406c99 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 37e15b8b7..77bd79e96 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index 41c4b9447..dd2e3e71f 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index cc1937009..d6f7d46b8 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index 5f982ee65..1c1f050ba 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index f25b8539b..06852d347 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index a8626c897..4ec657b17 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index f68d68d66..69619a99f 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 07611441a..798f26c80 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 87905b7f0..4980fac1e 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index eb71b602c..6056af789 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index 9dc7308e9..0f5e028e5 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index 32640559d..c2bd0488c 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 65d1cc369..0a726eff2 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 87f522017..01b424c65 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index bd1e1f9a8..4b8d50566 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index 0221de9ad..7aabdf4bd 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index ccf7cfa5a..21162db16 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/columns/Column.h b/src/columns/Column.h
index 9e4d5afe9..a196c8176 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 2a81e833f..de9eef8ac 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAdd.h b/src/commands/CmdAdd.h
index 1a1c3f1f1..9ae953882 100644
--- a/src/commands/CmdAdd.h
+++ b/src/commands/CmdAdd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index fd5981fd2..1a6701879 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAliases.h b/src/commands/CmdAliases.h
index 09a3c8339..2d790f6a5 100644
--- a/src/commands/CmdAliases.h
+++ b/src/commands/CmdAliases.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index fabc526ce..c1f6df586 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAnnotate.h b/src/commands/CmdAnnotate.h
index 73bbc78ee..917f2718c 100644
--- a/src/commands/CmdAnnotate.h
+++ b/src/commands/CmdAnnotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index cd1eea943..30b440bd1 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAppend.h b/src/commands/CmdAppend.h
index 8ad43d7f9..bb8530547 100644
--- a/src/commands/CmdAppend.h
+++ b/src/commands/CmdAppend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index f73d43c9b..3a1f73a54 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdAttributes.h b/src/commands/CmdAttributes.h
index faa98d8e3..5dedcc6c7 100644
--- a/src/commands/CmdAttributes.h
+++ b/src/commands/CmdAttributes.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 9047c3397..560d3e6a5 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdBurndown.h b/src/commands/CmdBurndown.h
index afb0ad479..63de42efd 100644
--- a/src/commands/CmdBurndown.h
+++ b/src/commands/CmdBurndown.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index e00af1cd6..977c3c12d 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCalc.h b/src/commands/CmdCalc.h
index eea7f77b0..1aa7c6061 100644
--- a/src/commands/CmdCalc.h
+++ b/src/commands/CmdCalc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 8c24fbe67..232ef0cd0 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index bd27f1261..21f25e3ad 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index c5d9676f2..893772fb7 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdColor.h b/src/commands/CmdColor.h
index b8f65b0e1..49aba46c3 100644
--- a/src/commands/CmdColor.h
+++ b/src/commands/CmdColor.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index 15326cc9e..ac010e26c 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdColumns.h b/src/commands/CmdColumns.h
index e9309ee7a..593aad980 100644
--- a/src/commands/CmdColumns.h
+++ b/src/commands/CmdColumns.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index 919c127ba..e8eeb3d67 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCommands.h b/src/commands/CmdCommands.h
index 4b909cb1d..fc6768a34 100644
--- a/src/commands/CmdCommands.h
+++ b/src/commands/CmdCommands.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 48f66ed02..a2222a5e5 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 79d8bcc20..860794811 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index b3c92cc93..55482067f 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdContext.h b/src/commands/CmdContext.h
index dd4237b56..2ff884ea3 100644
--- a/src/commands/CmdContext.h
+++ b/src/commands/CmdContext.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index cb15547c2..c941aa21e 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCount.h b/src/commands/CmdCount.h
index a0ebf222e..da7f2ea71 100644
--- a/src/commands/CmdCount.h
+++ b/src/commands/CmdCount.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 5ab0825b5..a4c37d0f8 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h
index c5927c5a3..9ce9a5251 100644
--- a/src/commands/CmdCustom.h
+++ b/src/commands/CmdCustom.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 3f859337e..7f46be024 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDelete.h b/src/commands/CmdDelete.h
index 35624b19c..5342d62d0 100644
--- a/src/commands/CmdDelete.h
+++ b/src/commands/CmdDelete.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index faa8ca4c8..dee84cbef 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDenotate.h b/src/commands/CmdDenotate.h
index 39fe43385..28461df98 100644
--- a/src/commands/CmdDenotate.h
+++ b/src/commands/CmdDenotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 21dae85df..8040c6cb6 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDiagnostics.h b/src/commands/CmdDiagnostics.h
index 89cd1ba99..5a7ee6b8f 100644
--- a/src/commands/CmdDiagnostics.h
+++ b/src/commands/CmdDiagnostics.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 2c2663d89..8858b26d0 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDone.h b/src/commands/CmdDone.h
index 6e5d3a00f..c3aed336a 100644
--- a/src/commands/CmdDone.h
+++ b/src/commands/CmdDone.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index ef92e3655..ec43da7a1 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdDuplicate.h b/src/commands/CmdDuplicate.h
index 953b5f997..374432d00 100644
--- a/src/commands/CmdDuplicate.h
+++ b/src/commands/CmdDuplicate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 7baf33b07..a8ff452ed 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdEdit.h b/src/commands/CmdEdit.h
index e4c54ff32..0dcedc34b 100644
--- a/src/commands/CmdEdit.h
+++ b/src/commands/CmdEdit.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index d1991a4ad..502a57289 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h
index 3087e689e..0eba03317 100644
--- a/src/commands/CmdExec.h
+++ b/src/commands/CmdExec.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index dc2836818..403909976 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdExport.h b/src/commands/CmdExport.h
index 30655049b..6eae137c4 100644
--- a/src/commands/CmdExport.h
+++ b/src/commands/CmdExport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 0dad80e03..595a966ea 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdGet.h b/src/commands/CmdGet.h
index d1b368028..c85075ceb 100644
--- a/src/commands/CmdGet.h
+++ b/src/commands/CmdGet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 522b0b4c7..106f3a75b 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h
index 084904875..9eaa1617c 100644
--- a/src/commands/CmdHelp.h
+++ b/src/commands/CmdHelp.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 95e36eaea..a3fdfe8ac 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 0b72175c8..7bc562efa 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index 00a4e8ba5..d3d70b3ac 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdIDs.h b/src/commands/CmdIDs.h
index e8e2e269a..0b770d302 100644
--- a/src/commands/CmdIDs.h
+++ b/src/commands/CmdIDs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 6eb133ff4..0be459c3f 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdImport.h b/src/commands/CmdImport.h
index e18ee8178..2f94731cb 100644
--- a/src/commands/CmdImport.h
+++ b/src/commands/CmdImport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 78c80542d..a65856f96 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index c0dc0861e..03b9ae176 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index c244eb93c..40a97e1be 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdLog.h b/src/commands/CmdLog.h
index 62b7a91c9..fc4cf8029 100644
--- a/src/commands/CmdLog.h
+++ b/src/commands/CmdLog.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 7d9de7359..4c83bf64b 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h
index f8f37c999..3e3571b7d 100644
--- a/src/commands/CmdLogo.h
+++ b/src/commands/CmdLogo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 1d473047d..da38f312f 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index 7f42fc3dc..22df52e0d 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 75fe9b9df..84873abd9 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdPrepend.h b/src/commands/CmdPrepend.h
index 4810f0336..3f9329411 100644
--- a/src/commands/CmdPrepend.h
+++ b/src/commands/CmdPrepend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 5e2f22b6f..c66138760 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdProjects.h b/src/commands/CmdProjects.h
index 6efee88f0..14f91dead 100644
--- a/src/commands/CmdProjects.h
+++ b/src/commands/CmdProjects.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 2bf899746..ccda7b025 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index f9da43090..6e6452232 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index e2e9ba05f..616c355fa 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdReports.h b/src/commands/CmdReports.h
index 8aab838c5..5409be3cf 100644
--- a/src/commands/CmdReports.h
+++ b/src/commands/CmdReports.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index d7fa8c388..18526f0c5 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h
index 710fa5c79..4489201e0 100644
--- a/src/commands/CmdShow.h
+++ b/src/commands/CmdShow.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 938759de4..03b20278e 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStart.h b/src/commands/CmdStart.h
index 46a087b91..5d97c7a9f 100644
--- a/src/commands/CmdStart.h
+++ b/src/commands/CmdStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 129037ae8..ac724c908 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStats.h b/src/commands/CmdStats.h
index f4ef23b27..c12b7e359 100644
--- a/src/commands/CmdStats.h
+++ b/src/commands/CmdStats.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 6b76019f9..bb77ea108 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdStop.h b/src/commands/CmdStop.h
index cde72b5e9..7d9fdb01b 100644
--- a/src/commands/CmdStop.h
+++ b/src/commands/CmdStop.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 3aacf8657..51c04f151 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdSummary.h b/src/commands/CmdSummary.h
index f38eb0efb..d422855c1 100644
--- a/src/commands/CmdSummary.h
+++ b/src/commands/CmdSummary.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 1f865ab7c..467dfcf0f 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdSync.h b/src/commands/CmdSync.h
index bc9321d86..8da9d206f 100644
--- a/src/commands/CmdSync.h
+++ b/src/commands/CmdSync.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 7116f6a36..c5d64ca80 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h
index b3cbc9131..510722482 100644
--- a/src/commands/CmdTags.h
+++ b/src/commands/CmdTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index bb35b45f2..7479165ca 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdTimesheet.h b/src/commands/CmdTimesheet.h
index d1371847f..acec783ec 100644
--- a/src/commands/CmdTimesheet.h
+++ b/src/commands/CmdTimesheet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 1c7d0398a..be140005c 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUDAs.h b/src/commands/CmdUDAs.h
index 4f1425bcb..ec4a32f82 100644
--- a/src/commands/CmdUDAs.h
+++ b/src/commands/CmdUDAs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 3c9a92204..3d67a3462 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUndo.h b/src/commands/CmdUndo.h
index 9b5bbd8bb..ecf3d7317 100644
--- a/src/commands/CmdUndo.h
+++ b/src/commands/CmdUndo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 9e181b901..6248fb663 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUnique.h b/src/commands/CmdUnique.h
index c1e39af77..f827efe1b 100644
--- a/src/commands/CmdUnique.h
+++ b/src/commands/CmdUnique.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 9ec5d8419..5de8bb096 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdUrgency.h b/src/commands/CmdUrgency.h
index d80b3d238..594636e82 100644
--- a/src/commands/CmdUrgency.h
+++ b/src/commands/CmdUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h
index 40edcc9e1..b03e0046f 100644
--- a/src/commands/CmdVersion.h
+++ b/src/commands/CmdVersion.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index a07f4537a..9b53c98dc 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/commands/Command.h b/src/commands/Command.h
index 877a284e8..af2402985 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 0927cf528..58aab89da 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 4eb9c9b1d..8cdf6a5c1 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/legacy.cpp b/src/legacy.cpp
index e34befc70..19db61531 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/main.cpp b/src/main.cpp
index c40108814..2fc858d54 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/main.h b/src/main.h
index 8b7c5fe9f..9ef9f6689 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/nag.cpp b/src/nag.cpp
index 880b7e8a8..d5878e18a 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/recur.cpp b/src/recur.cpp
index f50d51ed8..5217ae771 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/rules.cpp b/src/rules.cpp
index f55fb5cbd..981aa38f9 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/sort.cpp b/src/sort.cpp
index 1f2c3b780..fab503293 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/util.cpp b/src/util.cpp
index 5d4e9efb2..4aad80c47 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/src/util.h b/src/util.h
index a3f660464..622aac47e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2019, 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
diff --git a/test/bash_tap.sh b/test/bash_tap.sh
index b9dce0f7c..aa87ef35f 100644
--- a/test/bash_tap.sh
+++ b/test/bash_tap.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # For more information, see https://github.com/wbsch/bash_tap
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2018 Wilhelm Schürmann
+# Copyright (c) 2015 - 2019 Wilhelm Schürmann
 
 function bashtap_on_error {
     # A command in the parent script failed, interpret this as a test failure.
diff --git a/test/bash_tap_tw.sh b/test/bash_tap_tw.sh
index 0c7a10935..c40309636 100644
--- a/test/bash_tap_tw.sh
+++ b/test/bash_tap_tw.sh
@@ -9,7 +9,7 @@
 # appended to or changed as needed.
 #
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015-2018 Wilhelm Schürmann
+# Copyright (c) 2015 - 2019 Wilhelm Schürmann
 
 function setup_taskrc {
     # Configuration

From 9030d908947dedd5ed285a5e6af4d71fa7a5112d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 3 Mar 2019 09:57:36 -0500
Subject: [PATCH 839/879] Docs: Updated to add Lionel and remove dev comment

---
 AUTHORS      | 1 +
 DEVELOPER.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index f2858d62f..f1988ec77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -146,6 +146,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Tiago Matias
   Simon Ruderich
   Kirill Bobyrev
+  Lionel Miller
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/DEVELOPER.md b/DEVELOPER.md
index c7abcc88f..e2bad15f9 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -151,7 +151,7 @@
  * 2.5.1 Current release, locked.
 
  **'2.6.0' branch**:
-  * Current development branch no plans yet.
+  * Current development branch.
 
 ---
 2018-05-13 Updated for 2.5.2

From 2eb488359d386602d9776c505ae9b408409d5a66 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 3 Mar 2019 10:03:42 -0500
Subject: [PATCH 840/879] Certs: Updated test certs

---
 test/test_certs/api.cert.pem         |  27 ++
 test/test_certs/api.key.pem          | 182 +++++++++++++
 test/test_certs/ca.cert.pem          |  56 ++--
 test/test_certs/ca.key.pem           | 368 +++++++++++---------------
 test/test_certs/client.cert.pem      |  56 ++--
 test/test_certs/client.key.pem       | 368 +++++++++++---------------
 test/test_certs/server.cert.pem      |  56 ++--
 test/test_certs/server.crl.pem       |  26 +-
 test/test_certs/server.key.pem       | 372 +++++++++++----------------
 test/test_certs/test_client.cert.pem |  56 ++--
 test/test_certs/test_client.key.pem  | 368 +++++++++++---------------
 11 files changed, 943 insertions(+), 992 deletions(-)
 create mode 100644 test/test_certs/api.cert.pem
 create mode 100644 test/test_certs/api.key.pem

diff --git a/test/test_certs/api.cert.pem b/test/test_certs/api.cert.pem
new file mode 100644
index 000000000..85331f205
--- /dev/null
+++ b/test/test_certs/api.cert.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIErDCCAxSgAwIBAgIUImT6dvD09I4yGowOKIyYCFwCU/IwDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDAzOVoXDTIwMDMw
+MjE1MDAzOVowNDESMBAGA1UEAxMJbG9jYWxob3N0MR4wHAYDVQQKDBVHw7Z0ZWJv
+cmcgQml0IEZhY3RvcnkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDm
+SHBv3zILItaJrG+3y7dWgvsX6X3FzLVXOrhFOBNbsrHSsktt20yHZhofoelkgtlc
+kBsft5GUYGEBZuJIIFcOvpbXXTz/cYge8WhpcFo64APNc7zxykaTeIHMmEqjxqtO
+efyOmuEyWya2XbCA4aZ6emyirkem952wBJNYLIWoy53YQ79dFvH2SOWKPlXCa1B/
+ih7b9qYZE2XHoLQSbLCJqDWoQTxmOe13/1aKnJIuIy/igGsM7ygmphG4kzvyfbiA
+o+Nd50USVeeeF8P+X2YZfXFKmbzJTg4q6UUB4vqn4XegW065eIyN1Xw3Z/l8CiP0
+G27iuk/ZfRuz00+d9oTG5OtvyCMcc/kDI4Db1Xu9C5z9UpF5IIM85Ky91YxMMqPu
+ChQQoDXJ7mdtC7zRvn6t0erMVbpaqyXxKll/ybPFAZYIgV7jtSPPJDAcTsCZQLRc
+VcggScYSiWkRgW+DKsECczo++6577q++cyRBtENPOXUZ6J74eKBHizYda0chVzcC
+AwEAAaN2MHQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAPBgNV
+HQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQuQdj0wAQOzML5AQ13xsb4E8Vh9DAfBgNV
+HSMEGDAWgBSmHbkkwFmCruE7I7TSI0SlD1hLiDANBgkqhkiG9w0BAQsFAAOCAYEA
+CD77JzLXB0YbgJrrkotw0I8rmrb8mw0tHkDGH70UyG6VhEt3vaYcYioxs3TIo23U
+dhOTApGdHzjrZePa0y2Kh7YtnPLAUml6hHTATE1D7Hufdtamd56URgBrEylKkpKl
+6UnwHWzlkdRWzPRo+RD9RMBzTUMiooZaP9zzzYQNEfCmMTlHqztOLPNfFR6kFLr5
+Xnc04EV/hvkByoBmo9/i4qAa3AW4y6cUHYpxVS9nBF2h364aDIIA0mn9hEewRJBq
+3odng4d+e9v9b+G1ExQXM3en39REo/b73P2VATZyMxmq5gxL1OmbOa13A+S2D0Og
+OkqNq6vzRhTxLbkqc0fjKv2TUFrnYCsCROvrMF+TAN0mG4NcfgeeziBTmHJq0D3I
+LNTRMU/BoMYG3wGu0BUak83a9JhwViR3o0iFnctuMbD2Mz6QOawgWz8BuTcwIur6
+USeERs3+G2XX499wWswGgWK5JGZ1skD1PiRsZfuaCMJHBiWolv4/G+My5IYg6B8a
+-----END CERTIFICATE-----
diff --git a/test/test_certs/api.key.pem b/test/test_certs/api.key.pem
new file mode 100644
index 000000000..b294f3e3f
--- /dev/null
+++ b/test/test_certs/api.key.pem
@@ -0,0 +1,182 @@
+Public Key Info:
+	Public Key Algorithm: RSA
+	Key Security Level: High (3072 bits)
+
+modulus:
+	00:e6:48:70:6f:df:32:0b:22:d6:89:ac:6f:b7:cb:b7
+	56:82:fb:17:e9:7d:c5:cc:b5:57:3a:b8:45:38:13:5b
+	b2:b1:d2:b2:4b:6d:db:4c:87:66:1a:1f:a1:e9:64:82
+	d9:5c:90:1b:1f:b7:91:94:60:61:01:66:e2:48:20:57
+	0e:be:96:d7:5d:3c:ff:71:88:1e:f1:68:69:70:5a:3a
+	e0:03:cd:73:bc:f1:ca:46:93:78:81:cc:98:4a:a3:c6
+	ab:4e:79:fc:8e:9a:e1:32:5b:26:b6:5d:b0:80:e1:a6
+	7a:7a:6c:a2:ae:47:a6:f7:9d:b0:04:93:58:2c:85:a8
+	cb:9d:d8:43:bf:5d:16:f1:f6:48:e5:8a:3e:55:c2:6b
+	50:7f:8a:1e:db:f6:a6:19:13:65:c7:a0:b4:12:6c:b0
+	89:a8:35:a8:41:3c:66:39:ed:77:ff:56:8a:9c:92:2e
+	23:2f:e2:80:6b:0c:ef:28:26:a6:11:b8:93:3b:f2:7d
+	b8:80:a3:e3:5d:e7:45:12:55:e7:9e:17:c3:fe:5f:66
+	19:7d:71:4a:99:bc:c9:4e:0e:2a:e9:45:01:e2:fa:a7
+	e1:77:a0:5b:4e:b9:78:8c:8d:d5:7c:37:67:f9:7c:0a
+	23:f4:1b:6e:e2:ba:4f:d9:7d:1b:b3:d3:4f:9d:f6:84
+	c6:e4:eb:6f:c8:23:1c:73:f9:03:23:80:db:d5:7b:bd
+	0b:9c:fd:52:91:79:20:83:3c:e4:ac:bd:d5:8c:4c:32
+	a3:ee:0a:14:10:a0:35:c9:ee:67:6d:0b:bc:d1:be:7e
+	ad:d1:ea:cc:55:ba:5a:ab:25:f1:2a:59:7f:c9:b3:c5
+	01:96:08:81:5e:e3:b5:23:cf:24:30:1c:4e:c0:99:40
+	b4:5c:55:c8:20:49:c6:12:89:69:11:81:6f:83:2a:c1
+	02:73:3a:3e:fb:ae:7b:ee:af:be:73:24:41:b4:43:4f
+	39:75:19:e8:9e:f8:78:a0:47:8b:36:1d:6b:47:21:57
+	37:
+
+public exponent:
+	01:00:01:
+
+private exponent:
+	00:8b:e2:40:fa:93:f8:10:2f:af:66:9d:ea:97:19:16
+	5b:64:e1:26:1b:5d:9d:43:c6:7c:20:5d:43:1e:d7:13
+	82:ae:e6:30:0c:05:c5:8a:ed:4c:a6:5d:c4:ba:c3:a5
+	80:67:eb:d9:ae:20:92:3c:31:77:7b:a4:85:9c:0e:99
+	13:89:ce:93:30:3e:17:65:5d:ac:7e:34:50:a8:41:07
+	36:80:d8:d2:8f:59:c8:e7:aa:39:2f:8f:9a:8a:ec:85
+	88:15:f9:9f:e2:f8:4e:07:8a:bb:2f:58:26:19:83:f8
+	de:b9:73:38:36:e9:ab:91:0a:a6:9b:80:ed:b4:cd:d4
+	45:2b:b2:ed:24:57:65:d2:c1:2a:72:d4:d1:1c:c3:26
+	f1:15:28:4f:aa:8a:5f:47:28:33:51:5a:5b:48:3d:e1
+	d7:1c:e8:cb:36:25:7c:6b:7f:c6:be:c2:51:1c:de:e7
+	4b:d4:90:a0:35:66:fb:f7:c5:d2:67:3d:59:a2:b6:a0
+	8a:c6:03:8b:db:3a:39:32:28:21:ba:11:3b:a3:77:90
+	59:0d:72:81:01:ad:5f:66:92:b5:6c:61:d2:8c:60:eb
+	e5:62:8d:5c:71:72:99:7c:12:b8:1c:c6:ba:ee:64:17
+	41:04:b6:d2:59:f0:1a:0f:74:ca:d5:19:1e:98:f4:61
+	75:c3:e1:50:27:af:fa:48:87:3d:c9:11:aa:70:3e:56
+	64:a1:dc:42:d9:16:a6:d2:14:98:48:cd:ad:d2:09:33
+	00:10:5f:3c:69:36:81:96:75:44:f8:56:95:d2:e5:76
+	85:41:85:8d:f1:64:14:05:6b:f7:2a:26:6a:d9:f0:b9
+	d0:de:d6:3d:7e:7c:6c:2c:26:49:22:5e:2a:04:21:4f
+	c9:d7:3c:a1:1b:7b:d1:27:1d:80:38:25:57:7f:a2:99
+	46:d7:60:56:e6:5d:50:71:36:b6:af:a6:5b:d0:92:d8
+	19:0e:86:4b:3b:34:cf:cd:ea:e5:35:e4:4e:65:e3:20
+	91:
+
+prime1:
+	00:f7:07:aa:be:24:f1:2f:26:ea:0e:45:86:b0:45:05
+	df:b8:59:d6:3b:40:5c:dd:c8:bf:18:3e:76:74:e8:31
+	35:ca:b0:d4:63:df:4d:4c:d5:0c:46:6e:31:71:3c:17
+	5e:45:4e:5c:a1:96:4f:69:5e:92:bd:e8:09:27:85:50
+	e3:29:1d:bb:8e:f9:2c:41:af:0f:c8:e0:d3:70:6a:d4
+	b9:67:43:08:e4:4a:c9:12:f6:d2:7e:7d:bc:69:52:ba
+	48:96:0a:7e:42:e7:6e:82:e8:0c:6c:1b:a5:01:f0:36
+	2c:ae:a4:2f:d8:62:ef:ab:1c:47:3a:98:79:40:68:dd
+	de:6a:b4:8c:53:03:09:78:11:27:36:6f:e4:2b:fb:f4
+	4d:bf:13:30:37:1f:51:fd:2f:84:d9:b9:62:ea:91:a8
+	e8:72:9d:78:14:bd:5a:9e:1f:06:12:70:19:bd:3b:80
+	b2:5c:33:8b:d6:5b:9c:2f:f9:12:46:55:4a:5a:10:bc
+	f5:
+
+prime2:
+	00:ee:a5:18:9e:e5:9a:59:d4:d9:0c:42:4c:cf:a1:d7
+	ca:8f:b5:45:24:59:f9:83:1f:f4:f2:82:01:50:3c:e0
+	ae:bf:17:39:09:cd:5a:71:dd:ab:9e:b6:d6:1e:47:dc
+	34:eb:28:c0:4c:77:e5:05:5d:e3:0a:57:bf:65:1f:f8
+	29:68:08:45:ee:da:01:bc:57:c6:35:a7:2c:82:62:64
+	2a:cd:46:eb:54:eb:27:e2:eb:d5:d3:d3:04:ef:05:a1
+	4c:63:ec:d4:23:6f:60:02:71:a8:c3:ab:a5:2f:26:4e
+	ea:e1:a3:f5:e4:d2:59:19:c9:26:18:c5:4d:45:1e:61
+	1d:53:7c:6a:83:d2:18:40:dd:10:af:e8:24:09:1a:06
+	9b:f1:51:33:8e:13:e0:ce:18:b3:f0:8b:f3:9d:12:b3
+	e7:88:01:a1:c1:38:0d:c9:c6:0e:49:99:37:2f:be:60
+	e3:37:9d:c6:a8:cb:4b:c5:c0:49:2a:5d:fb:f2:fb:e7
+	fb:
+
+coefficient:
+	22:52:c4:c2:c3:dd:30:13:54:c7:95:54:b2:cb:24:b5
+	0c:88:f4:22:a7:6a:13:b3:17:5f:0b:b2:8c:4f:2c:e6
+	d3:b6:ca:cd:e6:70:e4:37:5d:65:16:50:ae:b8:cc:bf
+	80:81:3d:e5:5c:0e:6d:ec:f9:4e:f5:49:00:fd:63:28
+	2a:ab:03:92:ae:b6:a6:97:ed:f0:97:25:55:06:3f:15
+	be:cf:70:22:bd:af:f8:2c:3f:ce:d5:e5:e6:5f:94:d7
+	d2:0a:fb:99:d7:ad:ab:d1:3a:b8:fb:6c:b0:47:1c:60
+	81:b1:8c:5e:df:25:8b:93:82:8c:28:52:99:5e:e7:e7
+	f8:fc:30:48:bd:43:82:9e:39:2b:7b:14:6b:fb:1b:8a
+	7d:f1:1e:06:01:ca:7d:59:54:79:00:fa:76:bd:a9:a1
+	02:ad:c4:7e:0b:56:c2:37:6b:7d:20:5f:53:ef:46:88
+	cf:24:e2:4c:25:fc:98:49:40:38:10:19:6f:3c:18:4c
+	
+
+exp1:
+	00:8b:1e:3a:3e:13:37:f0:c2:0d:96:33:f9:82:53:9c
+	d7:3d:4e:fa:a3:2b:c0:20:f6:e9:07:92:45:cb:d8:e7
+	bd:cf:84:7e:58:30:6d:ac:13:5f:72:5a:a4:65:8c:dd
+	ec:2d:43:d0:4f:00:03:80:e7:cd:e4:3d:44:ca:88:fd
+	e0:b0:4b:1a:51:8e:6a:2a:23:98:d4:1c:29:77:69:f2
+	9a:e7:58:8d:2d:64:20:91:19:87:b9:cc:bd:ca:e2:d8
+	1e:00:c1:b0:11:a5:9c:4b:04:bb:da:36:47:5b:2c:18
+	96:59:54:05:cd:eb:09:e6:67:6a:85:c9:50:9f:c1:6f
+	11:cf:2e:16:c8:b9:31:1f:f9:29:08:33:43:60:b1:e8
+	07:d0:cf:d1:9b:79:7c:07:06:37:df:15:d4:6b:1d:d4
+	ed:f3:7e:53:1d:fa:f5:89:8f:17:30:53:09:6b:d4:92
+	c9:df:ba:f7:c9:a4:95:f5:3e:63:d8:50:38:2b:38:b9
+	f1:
+
+exp2:
+	00:ed:06:45:41:ec:c2:35:5e:d6:84:fa:84:d7:e4:e3
+	33:69:30:9d:8f:d1:5d:a5:02:e4:82:c8:e5:0d:10:aa
+	08:65:fb:66:c7:79:92:cf:6d:5f:bb:af:d5:53:16:04
+	7c:fa:e3:ea:bb:08:8a:0b:9e:88:96:09:39:2b:f3:68
+	c3:97:74:40:21:4f:9e:51:b6:cc:43:15:db:7b:54:c6
+	30:4c:da:97:7a:2c:65:dd:58:67:74:90:2e:62:48:b1
+	3f:f2:2f:93:33:ee:b6:e9:36:82:6c:75:db:06:cd:81
+	ac:80:98:1c:ee:3c:8e:0a:b2:62:88:4f:ce:c3:4b:bd
+	21:27:7e:77:3c:9e:3b:40:91:50:b5:a6:57:c4:42:79
+	36:01:a4:a9:14:00:62:53:d0:ed:47:89:79:59:14:ee
+	62:94:0f:2a:dd:82:13:0f:c9:0a:ff:c6:91:ad:75:e5
+	3d:48:4c:08:b8:35:d2:f8:82:57:29:21:57:d0:aa:aa
+	69:
+
+
+Public Key PIN:
+	pin-sha256:SSdvX3918szw/veSWFuQJD3lGynf9mFLiTxpZPj/Jz4=
+Public Key ID:
+	sha256:49276f5f7f75f2ccf0fef792585b90243de51b29dff6614b893c6964f8ff273e
+	sha1:2e41d8f4c0040eccc2f9010d77c6c6f813c561f4
+
+-----BEGIN RSA PRIVATE KEY-----
+MIIG5QIBAAKCAYEA5khwb98yCyLWiaxvt8u3VoL7F+l9xcy1Vzq4RTgTW7Kx0rJL
+bdtMh2YaH6HpZILZXJAbH7eRlGBhAWbiSCBXDr6W1108/3GIHvFoaXBaOuADzXO8
+8cpGk3iBzJhKo8arTnn8jprhMlsmtl2wgOGmenpsoq5HpvedsASTWCyFqMud2EO/
+XRbx9kjlij5VwmtQf4oe2/amGRNlx6C0Emywiag1qEE8Zjntd/9WipySLiMv4oBr
+DO8oJqYRuJM78n24gKPjXedFElXnnhfD/l9mGX1xSpm8yU4OKulFAeL6p+F3oFtO
+uXiMjdV8N2f5fAoj9Btu4rpP2X0bs9NPnfaExuTrb8gjHHP5AyOA29V7vQuc/VKR
+eSCDPOSsvdWMTDKj7goUEKA1ye5nbQu80b5+rdHqzFW6Wqsl8SpZf8mzxQGWCIFe
+47UjzyQwHE7AmUC0XFXIIEnGEolpEYFvgyrBAnM6Pvuue+6vvnMkQbRDTzl1Geie
++HigR4s2HWtHIVc3AgMBAAECggGBAIviQPqT+BAvr2ad6pcZFltk4SYbXZ1Dxnwg
+XUMe1xOCruYwDAXFiu1Mpl3EusOlgGfr2a4gkjwxd3ukhZwOmROJzpMwPhdlXax+
+NFCoQQc2gNjSj1nI56o5L4+aiuyFiBX5n+L4TgeKuy9YJhmD+N65czg26auRCqab
+gO20zdRFK7LtJFdl0sEqctTRHMMm8RUoT6qKX0coM1FaW0g94dcc6Ms2JXxrf8a+
+wlEc3udL1JCgNWb798XSZz1ZoragisYDi9s6OTIoIboRO6N3kFkNcoEBrV9mkrVs
+YdKMYOvlYo1ccXKZfBK4HMa67mQXQQS20lnwGg90ytUZHpj0YXXD4VAnr/pIhz3J
+EapwPlZkodxC2Ram0hSYSM2t0gkzABBfPGk2gZZ1RPhWldLldoVBhY3xZBQFa/cq
+JmrZ8LnQ3tY9fnxsLCZJIl4qBCFPydc8oRt70ScdgDglV3+imUbXYFbmXVBxNrav
+plvQktgZDoZLOzTPzerlNeROZeMgkQKBwQD3B6q+JPEvJuoORYawRQXfuFnWO0Bc
+3ci/GD52dOgxNcqw1GPfTUzVDEZuMXE8F15FTlyhlk9pXpK96AknhVDjKR27jvks
+Qa8PyODTcGrUuWdDCORKyRL20n59vGlSukiWCn5C526C6AxsG6UB8DYsrqQv2GLv
+qxxHOph5QGjd3mq0jFMDCXgRJzZv5Cv79E2/EzA3H1H9L4TZuWLqkajocp14FL1a
+nh8GEnAZvTuAslwzi9ZbnC/5EkZVSloQvPUCgcEA7qUYnuWaWdTZDEJMz6HXyo+1
+RSRZ+YMf9PKCAVA84K6/FzkJzVpx3auettYeR9w06yjATHflBV3jCle/ZR/4KWgI
+Re7aAbxXxjWnLIJiZCrNRutU6yfi69XT0wTvBaFMY+zUI29gAnGow6ulLyZO6uGj
+9eTSWRnJJhjFTUUeYR1TfGqD0hhA3RCv6CQJGgab8VEzjhPgzhiz8IvznRKz54gB
+ocE4DcnGDkmZNy++YOM3ncaoy0vFwEkqXfvy++f7AoHBAIseOj4TN/DCDZYz+YJT
+nNc9TvqjK8Ag9ukHkkXL2Oe9z4R+WDBtrBNfclqkZYzd7C1D0E8AA4DnzeQ9RMqI
+/eCwSxpRjmoqI5jUHCl3afKa51iNLWQgkRmHucy9yuLYHgDBsBGlnEsEu9o2R1ss
+GJZZVAXN6wnmZ2qFyVCfwW8Rzy4WyLkxH/kpCDNDYLHoB9DP0Zt5fAcGN98V1Gsd
+1O3zflMd+vWJjxcwUwlr1JLJ37r3yaSV9T5j2FA4Kzi58QKBwQDtBkVB7MI1XtaE
++oTX5OMzaTCdj9FdpQLkgsjlDRCqCGX7Zsd5ks9tX7uv1VMWBHz64+q7CIoLnoiW
+CTkr82jDl3RAIU+eUbbMQxXbe1TGMEzal3osZd1YZ3SQLmJIsT/yL5Mz7rbpNoJs
+ddsGzYGsgJgc7jyOCrJiiE/Ow0u9ISd+dzyeO0CRULWmV8RCeTYBpKkUAGJT0O1H
+iXlZFO5ilA8q3YITD8kK/8aRrXXlPUhMCLg10viCVykhV9CqqmkCgcAiUsTCw90w
+E1THlVSyyyS1DIj0IqdqE7MXXwuyjE8s5tO2ys3mcOQ3XWUWUK64zL+AgT3lXA5t
+7PlO9UkA/WMoKqsDkq62ppft8JclVQY/Fb7PcCK9r/gsP87V5eZflNfSCvuZ162r
+0Tq4+2ywRxxggbGMXt8li5OCjChSmV7n5/j8MEi9Q4KeOSt7FGv7G4p98R4GAcp9
+WVR5APp2vamhAq3EfgtWwjdrfSBfU+9GiM8k4kwl/JhJQDgQGW88GEw=
+-----END RSA PRIVATE KEY-----
diff --git a/test/test_certs/ca.cert.pem b/test/test_certs/ca.cert.pem
index 9832d1231..84bebfcd2 100644
--- a/test/test_certs/ca.cert.pem
+++ b/test/test_certs/ca.cert.pem
@@ -1,33 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIFoDCCA4igAwIBAgIMWId0/Tdzb0Anm7xOMA0GCSqGSIb3DQEBCwUAMHQxFTAT
-BgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBGYWN0
-b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEgR8O2dGFs
-YW5kMQswCQYDVQQGEwJTRTAeFw0xNzAxMjQxNTM4MzdaFw0xODAxMjQxNTM4Mzda
-MHQxFTATBgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJp
-dCBGYWN0b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEg
-R8O2dGFsYW5kMQswCQYDVQQGEwJTRTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAKc95KldnRqe+UVbHdcQLOfCpCevV8vJjwlgiEZX6iPaekPyVjGnxAQ3
-Zq2j1mepTbRh37FBb1xl8vPu2UHRe7d79LF7M6SlP/Wz/wpi74hiDaOgnSVS/7c+
-wg/nJqtuCUPAJUW+z5m3PtlyGj/4Xt6yjBQ4wN1uLY45JfIE6OdW9KRTAy5s+Kpf
-qGSyb9HLAjsNgB65BCL8/ZQYc9v5P/2woyqR0Ee09R1JL0gvJEqBvdvl7DcdRhqt
-XFl1f7wnEW+Qwg0d+YkFnGX8gL3f9CYWaKm58Ys0A6kq/EzlbPCTn8PqgEP8pVZ1
-/+WGVirULfqjzLOwhUEHzkCggKSpLIkrm5OzDtx1lQ9KSF9M9q+hxiNzg9djMhvI
-fjOOkL8M7e2+gmnfuJ8oJSkf6md9lNEar/r+K1B9p6vOF3i6elCu79L4xSnMtM2O
-88G9TTjwRX9CtT2qqCLbMPm8eKc/yVmMNhLDWyUyfXZ9BLrXhFAwclwCRwMHfnkC
-ORW1EZvFGtmimxJSTDlCWYb1/ciB2MSIJktNpNPUdV/IhdEVDZjBGtBxEfWaW3CE
-PU1QbakBMNdfLfGHGQhFOklrZuQFngwEEHaSgojxXkz/Yloh+rLHZnSltfchBaVm
-DwzdqdD4dztMNI03VB5isZtl10cPMjfiEQ9u9ch98wZj3yLidtJfAgMBAAGjMjAw
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIs7BvGArBW1hgbUU7xdTWfwJAvg
-MA0GCSqGSIb3DQEBCwUAA4ICAQB9D0662JXbMwqQL5pvPEUZiBN2DSmuijNEIFEY
-Q83zy0PcNg9Gce3tBdy4GI5gk5HpfDWwd78ahnqotxZUVt2RbdsaXvZ5VYRpIiyZ
-dY9fBG1g23iE6cmlW8FTRkcke/cjOOtHfohys9tFdRrS+pIMzP+BB9tOoxfpQ+8w
-LgHEzZ4I0EGKsqoSPOPHDug9ZGN3IPZTRKdCxahV4cc0nxVbYFebJqpocv7xkXLb
-HQA5HkhImKDPzY6cX+n+zL9f8F0KozXqt/f9AP3v2F/QNWRSjiiPCFw5qhKiyeRv
-bbrW01XJsUDmPxL08U0fenPYC9RuzDGWeJJxFpG6OSfn/dOry3As7bvrh6C9Q5ox
-QLrEFRIbrq37DICBTTs4LW0wG1A0kKLxTVsTK7e99FCZwfKO2K6ra3UPNwlQYxlv
-C7NMEtbCGx43gWoQngpzYNvoXyb8j5GhzEeniELdCzISXMBx3tPhGc9ZWvYtMe5c
-ZdN67pcx6hNPs3PpVuHS5otDUe2rw7DlqeMJokkoPgFD7CDioRZbq/kMvbkHTXAs
-0rqUkH9SP14q6SbuA7t/j43JGrzKiayKYdXmn/EGd31GUdI6hOWCLzsLKg/8lDA1
-TposJN5apxRy3FVuuFcFbG7TjEFu5LGQUJrKQYbrnED74btoALBenrNHEznQhXfO
-HbNnhg==
+MIIEqDCCAxCgAwIBAgIUdeKshax9rx8dNyfBgvUdrfrkB14wDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDAzOVoXDTIwMDMw
+MjE1MDAzOVowdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0
+ZWJvcmcgQml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwR
+VsOkc3RyYSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMIIBojANBgkqhkiG9w0BAQEF
+AAOCAY8AMIIBigKCAYEAzYabZKLi6Irp0MGifHXPIPaEPxJLt6pMHUtZtU7T7E1F
+921RmX9pGSR6J05ED6ow8IRjijKwf31ehEU3nibkBZW0h9z6Hi+2SJm3FBH6mJmx
+sdPT6zUls1x5yfkB4P1MCvvGcIvrAFbgFoOK03s56SLGl1ZMcz8scYyeIVEg2dp+
+F6EW7wU/32gqjW1g/thOzVRSxrzxr7xTaZJ13YXt4ZHJlYpxot55E0ZaDBFTYBIm
+Xf0AlCyxHc7dWjSov2V8Xh4WxRCr3Zm4HcdNNIQQsqL4WWel1BVlseiMOD0Xz/l0
+BSi6OHP5RbjhxuUKSQEMTQ8vrbHIbDPUr8L8Bx5n7Ws5QsAxIyflYE/uV0xKU0NN
+1JV3WKHZXxnFsUWsgKXJ9QLRlWFU5X17TLJsWkQ1fzilx8CBpxQauIwKG/M5uwPl
+BugDe/Oh7cf7SP5OYw3LCn/sELs6ECVpteW9Rj7em0EoqRopWyPfdwuryAtuYX+j
+r0nzSbEX2TBetHuMZP0tAgMBAAGjMjAwMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFKYduSTAWYKu4TsjtNIjRKUPWEuIMA0GCSqGSIb3DQEBCwUAA4IBgQAUMzuU
+GgKsXVXUzfk3sVnSrjVvJUyVD4rgx99xrtrHlJSbFEUxngaeA+3A5W6lKd60CJwQ
+AC9OHFrcI3bVEOpK1ABFgCmK6eDAcEfWM+04+eL2oT6CY6aMi5A1NyAhbdSM0qe+
+z2zHtvmHm4xVmvWMfzGixNa42H7bwOoaprSBPESH1AHVcJxTTiq3l9tHU9spG7LT
+MBD/TGq4jI7e+hyj1E+IPmGvQJbaQXP6i72OPAMVE8FWZ/u1JcKgRt6GhhZgpTHb
+oA7GA52dfluhr30fl3n9g8Wk52+CT4UW5Iom3WJet11/ZR/+bJOt5PHsYPhtpD2Z
+VhjFKsOaV6dIp+aQd9tQZDO53IbnSkCTeDCXKAuWDVa4ZozapXtt5t5U2gpkz5fG
+7hz7AbX8Ya8uH8WvpARGarSiZoBeBLS4nSytr6gl0s7vGC9ryj/ia2oeDDxS/cGx
+Hhqp3Oqtkkmdka4mgE80YVah0fxZamoxuj7feBILzz2YgFN74ob9OC9zd3o=
 -----END CERTIFICATE-----
diff --git a/test/test_certs/ca.key.pem b/test/test_certs/ca.key.pem
index fcb891c37..2864fb82d 100644
--- a/test/test_certs/ca.key.pem
+++ b/test/test_certs/ca.key.pem
@@ -1,240 +1,182 @@
 Public Key Info:
 	Public Key Algorithm: RSA
-	Key Security Level: High (4096 bits)
+	Key Security Level: High (3072 bits)
 
 modulus:
-	00:a7:3d:e4:a9:5d:9d:1a:9e:f9:45:5b:1d:d7:10:2c
-	e7:c2:a4:27:af:57:cb:c9:8f:09:60:88:46:57:ea:23
-	da:7a:43:f2:56:31:a7:c4:04:37:66:ad:a3:d6:67:a9
-	4d:b4:61:df:b1:41:6f:5c:65:f2:f3:ee:d9:41:d1:7b
-	b7:7b:f4:b1:7b:33:a4:a5:3f:f5:b3:ff:0a:62:ef:88
-	62:0d:a3:a0:9d:25:52:ff:b7:3e:c2:0f:e7:26:ab:6e
-	09:43:c0:25:45:be:cf:99:b7:3e:d9:72:1a:3f:f8:5e
-	de:b2:8c:14:38:c0:dd:6e:2d:8e:39:25:f2:04:e8:e7
-	56:f4:a4:53:03:2e:6c:f8:aa:5f:a8:64:b2:6f:d1:cb
-	02:3b:0d:80:1e:b9:04:22:fc:fd:94:18:73:db:f9:3f
-	fd:b0:a3:2a:91:d0:47:b4:f5:1d:49:2f:48:2f:24:4a
-	81:bd:db:e5:ec:37:1d:46:1a:ad:5c:59:75:7f:bc:27
-	11:6f:90:c2:0d:1d:f9:89:05:9c:65:fc:80:bd:df:f4
-	26:16:68:a9:b9:f1:8b:34:03:a9:2a:fc:4c:e5:6c:f0
-	93:9f:c3:ea:80:43:fc:a5:56:75:ff:e5:86:56:2a:d4
-	2d:fa:a3:cc:b3:b0:85:41:07:ce:40:a0:80:a4:a9:2c
-	89:2b:9b:93:b3:0e:dc:75:95:0f:4a:48:5f:4c:f6:af
-	a1:c6:23:73:83:d7:63:32:1b:c8:7e:33:8e:90:bf:0c
-	ed:ed:be:82:69:df:b8:9f:28:25:29:1f:ea:67:7d:94
-	d1:1a:af:fa:fe:2b:50:7d:a7:ab:ce:17:78:ba:7a:50
-	ae:ef:d2:f8:c5:29:cc:b4:cd:8e:f3:c1:bd:4d:38:f0
-	45:7f:42:b5:3d:aa:a8:22:db:30:f9:bc:78:a7:3f:c9
-	59:8c:36:12:c3:5b:25:32:7d:76:7d:04:ba:d7:84:50
-	30:72:5c:02:47:03:07:7e:79:02:39:15:b5:11:9b:c5
-	1a:d9:a2:9b:12:52:4c:39:42:59:86:f5:fd:c8:81:d8
-	c4:88:26:4b:4d:a4:d3:d4:75:5f:c8:85:d1:15:0d:98
-	c1:1a:d0:71:11:f5:9a:5b:70:84:3d:4d:50:6d:a9:01
-	30:d7:5f:2d:f1:87:19:08:45:3a:49:6b:66:e4:05:9e
-	0c:04:10:76:92:82:88:f1:5e:4c:ff:62:5a:21:fa:b2
-	c7:66:74:a5:b5:f7:21:05:a5:66:0f:0c:dd:a9:d0:f8
-	77:3b:4c:34:8d:37:54:1e:62:b1:9b:65:d7:47:0f:32
-	37:e2:11:0f:6e:f5:c8:7d:f3:06:63:df:22:e2:76:d2
-	5f:
+	00:cd:86:9b:64:a2:e2:e8:8a:e9:d0:c1:a2:7c:75:cf
+	20:f6:84:3f:12:4b:b7:aa:4c:1d:4b:59:b5:4e:d3:ec
+	4d:45:f7:6d:51:99:7f:69:19:24:7a:27:4e:44:0f:aa
+	30:f0:84:63:8a:32:b0:7f:7d:5e:84:45:37:9e:26:e4
+	05:95:b4:87:dc:fa:1e:2f:b6:48:99:b7:14:11:fa:98
+	99:b1:b1:d3:d3:eb:35:25:b3:5c:79:c9:f9:01:e0:fd
+	4c:0a:fb:c6:70:8b:eb:00:56:e0:16:83:8a:d3:7b:39
+	e9:22:c6:97:56:4c:73:3f:2c:71:8c:9e:21:51:20:d9
+	da:7e:17:a1:16:ef:05:3f:df:68:2a:8d:6d:60:fe:d8
+	4e:cd:54:52:c6:bc:f1:af:bc:53:69:92:75:dd:85:ed
+	e1:91:c9:95:8a:71:a2:de:79:13:46:5a:0c:11:53:60
+	12:26:5d:fd:00:94:2c:b1:1d:ce:dd:5a:34:a8:bf:65
+	7c:5e:1e:16:c5:10:ab:dd:99:b8:1d:c7:4d:34:84:10
+	b2:a2:f8:59:67:a5:d4:15:65:b1:e8:8c:38:3d:17:cf
+	f9:74:05:28:ba:38:73:f9:45:b8:e1:c6:e5:0a:49:01
+	0c:4d:0f:2f:ad:b1:c8:6c:33:d4:af:c2:fc:07:1e:67
+	ed:6b:39:42:c0:31:23:27:e5:60:4f:ee:57:4c:4a:53
+	43:4d:d4:95:77:58:a1:d9:5f:19:c5:b1:45:ac:80:a5
+	c9:f5:02:d1:95:61:54:e5:7d:7b:4c:b2:6c:5a:44:35
+	7f:38:a5:c7:c0:81:a7:14:1a:b8:8c:0a:1b:f3:39:bb
+	03:e5:06:e8:03:7b:f3:a1:ed:c7:fb:48:fe:4e:63:0d
+	cb:0a:7f:ec:10:bb:3a:10:25:69:b5:e5:bd:46:3e:de
+	9b:41:28:a9:1a:29:5b:23:df:77:0b:ab:c8:0b:6e:61
+	7f:a3:af:49:f3:49:b1:17:d9:30:5e:b4:7b:8c:64:fd
+	2d:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	1c:34:af:14:f5:69:e2:ac:7f:23:f8:5b:0f:03:76:5f
-	5c:0f:6d:76:00:1b:a9:91:cb:26:11:b5:b3:6c:14:c1
-	eb:2e:fc:77:17:06:d1:63:58:a8:a3:8e:67:41:b2:67
-	1d:8e:08:39:0f:ed:25:2b:38:8f:75:70:04:ce:bc:cb
-	d4:47:0f:8b:d4:c8:e6:e9:e3:99:88:e1:0a:90:95:72
-	dc:14:05:a9:9b:3a:e5:4f:d5:70:cb:57:d3:c8:c3:d5
-	22:2d:0c:dc:37:73:31:dc:9a:e7:f7:7b:7f:e0:76:b7
-	9e:6b:4b:99:ca:c5:4d:a8:b7:3c:e2:2e:70:2f:8b:9c
-	b9:c3:e1:10:3f:4b:37:a1:1c:62:fd:20:af:05:35:f4
-	d9:5a:cc:89:e1:f0:55:aa:4f:66:23:bd:9e:92:e9:fc
-	f2:46:82:8e:77:0f:30:f0:ca:10:a6:bd:c8:dd:99:07
-	4a:ab:04:9b:13:2c:87:bf:46:0f:b6:32:bf:e9:4e:b9
-	7d:14:6f:f5:e0:61:4e:7f:b8:c1:e6:95:1b:f0:e2:6f
-	6e:06:16:e1:fa:5f:dc:d4:e5:3a:0f:b5:34:58:6c:36
-	a9:92:54:41:6f:b5:f3:78:a2:8c:16:fc:d2:19:85:11
-	80:1d:12:10:18:2c:51:2c:6c:d7:af:7a:22:cb:39:6c
-	5f:18:2b:75:9d:1c:45:70:31:22:da:a5:c8:72:bb:e8
-	85:00:56:3d:18:f0:0e:3a:a7:73:49:a4:b1:d2:42:9e
-	9e:4d:21:9d:69:d5:b7:e0:1e:b8:91:e4:94:1e:b5:f1
-	31:3e:1e:f3:20:2c:ab:e7:bf:3f:f1:88:15:4c:bf:a6
-	e8:03:78:35:8a:94:d3:2d:e9:c7:07:3a:f8:d8:c8:9d
-	7d:87:3a:c2:a7:f7:4d:62:d3:2c:09:e1:7b:a6:e5:99
-	ba:7c:24:08:16:3a:2a:29:21:e5:78:47:fb:13:f8:e4
-	de:05:2b:ac:73:f0:08:9d:d5:4d:fd:ca:6a:50:1e:b7
-	09:f0:31:47:5c:b7:09:9b:3a:af:0d:df:fb:89:88:4b
-	98:1e:2e:dc:f7:4a:2b:74:a6:4b:1d:ef:76:5f:fb:36
-	6f:ce:f4:34:8b:40:38:58:8d:3b:7e:42:97:74:0a:0c
-	d8:41:98:81:7b:18:bb:e3:b9:2e:f9:3a:ef:91:ca:41
-	46:e0:a0:99:70:e0:32:ce:09:5a:78:ed:2e:3a:4e:de
-	b3:a4:85:1a:05:8a:fe:bf:25:a1:cf:d7:de:6f:33:81
-	33:6e:c3:82:5d:de:f9:93:ba:06:46:ec:d1:d3:3a:80
-	39:94:d9:35:5f:58:df:55:2d:b6:4d:0b:66:e2:f8:39
+	7d:23:d8:ba:0d:f3:db:63:b9:ba:42:2c:8d:5b:ae:22
+	83:f7:41:f0:01:ea:72:e6:a5:6f:9b:cf:a9:8f:9f:f1
+	ed:08:1a:a7:f4:ae:7f:6f:af:a6:31:08:96:a8:73:18
+	19:5a:82:c1:42:db:f4:c4:81:28:48:7c:f4:ee:f9:27
+	ed:5f:5e:da:4d:f0:d3:5c:4a:18:4e:41:0a:31:6b:79
+	29:98:fd:41:ab:95:50:bf:45:2f:62:ab:1b:59:c2:e0
+	ea:4f:23:24:a4:0d:12:c7:d2:e9:e2:6e:45:16:62:cc
+	71:40:3a:25:71:a7:3a:6f:f5:33:89:94:ff:b0:e0:f5
+	08:91:9a:a4:3c:25:16:1f:11:6d:d7:6f:22:00:09:f4
+	f1:50:c6:95:fb:b5:ad:2b:1e:1e:c9:ee:ba:53:31:e4
+	86:c0:17:2d:94:c3:76:72:82:29:f3:ea:25:22:7e:fc
+	8e:1f:ec:4c:cd:eb:e8:6c:1d:e8:e9:63:e6:db:a3:0e
+	5e:a3:3e:71:25:a6:04:a8:5a:d2:97:be:68:07:6c:4f
+	71:e4:06:03:23:86:a8:c5:96:b3:4e:8e:40:e7:4f:67
+	5b:c2:04:dd:9d:c3:b0:36:77:e9:45:9b:1e:e6:a4:1a
+	3f:59:96:2c:7d:53:23:e4:25:1e:20:5d:9f:cb:60:86
+	d7:71:f8:8b:fb:08:28:0b:e6:8a:a1:b0:ba:03:16:cd
+	c1:98:dc:ac:15:9b:c1:ec:63:5a:cf:f8:e7:84:5d:b1
+	63:ac:6b:9a:5d:d6:5e:7a:8b:3a:15:f2:23:0d:ce:1a
+	9d:56:1d:41:62:67:82:f8:1f:25:2b:e3:3b:a3:35:b1
+	26:a4:05:8e:a8:e1:8a:c1:4e:74:2f:7b:a3:cf:ab:4f
+	49:67:1d:fa:66:80:cb:cc:a7:15:43:7b:75:50:ef:b0
+	d4:05:02:a9:4d:c8:52:61:2f:ec:30:66:d8:92:21:8d
+	10:4f:96:9a:1d:f2:fc:82:ec:6e:be:9f:f7:a6:08:01
 	
 
 prime1:
-	00:db:a2:a3:71:db:9f:13:8a:1e:4a:a6:b9:8a:4e:bd
-	eb:89:c3:27:1d:29:42:c4:71:0e:cc:5e:59:fd:63:72
-	d6:5d:d4:1b:16:57:e6:9e:4e:e7:b6:dc:2b:30:a2:55
-	be:36:94:0c:e1:06:ea:e0:c3:9f:fa:89:d0:eb:05:f0
-	a2:ed:9c:45:42:46:4b:85:45:f2:ab:63:b9:4f:6e:1b
-	c4:fd:15:a4:09:26:f0:b1:77:e3:ee:2a:30:3b:4d:e2
-	0e:53:35:94:9e:26:aa:b6:65:d9:1d:de:94:79:5f:47
-	80:7f:34:cf:d9:2a:63:0f:1a:9f:4a:ea:10:95:7c:2f
-	13:4b:a4:37:5a:aa:cd:55:3c:6f:38:a2:10:06:2a:4e
-	26:2b:47:22:ae:c6:73:38:8a:cc:0c:05:92:86:ae:9a
-	37:aa:c5:65:92:72:dc:d0:45:3f:a3:b6:b2:c0:1f:b6
-	1a:66:16:a8:45:3a:8e:14:d3:a0:1e:85:a5:59:64:6e
-	a5:49:43:76:62:52:79:4b:85:88:af:ec:07:5e:32:39
-	6e:71:65:2f:90:cc:32:7d:1d:db:8c:40:b7:ab:e9:46
-	22:42:29:0f:32:af:7d:05:6a:67:ab:9b:80:57:5e:12
-	4f:26:54:a6:3b:9c:88:8c:58:5f:20:02:f3:4c:a6:32
-	5d:
+	00:f7:31:a8:eb:1c:37:08:dd:b0:c1:20:2f:b2:bb:82
+	e8:9f:9a:40:06:ba:4d:d5:34:f0:f7:6b:fe:20:9e:45
+	4c:51:1b:9e:8f:d7:9d:60:b6:e7:07:f2:69:4a:a3:c4
+	82:45:d0:49:bd:4c:a4:b9:ac:f5:ce:5c:1a:87:0a:4a
+	a1:a2:b8:ad:e8:a2:dc:cb:50:2e:9b:d9:04:f4:2c:3e
+	5a:76:5b:ac:78:97:2a:0e:ce:af:72:ba:43:60:91:96
+	23:74:7f:7c:63:ee:7d:e5:0c:70:cc:44:f7:1a:11:5d
+	41:77:3e:90:26:68:e8:f5:44:76:56:a8:ca:9c:b3:8c
+	56:27:ce:79:8b:88:81:f5:ca:01:92:a4:e7:ae:db:b2
+	c0:6e:99:af:a6:ac:d7:a1:b1:57:60:7f:33:71:b4:98
+	38:6a:8e:c4:7a:71:8e:1d:c3:4b:75:d1:97:67:5a:48
+	96:51:6b:cc:53:d0:3c:48:d9:5e:dc:5c:75:7a:e1:77
+	91:
 
 prime2:
-	00:c2:ee:86:bc:d2:32:81:f8:a1:7c:3e:4b:6e:03:66
-	34:dc:1f:2f:db:44:ec:de:2a:d0:58:fc:0c:08:6a:4c
-	8d:27:2f:d1:c9:10:18:ed:ee:00:72:75:78:6e:fe:08
-	70:5d:77:57:b9:0f:5f:0e:70:ad:50:1e:75:52:b0:80
-	aa:70:44:44:bb:38:ae:cb:a4:4e:e1:29:3b:3a:98:8f
-	4a:48:f3:8d:2a:89:d5:02:f3:e2:0b:3e:f5:d1:14:af
-	87:cf:69:d1:4f:ca:d5:af:2d:c7:53:61:09:c7:52:09
-	62:c7:66:9e:87:e3:6c:94:a9:44:a9:ae:48:f9:0a:c9
-	65:b0:85:87:9a:b3:f8:62:f6:8d:7e:24:84:5d:cf:8b
-	0e:44:8e:c4:4e:67:41:ab:f2:b0:76:27:c1:62:dd:3b
-	65:07:23:27:c4:2c:43:1f:8b:65:7c:db:6c:fa:05:dd
-	89:c7:21:a3:df:96:42:7a:e7:12:e3:f2:02:a6:f0:5a
-	9e:50:37:29:0a:fa:de:4c:82:41:9f:9d:cc:43:b6:c0
-	e4:5a:2d:40:ad:3f:61:f6:31:b2:76:ff:57:86:ec:b9
-	57:26:db:b1:f6:3b:ee:eb:82:f0:ca:15:d1:c9:ea:3b
-	81:b5:f1:a9:ca:b7:88:77:fb:dc:0f:b4:f5:32:95:83
-	eb:
+	00:d4:d8:f1:ed:d7:91:18:63:8d:0a:36:18:60:48:86
+	a9:96:a4:91:04:ae:b1:e6:31:94:07:43:86:ff:2f:53
+	90:52:e3:fe:28:83:86:3c:9f:ce:91:60:ab:8d:8a:f0
+	93:3e:8c:27:cc:8c:8e:da:34:49:00:92:39:91:e1:9c
+	41:5d:62:b6:1c:d1:af:dc:c3:16:0c:b7:88:5d:1f:69
+	2d:40:be:b8:83:ab:0a:6c:b1:6e:ff:e7:13:2f:6a:68
+	9b:9c:db:82:b9:7f:41:5d:f2:50:2b:39:3c:39:6c:a0
+	8d:8a:7b:93:6c:1c:ff:29:ec:d3:c7:45:c1:2c:9a:65
+	27:e9:6d:86:29:a4:4d:6a:38:f6:b8:4e:ca:55:f6:1d
+	de:f4:3c:9d:eb:28:13:af:db:01:e5:db:db:c9:c9:0f
+	f8:e2:29:a8:61:9d:34:7d:87:86:08:9b:dd:3c:0a:47
+	ed:b9:23:02:97:21:81:c7:0e:bf:54:7e:1d:1f:a3:f5
+	dd:
 
 coefficient:
-	63:04:df:d0:5f:bd:e4:1f:94:21:97:c6:60:6e:1c:e8
-	fb:1a:d8:96:82:a4:4d:2d:2b:97:0c:dc:58:20:63:a7
-	9d:dc:bf:4c:0a:49:59:12:2f:0b:b2:2d:e6:f5:3a:1e
-	88:d9:31:db:49:38:22:0b:ac:36:68:35:d5:49:10:6e
-	2f:45:7e:55:32:4b:7f:cc:b2:23:2f:c3:34:6e:61:ba
-	9f:20:66:52:e1:89:80:d2:3f:9e:84:74:bb:46:dc:55
-	93:6a:11:78:8c:4c:d7:84:8c:7f:ee:8c:cd:7a:13:66
-	d4:6c:15:43:6f:8d:c3:ed:86:ba:41:7d:d0:6e:24:b1
-	a7:58:7a:b4:f5:47:7d:b4:8c:38:6f:18:39:4a:e4:04
-	04:f9:5f:e1:1a:b1:f8:10:e1:05:e2:7f:d6:64:94:1f
-	f0:7f:52:bf:01:79:49:06:5f:92:21:24:0e:d8:e3:53
-	65:09:12:ff:33:b5:99:83:49:30:2a:8b:44:03:18:6b
-	30:84:ff:61:91:63:2e:6a:72:16:e6:40:d8:10:f9:60
-	cc:09:1c:4a:15:3c:49:9a:86:b3:66:f6:83:55:8d:86
-	33:c3:13:e1:61:d2:5e:7d:d8:02:67:c5:5d:3e:82:d1
-	8c:f5:93:4a:83:35:1c:7b:d7:a0:e5:f6:76:20:dc:e3
+	1d:cc:fc:4a:8c:34:19:05:a9:2e:8e:35:0c:e4:cb:c4
+	75:39:fb:a5:f8:c1:30:26:07:81:4e:99:81:b6:0f:c3
+	c4:3c:35:47:47:3b:61:c2:c7:14:31:06:bb:6f:13:0a
+	0f:ba:7b:6a:bc:50:3e:7a:95:26:b7:5f:e0:71:ab:c2
+	d2:c0:8b:fb:c0:43:cf:0f:41:6b:4c:ed:15:98:3d:e3
+	7c:a9:e6:f7:18:78:67:9d:21:46:a5:03:d0:61:f6:72
+	bb:92:9a:cc:a3:91:86:e9:9c:ab:68:07:a7:55:a8:d0
+	2b:e1:bc:51:70:43:d2:6d:4a:f6:7e:f8:5f:f4:7d:bc
+	6f:50:9c:36:b8:bc:00:58:83:72:dc:f7:24:46:35:04
+	d2:1c:29:17:a7:60:04:28:e0:ae:03:98:a6:8f:28:be
+	b5:a0:96:90:47:f9:62:d8:20:e8:ee:2b:44:02:74:4a
+	bd:f4:0c:96:65:00:c9:fe:8f:53:fb:e1:a1:a6:27:55
 	
 
 exp1:
-	00:8c:4e:67:6f:32:c7:7a:69:ff:53:dd:12:26:02:8b
-	5c:ce:52:b6:c7:f0:35:d0:dc:10:82:09:bc:1f:1c:ca
-	9d:9a:af:06:e6:cd:1c:6c:01:28:11:2e:b1:00:8e:93
-	8b:c1:bd:ee:44:4a:70:fd:48:bb:08:07:c6:48:7d:30
-	ee:44:30:52:26:36:55:c4:3b:9c:fc:53:e6:6b:91:81
-	77:e3:dd:51:3e:ef:7b:4f:43:b1:7d:d1:c1:a2:00:ec
-	ea:0d:c9:ea:b8:e5:26:a5:02:87:22:87:af:fd:a1:1a
-	42:42:00:f0:ce:60:3f:8b:c4:8c:02:05:68:b6:b5:f0
-	34:b9:5b:9c:68:f5:37:da:bd:92:a7:71:10:1f:80:23
-	10:4b:11:54:5c:a6:35:b0:e7:29:d6:7c:30:d0:8c:f5
-	c3:9d:fa:20:1a:df:f9:a3:aa:b9:2e:d2:65:7a:4a:47
-	c0:b1:7a:c3:e0:05:ba:02:1f:f6:e7:c8:a4:8a:68:98
-	2e:4a:91:28:2d:43:56:6d:22:4e:e1:63:3c:89:b6:37
-	ee:0f:ce:7e:06:58:0b:e0:d5:94:0d:12:c2:c2:b5:70
-	b2:2d:e5:a0:e9:d6:25:5d:b2:4d:ab:d8:d8:b1:f7:4c
-	66:f7:ab:97:cd:f8:ff:59:f8:92:3c:16:e6:6a:0e:b9
-	99:
+	00:9e:c5:68:c7:ca:51:97:02:3d:7b:6e:1e:f4:df:f7
+	8f:4e:a4:16:a7:bb:96:2e:71:58:ac:b2:d2:81:44:e7
+	21:c3:9e:c7:d3:80:1b:f7:78:c3:1f:99:96:03:78:f8
+	c8:eb:ea:82:d2:71:9e:04:1c:91:ad:3f:ff:51:e9:4c
+	52:51:5f:e9:63:d8:e7:94:37:26:18:b7:e5:b4:a7:8e
+	4d:30:64:65:7c:f7:2a:ee:63:d6:d1:0b:ce:27:02:9b
+	ba:9e:23:1c:54:5b:64:c5:6f:9e:2b:b5:c8:39:18:1a
+	1b:e8:69:68:d1:22:e5:2e:54:10:e6:4c:78:06:fa:54
+	13:2a:72:36:23:67:44:82:08:83:c6:1a:e1:2c:b0:b4
+	39:61:50:99:3f:a7:18:c1:24:55:09:07:ea:95:07:f8
+	15:94:6b:aa:cb:32:90:a3:91:42:b0:a4:34:69:0f:d6
+	3b:a6:84:64:b3:18:b6:ff:db:8e:50:5f:9a:9d:98:9f
+	e1:
 
 exp2:
-	6c:20:a5:8a:9d:ca:38:80:33:0b:58:fe:bc:52:94:62
-	23:ec:04:be:cb:57:dc:d0:c0:eb:6b:3c:3d:7a:c1:65
-	d6:e3:d6:a9:82:0d:62:05:90:27:ed:73:55:96:02:16
-	5a:32:35:ed:c8:52:01:0f:8d:83:90:b1:a1:a1:98:6d
-	72:82:db:e1:42:4a:eb:59:04:0c:2f:b3:d4:08:06:0b
-	bd:b5:a3:8b:82:13:2f:65:1a:f1:04:06:94:e8:b5:89
-	4f:0b:32:78:e1:59:70:a7:a3:16:64:10:69:88:de:fd
-	f4:ff:be:56:40:57:dd:8a:9b:34:c8:21:60:4b:94:75
-	9c:da:24:e3:32:8b:48:51:dd:20:a8:9e:e7:ee:95:02
-	e0:12:95:5f:ac:35:28:6d:21:67:19:1c:53:7b:c6:53
-	7f:07:08:2a:f0:26:77:9b:fa:3a:ac:f8:a1:23:99:c4
-	b0:39:bf:cd:e9:6a:8d:04:1a:5d:68:c4:01:d7:f7:5c
-	33:c0:b5:3a:8a:f7:be:56:ce:91:fc:94:ee:c6:b3:ee
-	b6:fa:bd:12:9c:c2:f9:2e:8e:01:26:18:66:16:6f:a4
-	a1:40:62:51:e4:e2:dd:ae:af:64:59:80:1a:51:9c:9a
-	91:d3:30:4c:eb:4b:7e:ca:ad:41:e5:2d:d1:d6:4f:eb
-	
+	00:ce:e3:48:d5:5c:d1:66:19:6d:c0:5d:30:78:76:46
+	9e:95:14:c4:f8:fe:2d:61:89:13:4f:b4:2d:85:e1:a4
+	a2:06:50:22:7d:92:ca:6a:27:13:8c:6f:a0:90:e6:5a
+	4d:65:60:aa:56:c2:d1:1f:fb:ee:71:a5:b0:5b:c2:26
+	35:ca:e5:e6:0a:41:2f:65:b0:22:c0:9d:ac:e8:87:5d
+	9e:64:ee:7d:3f:4e:83:c5:7e:fa:5b:b7:6a:08:8e:af
+	bb:82:4e:43:d4:b6:82:fd:24:49:14:9a:7f:95:79:a6
+	dd:ad:9b:cc:82:2b:f5:41:f5:37:2c:dc:fa:95:b6:45
+	58:f4:26:47:60:36:9a:21:03:d9:9c:f0:c8:ef:a1:59
+	0b:9b:ef:47:b8:89:ae:09:23:21:c7:21:5b:93:d9:e1
+	b2:93:72:d6:7e:7b:65:c8:16:71:0b:f1:24:ab:f5:7a
+	50:f1:c1:bc:04:d6:c6:e4:8b:cb:21:ff:ab:a3:53:a5
+	e9:
 
 
+Public Key PIN:
+	pin-sha256:FFQfF8hwoxnQWpwBhOFyyzd7TtBwTVZp03ZeXs3m74c=
 Public Key ID:
-	sha256:1C:1B:09:C3:1E:D5:B3:D7:16:60:45:8E:DB:B4:64:4D:67:F3:81:11:49:3B:D3:A1:F7:EE:4E:75:27:F7:66:03
-	sha1:8B:3B:06:F1:80:AC:15:B5:86:06:D4:53:BC:5D:4D:67:F0:24:0B:E0
-Public key's random art:
-+--[ RSA 4096]----+
-|o...+. ...o+.+   |
-| ..+ o.  ...B    |
-| .oo+ oE.  . .   |
-| .+.o. .         |
-| o   +  S        |
-|.   . .. .       |
-|     .. .        |
-|      o.         |
-|     ...         |
-+-----------------+
+	sha256:14541f17c870a319d05a9c0184e172cb377b4ed0704d5669d3765e5ecde6ef87
+	sha1:a61db924c05982aee13b23b4d22344a50f584b88
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/test_certs/client.cert.pem b/test/test_certs/client.cert.pem
index 27838d74f..afdf95582 100644
--- a/test/test_certs/client.cert.pem
+++ b/test/test_certs/client.cert.pem
@@ -1,33 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIMWId1Agdxxug/oIa6MA0GCSqGSIb3DQEBCwUAMHQxFTAT
-BgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBGYWN0
-b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEgR8O2dGFs
-YW5kMQswCQYDVQQGEwJTRTAeFw0xNzAxMjQxNTM4NDJaFw0xODAxMjQxNTM4NDJa
-MDQxEjAQBgNVBAMTCWxvY2FsaG9zdDEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBG
-YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApOz4wcdTiEdj
-O192j39Q1EhzLq9qqZghpWUxQHSV0/Fpm7kUj/wtK1xky130+H2ab+k/Sp8jjda0
-TVV7es7yXYQM2iYEDIc1i3oCtygFkISFpzNG5SGLV2GANovwYfgPhvpnGo9inAVJ
-lXv2DJouLBxsL3c86dA3auMjcJ8FNgfvSJ7So7vEdoZQo1QGKpToUUVPD9e+K/y+
-j4WI8swP8lJaZ/EIDK74ESAyyk7R+jYjItF4GrwR7RM7CxWHOENwO/3pxbiJF+oW
-XOt+2jsTTKyL1FZJHI2beBcPvQql9baBY/q0koT7cS8PJiGI/D6TqXQ25XkbTG/l
-dmzJ7K5toLJ+7iUcdt+q8sF0owS4hR/3VUXM24DgBduzvmihD9G0k0wDNmjHu3te
-8tGQogvMJRTUtiw1AEO2DiUUZqd6p/pFGrJfRyxU6nHBvr1ADeClBwcQB0hH2mVD
-59affexzBsUwhouk3v0fTgNQpX2/qfeKwVbnV4bEN1fd+xSwzdmSelLa6rE+pYER
-JOl+zdLSq0AtZE2GTp2A60jk+AurALcQqhdNU9YV8tCVhFTidO49GXqTmuAJAzvu
-SAoIqCFuU1TWeiNQCHI3clzxUAZcqDBxTZUvbkP3QK7v0Ib5c7HiRp5kmO4CQuUg
-y8mT1RZhaMp9qIy3HKUNEBdYwhj45wECAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
-BgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQ3
-DVC7k5DA5XjW4dD+mWRthF48NjAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
-8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEASw6rojEtxVNLmqhuCGRXpBkeJcEC3hgd
-usOmw3QFwMRwG0JkQuDTZobs20bWCSJzCnGcou6mvdOhjtaErZ/KUA2uAr9YvlmO
-+F7mpXlGjfETm3Ta8JzvTtqgCPjQmz+Wn7nnFmwl9MLOOh//NXQ1KJd/ixWtpaLG
-GhY3zduNczLT7O+qganFneostaZFpa/BL3PVXoI669zp7GmzJYSjuxQIyAMP/hKJ
-aFfTNIv9WhPzXrzEviLspJ7OwfWW/S46WZWcXzauXiYS5y21rfFSBSAo1J3oRV95
-qi2IMM4PVpwQISMPwdJe3f2+Gc6qn3TaHFrnSv8OuRNOdvuqV9MLn9uxovgTTyw4
-j1sb7kO6OoLCqrbdZ+lTHy48jahpV3q+Vcep8WA+fC42sV/lfMuuS3EaQTJIfu89
-+R+pFQPco60risM8Gy/k0QkwxVwoxsq5xM+SaGyHpEazSasX/qJBj+VH97a9rlje
-fzPpmApWRtZNMNx4qSx7ZEFVtSynM7vDWsWsB9x+OYdObzl4bbZUZ3MSCY0/smGO
-PIbNPmqhlr8bRuJGGlXuftOGLPnssWrZSbQhMzBJQWGiKsHQF+AsdQzaDrtgwuWM
-6REkiXd/cs0QXZh9P2ZzzIqKuIwwOazppJ5mdenWx/0X3Ex7PfdiGZPL8f8DEE7/
-lHXLHvTvWag=
+MIIErDCCAxSgAwIBAgIUNzEUMqVU5GCrRgebe3ZANS4xkfcwDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDE1M1oXDTIwMDMw
+MjE1MDE1M1owNDESMBAGA1UEAxMJbG9jYWxob3N0MR4wHAYDVQQKDBVHw7Z0ZWJv
+cmcgQml0IEZhY3RvcnkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/
+dWAYNqMaEOlz6Mdg43Cny82O68cMGDc2RCAVW/t2sRS2gS5ViuABIji/WZOv6g43
+FIhMhAaumh67y67apst/94MtksYIG20C7exMrGpWLAHBxvqECcRLBNpia6fv95Du
+Sn03nG/v/jux9s7lEujXT+AhRtTuHqcP0D8cnjK1Yc/uLlJ1xx76Mxejip6roaMg
+kZ24XwxvVqZGElERbfWxa1yjt7q/arIeyf9YqVJmXrmtqpGBpBgbT3hugaPYzcA7
+G+yxtushNwBoYVGIkxYI7DvxHDpz8xh0IgAhpcSf49jWFs5A91pETzkq+6Q4YntI
+AtNO/5QcIETwhkfCf0CGLj5nKRx33dqMnmlNfNnWcP2c/9bf7/SQVHf+H8q2p/Qu
+a6BgE4wjeYZBBFvqiE430iunrM61BvDY5ZLD7o80YX1xdqC8+FfokEGA+4Ev7VXt
+HMWphLJL9iIte/RPRwlT898fxnm3CeVt+n0VJUWJcswJy/XItKv2LOAZ31bjYS8C
+AwEAAaN2MHQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAPBgNV
+HQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBRPhnQE4zQzhGDsJQXjBpkPiBeO9DAfBgNV
+HSMEGDAWgBSmHbkkwFmCruE7I7TSI0SlD1hLiDANBgkqhkiG9w0BAQsFAAOCAYEA
+imtpB803OvtO6VhV6RYWATMa1Ip1/LsqS3s848cR5mDLimceW+DKAPrirmEo3+yx
+6nmEZ0ib1h5gG/FuUnF435TvndmilzgCi6JNoYP4tIVR48E6CDfTGuebWeJ0xkhH
+pK8lWBxFKTdV/McBqobF2krzhGjvCX9TvUoOQS/iyYZWoft4qyMZxesGg7RqeDoe
+H91/DmDRKCqnTc3J5ZVQjXZD81aQjLFIH2jFOzB5MxfABWVoOEutDFUrofiwVccA
+4Us0Qw0bJih7ES5KU8fX+lxtNylyEWpCgMjn4yC8rtzxZgBxVdv2NK3l+RkWNONl
+fLffuDJya9P3OFTpyukw6a6f6wMVV79sq2VHgItC3Z/eair2WhgGWcpKadra49SU
+RSr1zN3e35s6ef6TEcxQgVvfSeNk6rqCRshm559HgtdejeJU1YOIoI19dhwZKpUh
+KvM9gMJCxoQOe99V65b4T65tCOBrUW0L0lmur+FndrQT5l0VNWLHQGnBjn1BRoow
 -----END CERTIFICATE-----
diff --git a/test/test_certs/client.key.pem b/test/test_certs/client.key.pem
index 6bcd83661..40295dda6 100644
--- a/test/test_certs/client.key.pem
+++ b/test/test_certs/client.key.pem
@@ -1,240 +1,182 @@
 Public Key Info:
 	Public Key Algorithm: RSA
-	Key Security Level: High (4096 bits)
+	Key Security Level: High (3072 bits)
 
 modulus:
-	00:a4:ec:f8:c1:c7:53:88:47:63:3b:5f:76:8f:7f:50
-	d4:48:73:2e:af:6a:a9:98:21:a5:65:31:40:74:95:d3
-	f1:69:9b:b9:14:8f:fc:2d:2b:5c:64:cb:5d:f4:f8:7d
-	9a:6f:e9:3f:4a:9f:23:8d:d6:b4:4d:55:7b:7a:ce:f2
-	5d:84:0c:da:26:04:0c:87:35:8b:7a:02:b7:28:05:90
-	84:85:a7:33:46:e5:21:8b:57:61:80:36:8b:f0:61:f8
-	0f:86:fa:67:1a:8f:62:9c:05:49:95:7b:f6:0c:9a:2e
-	2c:1c:6c:2f:77:3c:e9:d0:37:6a:e3:23:70:9f:05:36
-	07:ef:48:9e:d2:a3:bb:c4:76:86:50:a3:54:06:2a:94
-	e8:51:45:4f:0f:d7:be:2b:fc:be:8f:85:88:f2:cc:0f
-	f2:52:5a:67:f1:08:0c:ae:f8:11:20:32:ca:4e:d1:fa
-	36:23:22:d1:78:1a:bc:11:ed:13:3b:0b:15:87:38:43
-	70:3b:fd:e9:c5:b8:89:17:ea:16:5c:eb:7e:da:3b:13
-	4c:ac:8b:d4:56:49:1c:8d:9b:78:17:0f:bd:0a:a5:f5
-	b6:81:63:fa:b4:92:84:fb:71:2f:0f:26:21:88:fc:3e
-	93:a9:74:36:e5:79:1b:4c:6f:e5:76:6c:c9:ec:ae:6d
-	a0:b2:7e:ee:25:1c:76:df:aa:f2:c1:74:a3:04:b8:85
-	1f:f7:55:45:cc:db:80:e0:05:db:b3:be:68:a1:0f:d1
-	b4:93:4c:03:36:68:c7:bb:7b:5e:f2:d1:90:a2:0b:cc
-	25:14:d4:b6:2c:35:00:43:b6:0e:25:14:66:a7:7a:a7
-	fa:45:1a:b2:5f:47:2c:54:ea:71:c1:be:bd:40:0d:e0
-	a5:07:07:10:07:48:47:da:65:43:e7:d6:9f:7d:ec:73
-	06:c5:30:86:8b:a4:de:fd:1f:4e:03:50:a5:7d:bf:a9
-	f7:8a:c1:56:e7:57:86:c4:37:57:dd:fb:14:b0:cd:d9
-	92:7a:52:da:ea:b1:3e:a5:81:11:24:e9:7e:cd:d2:d2
-	ab:40:2d:64:4d:86:4e:9d:80:eb:48:e4:f8:0b:ab:00
-	b7:10:aa:17:4d:53:d6:15:f2:d0:95:84:54:e2:74:ee
-	3d:19:7a:93:9a:e0:09:03:3b:ee:48:0a:08:a8:21:6e
-	53:54:d6:7a:23:50:08:72:37:72:5c:f1:50:06:5c:a8
-	30:71:4d:95:2f:6e:43:f7:40:ae:ef:d0:86:f9:73:b1
-	e2:46:9e:64:98:ee:02:42:e5:20:cb:c9:93:d5:16:61
-	68:ca:7d:a8:8c:b7:1c:a5:0d:10:17:58:c2:18:f8:e7
-	01:
+	00:bf:75:60:18:36:a3:1a:10:e9:73:e8:c7:60:e3:70
+	a7:cb:cd:8e:eb:c7:0c:18:37:36:44:20:15:5b:fb:76
+	b1:14:b6:81:2e:55:8a:e0:01:22:38:bf:59:93:af:ea
+	0e:37:14:88:4c:84:06:ae:9a:1e:bb:cb:ae:da:a6:cb
+	7f:f7:83:2d:92:c6:08:1b:6d:02:ed:ec:4c:ac:6a:56
+	2c:01:c1:c6:fa:84:09:c4:4b:04:da:62:6b:a7:ef:f7
+	90:ee:4a:7d:37:9c:6f:ef:fe:3b:b1:f6:ce:e5:12:e8
+	d7:4f:e0:21:46:d4:ee:1e:a7:0f:d0:3f:1c:9e:32:b5
+	61:cf:ee:2e:52:75:c7:1e:fa:33:17:a3:8a:9e:ab:a1
+	a3:20:91:9d:b8:5f:0c:6f:56:a6:46:12:51:11:6d:f5
+	b1:6b:5c:a3:b7:ba:bf:6a:b2:1e:c9:ff:58:a9:52:66
+	5e:b9:ad:aa:91:81:a4:18:1b:4f:78:6e:81:a3:d8:cd
+	c0:3b:1b:ec:b1:b6:eb:21:37:00:68:61:51:88:93:16
+	08:ec:3b:f1:1c:3a:73:f3:18:74:22:00:21:a5:c4:9f
+	e3:d8:d6:16:ce:40:f7:5a:44:4f:39:2a:fb:a4:38:62
+	7b:48:02:d3:4e:ff:94:1c:20:44:f0:86:47:c2:7f:40
+	86:2e:3e:67:29:1c:77:dd:da:8c:9e:69:4d:7c:d9:d6
+	70:fd:9c:ff:d6:df:ef:f4:90:54:77:fe:1f:ca:b6:a7
+	f4:2e:6b:a0:60:13:8c:23:79:86:41:04:5b:ea:88:4e
+	37:d2:2b:a7:ac:ce:b5:06:f0:d8:e5:92:c3:ee:8f:34
+	61:7d:71:76:a0:bc:f8:57:e8:90:41:80:fb:81:2f:ed
+	55:ed:1c:c5:a9:84:b2:4b:f6:22:2d:7b:f4:4f:47:09
+	53:f3:df:1f:c6:79:b7:09:e5:6d:fa:7d:15:25:45:89
+	72:cc:09:cb:f5:c8:b4:ab:f6:2c:e0:19:df:56:e3:61
+	2f:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	44:b8:a9:7e:b5:3b:cd:51:51:bb:ef:af:4b:63:d5:9e
-	5f:01:ff:b6:00:4f:e2:a0:42:76:c3:eb:03:a9:5a:c3
-	01:2a:6e:18:6f:56:b8:cb:94:98:3b:55:4f:3a:2b:bc
-	2a:5d:9a:8d:d1:79:d3:24:5f:c4:c9:95:c6:3a:6d:2b
-	22:56:e8:9f:66:98:81:ce:81:eb:b9:2d:f0:73:41:20
-	b7:40:50:51:7e:30:58:0b:75:09:23:b1:73:dc:9e:ac
-	79:a5:e5:48:5f:ee:ca:ec:39:19:1c:aa:0d:de:40:d7
-	08:90:db:c6:67:8f:55:bf:81:be:5b:8a:15:f8:e9:e6
-	ac:82:2a:0b:c3:45:fe:3b:15:04:8c:c9:fa:37:cc:0c
-	71:b0:db:9c:d2:5c:df:9f:55:18:20:a0:4b:eb:53:c9
-	b9:1f:0a:a8:98:9e:10:5a:35:68:a1:41:43:4e:a3:5f
-	e3:8c:22:94:55:2f:80:98:b4:a6:a9:9b:b2:d8:72:e1
-	55:5e:1c:06:d3:39:ec:c9:11:c0:6e:30:51:66:c4:47
-	f2:ad:e1:30:83:0e:6e:c3:15:6b:26:97:b2:d4:2c:6a
-	7b:c7:d9:33:5c:ca:24:ab:a8:dc:3b:1b:46:25:35:3d
-	fa:21:fe:ad:e7:a4:c4:58:eb:d8:48:c4:6a:e6:d3:ae
-	b2:f1:c6:b1:ed:7b:ca:23:fc:51:bc:9f:3a:3e:56:9e
-	6d:23:b0:e5:9a:46:ae:f9:ee:8f:1a:5e:cc:42:37:22
-	6e:4b:52:37:0d:36:59:72:1a:19:c1:17:f9:45:55:bd
-	33:ce:15:5b:b5:ee:a3:88:a2:b8:46:fe:b8:e2:93:54
-	0a:68:81:a3:b8:63:95:c6:b2:96:d0:f8:ac:d6:5d:df
-	97:58:85:6f:eb:2d:66:3b:27:7a:db:2c:7d:8d:04:01
-	44:af:4a:91:2e:e8:f7:6c:e8:52:7a:70:a4:31:9a:f0
-	b7:d3:bc:dd:f4:46:d0:61:f9:5f:57:98:c0:79:b9:e1
-	0f:6e:76:33:66:46:82:7a:31:61:a4:88:19:48:15:86
-	0e:b1:40:6a:af:1a:3f:75:db:12:bc:79:c7:f2:fe:41
-	49:02:88:3b:66:33:44:12:9d:43:f4:e6:cf:0d:4d:c5
-	44:d4:a9:4e:0d:fe:dd:00:87:bf:5e:f2:aa:5f:71:cf
-	f8:4a:24:4c:2c:bf:ee:88:3d:f5:78:e1:5c:95:a7:4c
-	82:c8:65:7d:e7:b3:d7:98:b2:f2:4b:66:5c:1c:f7:d5
-	6a:6e:af:a7:e9:98:31:e8:92:99:1d:64:85:fb:8a:f6
-	6c:3b:a1:dc:22:be:fc:f8:8c:3b:51:c4:c0:dc:44:71
-	
+	00:8a:02:48:df:8b:5a:ec:aa:2e:2e:10:28:d0:2d:82
+	82:61:c5:6d:f5:85:48:b1:97:f2:f5:0e:8f:76:fb:7f
+	e6:4b:c0:f6:c3:78:84:1f:ce:91:65:88:81:40:95:38
+	c9:40:68:fb:8a:f4:4c:80:c5:b5:cb:b7:19:f6:a0:ee
+	e5:f2:7b:cb:79:16:68:b7:a4:4f:cd:43:5d:4d:97:65
+	40:59:8f:de:27:ac:d0:01:7f:f6:22:99:79:72:d7:e6
+	83:c1:51:4e:8b:ac:a7:7f:be:aa:37:31:6a:97:f3:96
+	85:c6:1d:10:bf:a7:33:72:43:08:82:1b:4c:3c:b8:de
+	c8:80:02:f7:bf:17:09:0e:ca:59:d3:fb:5e:2b:dc:1a
+	2a:a5:8a:71:bf:7a:3c:53:71:89:6f:cf:3a:42:af:19
+	c0:e7:5c:22:e3:88:a8:fc:77:22:fc:86:a4:d9:80:fd
+	2b:e0:fa:4f:8e:8d:7d:c4:a6:c3:15:53:ca:fd:59:85
+	8d:81:9f:1a:cd:bb:b1:ae:43:f8:53:70:61:25:0c:30
+	8a:ec:9b:14:2a:57:33:dc:31:d4:51:68:7b:be:2e:b2
+	b9:5c:18:23:35:b6:2b:86:6a:ae:9b:2b:9e:aa:5a:43
+	c5:a6:aa:56:11:70:fa:30:36:1b:ea:92:bf:10:93:0d
+	fd:e1:50:ff:4d:72:f0:1e:22:c0:d8:8b:55:34:32:9c
+	41:af:32:ba:33:ef:27:77:cb:c2:1c:08:7b:bf:7a:a7
+	f8:2d:0e:5b:80:49:62:56:0f:9c:ed:48:aa:42:b0:5b
+	6e:ca:28:2e:56:2d:1d:aa:0d:d7:50:6a:7d:01:ea:a7
+	2d:ea:5c:ce:c3:ae:54:65:2a:36:fc:0a:c7:ba:2b:69
+	ec:3f:b9:f1:8e:86:26:8f:af:77:c9:ad:51:5e:f0:6f
+	50:c9:fb:5c:f0:08:79:bb:c4:ca:8f:f0:db:ba:64:33
+	9b:3e:cc:d8:5f:5a:37:e7:ba:4c:88:f0:6d:e3:11:75
+	a1:
 
 prime1:
-	00:cb:37:46:9c:11:91:72:90:0e:18:7a:ad:d9:c4:cb
-	3d:64:2c:47:9a:2f:04:69:05:d5:22:b4:f0:af:3e:30
-	26:2e:32:35:83:ba:e1:80:3b:5a:5d:1c:c9:ac:c5:85
-	f2:87:93:8e:f3:dd:7c:f5:cd:a5:77:8b:c2:bf:47:67
-	4d:c7:df:49:cd:41:bf:6c:14:f8:95:0e:db:00:70:d7
-	3a:43:b8:ae:43:be:a3:ce:48:5d:1b:c5:30:14:34:91
-	2c:6e:c5:00:81:ab:86:4b:9f:f0:ab:45:27:62:e0:ea
-	2d:89:61:a2:bd:06:4d:2e:c7:2c:9d:bd:fd:f5:39:b8
-	29:2a:f4:2e:bf:1f:13:9d:c8:d0:bb:56:67:d3:de:2d
-	31:63:22:61:5c:30:14:ea:b7:72:a8:f4:ea:d6:db:0b
-	35:86:a6:e4:8d:c7:c2:9f:2b:33:85:d7:05:45:f7:05
-	d4:5a:74:8f:26:4a:91:b3:7a:cc:8d:57:1b:c2:a8:b8
-	e8:b5:ef:b0:24:4d:1d:8d:03:a1:79:0b:d4:0b:06:1a
-	62:ca:5c:b8:aa:f9:ff:f4:cb:54:e1:6e:a5:d7:41:46
-	7c:2d:36:4b:15:01:c9:17:45:3c:33:44:79:4c:99:b0
-	43:0d:f7:c0:05:13:e5:82:3d:53:a3:2b:88:d9:ee:3b
-	83:
+	00:df:36:5a:ea:54:96:b5:29:2f:fe:ce:7d:53:70:dc
+	38:a6:97:8e:43:87:ed:5b:33:c0:4c:30:67:ae:9f:ae
+	95:93:e5:a6:8a:93:43:ca:35:09:71:d4:a5:3e:5f:40
+	82:85:6f:85:17:d3:5e:40:e7:eb:5d:1e:7c:da:f4:ca
+	84:0c:c1:bc:1c:8e:65:55:27:ed:ca:35:0a:11:fa:02
+	f9:0e:6d:83:aa:a0:83:e0:17:8e:03:da:79:d7:1b:00
+	a9:74:9f:70:2f:16:04:ed:57:2b:b4:85:07:94:0e:04
+	df:02:10:91:cf:87:6f:5e:42:c5:a6:73:ff:74:e2:65
+	0b:1f:04:4c:1b:39:6b:89:f7:a6:f2:0b:29:b6:e6:0d
+	d5:e1:d5:c8:a0:e0:0c:cd:4f:f5:df:9a:28:98:98:63
+	84:c4:16:dd:39:37:98:73:61:08:4f:64:c4:18:54:23
+	0b:17:02:2a:11:2f:22:bc:e1:c9:4c:84:95:fc:53:44
+	b1:
 
 prime2:
-	00:cf:c3:9b:a6:b3:b2:65:0b:88:8c:64:db:1e:00:21
-	42:a5:bd:47:75:0d:a4:29:e5:e9:9b:b7:1a:cf:df:9f
-	a3:44:9c:67:a4:a9:0c:87:97:94:94:40:54:44:3b:bf
-	1a:f3:71:97:05:d6:a5:ad:28:f5:a9:94:92:f5:7f:f8
-	cd:82:40:6e:ca:ff:d8:3f:18:84:42:83:dd:9e:87:bf
-	fa:2e:96:5e:fc:1d:db:d4:d5:dd:2d:c3:71:f4:bf:54
-	6d:06:21:95:8f:0a:89:b8:14:62:7c:a7:9b:10:fc:ae
-	4b:0c:51:ac:46:5a:ee:04:cc:e2:ad:fc:97:50:32:b9
-	c7:1e:40:6f:07:de:45:7f:2e:ac:12:39:30:b8:7b:6d
-	0f:07:75:bd:58:c2:e2:e7:52:2a:6f:7e:8a:2f:07:c5
-	eb:10:db:8d:10:2e:d4:a2:1c:28:ca:f5:c4:de:56:6a
-	20:f3:47:21:b7:4c:b6:04:93:86:e6:78:b5:89:64:cb
-	9e:f2:cd:78:e7:43:e6:a0:94:41:b4:c5:a8:c7:43:2b
-	20:17:50:7a:a9:c0:ee:db:9a:f0:48:85:1f:1f:64:11
-	4e:4d:dd:99:6f:49:7a:f2:65:2a:83:98:96:5b:a3:7e
-	64:da:77:00:7e:4b:7a:55:d9:cf:d7:73:fb:63:1a:f8
-	2b:
+	00:db:94:f4:2a:df:e8:6e:9a:50:b7:63:0a:74:7f:1a
+	cb:62:1e:7b:bb:d8:31:39:af:73:d0:47:99:8b:93:07
+	d0:e8:19:0c:0a:56:79:be:77:8f:bf:c5:65:53:d0:65
+	85:31:0e:f9:76:95:f9:b5:a7:62:8d:2a:20:47:87:00
+	25:1b:e2:66:c9:e3:8c:89:94:ec:9e:0b:a4:cb:5f:31
+	38:ac:f5:17:c9:8c:96:3d:7f:7a:a3:24:00:6d:83:1b
+	b9:d4:f3:0e:4d:80:1c:c4:c4:be:df:29:4e:10:ea:70
+	1b:bf:88:db:19:3b:64:fc:3f:d8:49:45:65:bb:7a:e5
+	10:87:ee:a5:c3:81:c8:72:ee:42:ba:70:3b:d5:d5:f2
+	e6:ef:d9:c0:0f:d3:2f:3f:44:a0:cb:d0:67:e6:35:45
+	64:93:9d:b7:35:d8:e3:86:53:e5:25:98:59:23:ca:39
+	d6:2e:ba:ce:55:52:bb:30:6f:f6:ae:12:4f:4a:51:fb
+	df:
 
 coefficient:
-	69:74:f7:c6:34:ec:d8:f9:08:c2:d8:5b:6a:61:4e:33
-	b3:9b:dd:f1:30:8d:2e:bf:12:2d:74:de:53:6c:d2:88
-	e5:9f:5d:5f:f1:e3:59:00:c4:1d:e3:5a:1d:07:6a:53
-	ea:c8:46:0e:b1:61:5d:03:27:d9:1a:67:54:8d:bb:85
-	53:07:39:19:56:8a:dd:9f:f4:30:13:fa:2e:ce:1c:8e
-	1c:cb:d6:54:b7:a9:92:26:87:f6:60:c1:04:41:fc:7c
-	f7:fd:fb:a7:fc:f2:d0:2c:4a:65:ef:62:5b:f9:b4:d6
-	e8:f6:68:57:1f:b2:d1:d6:c4:78:0e:d4:66:39:cd:4c
-	42:d7:5b:d1:ce:ae:5a:b6:25:12:7f:d1:2c:ae:95:4c
-	14:cb:0a:31:7c:a8:0a:71:b8:98:c8:2b:03:19:92:d0
-	e1:4c:a8:c4:0b:8c:b9:8b:d0:9a:b3:8f:27:b3:a4:09
-	8b:6d:95:e3:12:a0:60:e6:e7:b9:8f:53:fa:b4:56:f1
-	cd:fe:11:31:20:01:fd:82:73:f1:51:ba:13:71:f1:0f
-	8b:78:3f:36:71:7e:15:93:35:01:06:8b:40:a3:b5:23
-	22:9d:c7:c7:88:c8:25:07:dd:0d:1d:70:43:37:3e:ea
-	25:b0:54:f0:5d:83:29:ca:5a:ec:4e:f5:a7:66:f0:fa
+	57:70:d9:92:66:ae:d6:e4:00:e2:f7:4f:9f:c2:b8:eb
+	2c:c3:d4:f6:63:0d:5c:01:2c:d9:a7:46:bc:da:7e:90
+	b9:73:fa:51:88:3c:3f:26:d9:e5:0a:fb:e5:d9:16:f1
+	92:4a:07:e3:cb:51:19:06:ef:7e:56:d4:d8:20:03:47
+	ef:91:9f:c6:02:35:51:24:2f:c7:37:06:b0:a6:39:91
+	3e:61:8c:4b:1e:0b:34:6b:6b:2b:11:9d:97:1c:59:4f
+	e7:65:53:82:db:29:6e:c7:f8:a9:7a:da:a1:bc:ff:d2
+	14:73:f3:10:c7:26:74:16:b1:af:b4:84:8a:02:f6:c6
+	4f:96:f9:d8:f5:a5:1c:19:06:af:a9:e3:e6:43:79:c4
+	db:9b:d0:29:67:07:f3:90:14:ee:8a:57:e6:13:46:6f
+	4f:d6:b2:ce:64:4d:11:57:be:a0:1b:7c:72:a9:50:de
+	7f:bb:4e:de:a9:9a:43:6a:f8:76:6f:fd:d1:0f:65:26
 	
 
 exp1:
-	4a:04:cd:3c:45:8d:e3:db:a2:b6:b9:e0:9f:04:76:3e
-	db:40:e1:a7:c0:5e:6b:de:8a:fe:84:47:72:9d:45:2e
-	72:ff:28:cc:dd:82:0b:92:12:dc:fd:82:5b:e2:ea:62
-	27:8d:d0:b0:f4:c8:f2:43:40:74:e5:bc:3e:ad:c4:6b
-	e9:54:64:6e:55:f7:62:67:d5:0f:7e:04:b9:09:60:eb
-	c1:05:00:bc:7e:30:ee:0f:1f:92:e0:e5:1d:46:f4:65
-	e9:c6:e9:e3:51:55:ae:30:08:9a:69:aa:e9:f2:20:7a
-	0b:a3:3b:82:7c:4c:1a:b0:c3:88:85:4e:7e:46:d2:d4
-	73:e7:d3:2b:1c:27:a9:fe:1e:41:4e:3c:ad:48:2c:cf
-	e3:5a:ff:79:73:ad:fa:bc:6d:10:2b:7d:6a:5b:08:9f
-	2b:77:98:a2:27:d3:b4:e4:28:75:24:97:b0:1f:44:c9
-	4f:55:4b:5a:d8:28:6f:e6:57:a1:57:cc:2d:c0:04:f2
-	06:6a:d2:8e:b6:64:00:1c:05:71:b0:a4:40:8b:ad:8a
-	b4:48:c7:9e:c7:46:ba:a4:61:3b:67:71:12:91:9d:19
-	d7:e2:01:c1:1a:10:63:e0:7d:07:f3:75:f7:37:b7:a3
-	04:f0:6b:c9:ad:b0:98:1a:bc:5f:1f:99:4e:3f:de:ff
+	29:29:e6:fe:4b:f7:37:15:8f:6a:58:3e:38:83:19:b9
+	c0:cf:36:47:31:ec:0d:e3:af:54:dd:a0:61:4d:c5:6e
+	84:45:d7:be:ba:85:c7:e6:9c:05:48:07:e9:46:bb:a8
+	d6:5e:c8:96:aa:3e:39:8e:0b:93:b2:a9:a7:df:78:f1
+	7d:40:c5:26:27:04:7c:fd:ce:16:7a:4d:8f:1f:22:29
+	38:05:ee:40:2b:35:e6:bf:b1:4a:f8:a1:7b:8f:d9:41
+	66:e6:78:53:d6:a5:b5:f7:5b:72:01:0e:72:b9:5b:20
+	9d:4a:dc:f8:fe:ab:05:21:1f:3e:21:2a:3d:2d:fb:20
+	5f:e9:f4:f7:18:51:c2:b1:cf:31:d7:e9:2b:77:a5:99
+	89:fa:58:f3:82:1e:1a:46:e2:bb:07:bc:f0:d7:39:93
+	24:6e:6b:01:c0:44:f7:12:2f:ec:24:53:1d:81:76:ac
+	f6:e3:49:4a:bd:fc:94:04:b7:90:ca:ea:b6:0b:cd:21
 	
 
 exp2:
-	0d:a2:8b:bb:83:fd:88:2e:1a:97:04:23:71:33:96:fb
-	35:bf:57:4a:32:4b:fc:c7:ee:ed:de:35:6f:41:00:cc
-	09:3b:ae:7d:9a:ee:8c:93:81:17:bd:a5:0a:19:55:b0
-	62:1b:a9:4a:a3:cc:99:b1:9f:75:b2:9f:76:67:20:9f
-	f4:15:60:70:08:1c:5b:ff:b2:e6:5e:9b:13:c5:5a:ef
-	03:51:b1:08:20:b9:85:9d:47:77:b2:64:ef:28:03:55
-	68:5a:99:e3:1a:50:f1:78:bd:01:eb:49:fc:f2:68:49
-	da:94:1d:97:3c:6e:74:78:31:c4:33:58:86:d5:dd:65
-	58:f1:e7:97:7f:99:d5:ff:ed:21:01:09:d6:81:9b:25
-	aa:5a:aa:c3:81:7e:bc:a9:a2:c9:50:67:a7:30:7e:67
-	af:e2:88:be:70:24:5a:43:38:d6:21:0c:fb:7e:76:56
-	95:40:ac:d0:c7:c3:06:47:dc:49:91:d0:70:24:e2:4c
-	1b:29:2a:ef:1a:80:af:37:2b:9c:be:80:16:1b:ad:5f
-	dc:c7:d6:54:ff:a9:6d:56:1c:c0:d5:a3:b6:3e:ad:f8
-	12:9a:21:70:b1:44:d5:55:98:55:ac:94:e9:8c:b0:45
-	d4:24:8d:2e:bc:ab:59:a9:02:bf:e4:07:b2:78:59:a3
-	
+	00:d5:5f:95:34:e4:87:b4:92:77:c4:fc:94:f8:47:5a
+	fe:2f:c6:77:6e:3d:d2:f7:bf:2a:c7:46:0c:4a:b9:01
+	6b:5b:5e:9b:78:a0:37:85:82:21:49:b4:c3:96:02:77
+	e4:49:9b:c7:86:18:8e:a2:9a:99:05:9b:dd:ea:23:a1
+	5c:6e:10:3e:da:08:28:54:b9:46:84:fd:c3:91:6c:5b
+	24:3b:cd:9e:e3:d7:9d:56:fd:3d:6a:b2:5d:48:0d:93
+	2f:ad:62:d2:8f:34:e2:bf:c2:7f:c7:d3:17:6d:10:a3
+	08:13:c3:25:45:0b:96:42:18:b8:4f:db:03:d4:7e:c3
+	80:a0:d6:a2:75:ac:f3:df:da:ef:34:c4:43:20:b3:da
+	69:d6:c0:be:05:a2:ad:d2:c9:19:87:74:68:c2:27:19
+	db:76:26:58:16:17:40:61:13:bd:24:1f:3a:df:b0:6f
+	2b:56:15:68:d3:38:a5:75:98:17:19:67:e9:6c:ca:e5
+	f9:
 
 
+Public Key PIN:
+	pin-sha256:eW/EdpxWY+JCBcfIUsEMlUqWPNXBWwx9wVpzib7Lg6M=
 Public Key ID:
-	sha256:99:0C:C5:EF:0C:3C:DC:71:32:9D:02:23:F8:28:E8:3B:55:D8:00:3D:D0:12:F3:56:33:03:B1:FD:30:3B:71:F1
-	sha1:37:0D:50:BB:93:90:C0:E5:78:D6:E1:D0:FE:99:64:6D:84:5E:3C:36
-Public key's random art:
-+--[ RSA 4096]----+
-|     ...+oo  o   |
-|      .+ *.o. E  |
-|      . *.=. = o |
-|       o ..=+ o  |
-|        S *+.+   |
-|         . o+    |
-|                 |
-|                 |
-|                 |
-+-----------------+
+	sha256:796fc4769c5663e24205c7c852c10c954a963cd5c15b0c7dc15a7389becb83a3
+	sha1:4f867404e334338460ec2505e306990f88178ef4
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/test_certs/server.cert.pem b/test/test_certs/server.cert.pem
index 32f9d38dd..df2893dc1 100644
--- a/test/test_certs/server.cert.pem
+++ b/test/test_certs/server.cert.pem
@@ -1,33 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIMWId0/ykDlohr/6M4MA0GCSqGSIb3DQEBCwUAMHQxFTAT
-BgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBGYWN0
-b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEgR8O2dGFs
-YW5kMQswCQYDVQQGEwJTRTAeFw0xNzAxMjQxNTM4MzlaFw0xODAxMjQxNTM4Mzla
-MDQxEjAQBgNVBAMTCWxvY2FsaG9zdDEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBG
-YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzhorPKY3cEsy
-vbKPvLn6aA3RArbRAgDMR+a4knyMWpQ8Nhb+xgLG/CUAO/fHhuyltw6vg7dx3+X+
-5jXMc7dfZf2YNGZTAn7jAlpTYPJMMO5m/VCOaiDdymU41YHYuV64pmKCrDv5EeHE
-Fi7A2LuCXfsn+jIV6iPs6ASbgCavVs8yVp2Sb4qrrXVlgBuOv5ety369mNi91Yot
-wZ8jbI1qAAe/nujrJwshg1qSTGTTseaZ0aAgimuoE+BsMB59VL9fVUEBH+dn7Qp/
-ff/AQpwjJK7hrCL9177bLMp23t6uyGkZlqEqlJ1+1ZTP4fl9ZOPmGhZE6laohcLx
-kI0VThH8jmoOp7nQWWkjzAqj28qSYfbXd975pw3ZdztqTt3vgVmvWLWJfOfXcJ4+
-+OUu9Boocsirxx53p4ONjz+a5BQ7RI0dDEx0yKmrzDTmuBiLqeZPxQBwtYRBIw0g
-sGCIp8jYGdlzBg39cETQ48BA0jwKdDO819+ZCh4ZlE707clz/GMR2v3DiGQTOac8
-vlagpmsWsmzNtGjLEZKKAlppx/OMoOKEi0LGA7Nos+Du6RzKYKEqkGwLW2gxj43A
-FPjr9Pvr+sbUectDLZz3DvwXkrsBvz7ySObS+1LZWMgt5mvT+NSx5oHSaok4g/fZ
-fBf2jHABuIHTkGiTlKaO3NjAwj3nEZkCAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
-BgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQS
-NmTiVjC6QIA8chtyQhUb4Se1wzAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
-8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEAj5V6MSHkRWAWUaEzMxVuyYMHhVqZenM2
-KBhaoM3Y9zbd5RHpYaypAKqr2joLGnNgIi9jsnCOOc+fdwh0lFd+faW5DvbPpIH/
-n1DlmnFv5mJ4uKuaRKhSY5NjPsL304riZKGjoi7fIuZgOv2lqXkvwB7e1b0/T4e4
-e9BjXuXLBkWSpPVo6TwdzJsQTRdr82uha+HxWs464Bo/Z/kgLaWTOQE3zpDXd5Yj
-oC4sMlbIHb86hDQJrJwLmSpy5J2hIKyoQDhDRagxzULkDgrHUEhC4Ri9e2hgeZbX
-/Na3AJw6EBnHP58yI6JpWX40B3HBGSJghzEUX+fijXbKPKLBjSD4rAj4kYNDkQim
-SaRzU1MfFYp8MXMHTQw9cVH9wiLt1/HHWSfVZK5oTxjXFBnmV5INvMoPbHFrydy0
-a9aiOb9usJwOjwgBwnQFruvsEOl5xltBWHSGRC4iA28o8jlOPzR0XTijsUczrO08
-s10rTzuFNFymumGcMCoHWVFtQdK3Z3TSC1mvPeh5o/pHFXAO25YZjbMcx/cWcZq0
-Fg5CdQpkOZB+UJE7QBdN+xg++AxPsHihSp3RJTgZaTgaPL7eQXNCDHp3l+5QTWTX
-39wPkU672ANEjG2+P2VfACVZQFmDXA3MNkLdPmGkJ78sohfkAP+qZEm6wAX7id9C
-3glO5S3cYm4=
+MIIErDCCAxSgAwIBAgIUST6fSLsrvb02VBiuWuquxYss2EEwDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDAzOVoXDTIwMDMw
+MjE1MDAzOVowNDESMBAGA1UEAxMJbG9jYWxob3N0MR4wHAYDVQQKDBVHw7Z0ZWJv
+cmcgQml0IEZhY3RvcnkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDU
+uNxq5UXntZ6pcgxMzAPLwGVt3Oc0ejY1arnQEnwp3XHx6A4MrBPUsj3CEfIXbvq2
+zQiugK9c2g0jzklMCZf60elZlT+DOJ2HDwyDp/UrnR0fIVyMTg7I4+JfkwHfcSK3
+8XV79/2HsZjWQZOAIskjpEwweiOxDe5EsZQ4ulc/DJVeBl/g1XAgL0WJ/U0LoEEU
+TGAgDo38ept7L1jQ9FauYFK9fwOUbG+JxBspEToqGdngGKPdn3mqbLnKpLueKsR8
+LV7U55fKS3SXCRFkVycxU6cEs8hnTQ/+yWtieXGI026SIy3VP2+tOH5bcTer/zAn
+OBodTtjz0w9/5CatLeHhLZU0VgrBcufBd+Y6xQWSsgJ3mE3+PXAFb8mMswMCkDat
+osfkvBUyluZB30VNwdVElwXvWvJ9LuGYPRQ99yRhmGbhugZYH1GsnpuMwrEO2kKd
+kpxU9HqZVd3WmTmXKb4DcnpTkW6WJXi2znDHPbt67rvcuBZu/Sa47V46lX7ru/EC
+AwEAAaN2MHQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNV
+HQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBTUePMQ7W5sMy76JEUIbxKw3p570DAfBgNV
+HSMEGDAWgBSmHbkkwFmCruE7I7TSI0SlD1hLiDANBgkqhkiG9w0BAQsFAAOCAYEA
+KKhMmytK6QomuY3zxpmS/wBEu+zkcmX/WvWAjBGlsMAeggQADCbAMQDu2zOMl9Gy
+qtPIZisEtMUZlO8IuI3tZc67VGNOXRvgR5wtnG+XdjryGlIlWbFrSTQsZB7hZWW/
+NI6ddilv4AZH0+SYYJ3Jn1aA30oDnnfaJTNAbeiNn4/P0syS7EbbItBzSS2qeVNX
+BZJeADBEzHHt5BgX6TCDP5zWaoKAZx+AXY0sw82M+bSzEZj4Xm5UJKn9o0IwwMDl
+IWtRohoVnylIjdr90pYtLlXmr8nu9qz8q+naHRTQpt+8qYRRoqaspen97jeeoAwZ
+AL8IZk1olk0rMFnvKXWLhZ2s3pvRtMWtY0LswTe3yb3W+eZQbZVP6itWpeq0XahV
+JNtaJ1i8N1hu4hg5K5FLdpb7+VUWiI/5aHZx0wpb9T6O/+dsT9BJa71lTZ+6g8wM
+lXtWK0Ucym9ULNhpQIAS8yxN1TzPLCB4P27Cm4eMt3VyT6CsSrHoOgerjBNWdBot
 -----END CERTIFICATE-----
diff --git a/test/test_certs/server.crl.pem b/test/test_certs/server.crl.pem
index c77e221b2..45214daaa 100644
--- a/test/test_certs/server.crl.pem
+++ b/test/test_certs/server.crl.pem
@@ -1,18 +1,16 @@
 -----BEGIN X509 CRL-----
-MIIC+zCB5AIBATANBgkqhkiG9w0BAQsFADB0MRUwEwYDVQQDEwxsb2NhbGhvc3Qg
+MIICgjCB6wIBATANBgkqhkiG9w0BAQsFADB0MRUwEwYDVQQDEwxsb2NhbGhvc3Qg
 Q0ExHjAcBgNVBAoMFUfDtnRlYm9yZyBCaXQgRmFjdG9yeTESMBAGA1UEBwwJR8O2
 dGVib3JnMRowGAYDVQQIDBFWw6RzdHJhIEfDtnRhbGFuZDELMAkGA1UEBhMCU0UX
-DTE3MDEyNDE1MzgzOVoXDTE4MDEyNDE1MzgzOVowAKA6MDgwHwYDVR0jBBgwFoAU
-izsG8YCsFbWGBtRTvF1NZ/AkC+AwFQYDVR0UBA4CDFiHdP8sH+YAO+X4pTANBgkq
-hkiG9w0BAQsFAAOCAgEAhbN7sB2e4R/K0E1drwX1O5Uz9B2XiEt8aHO+LKcuGbsp
-u6m+M0QwkxBPVdcG2bdpoN0Q5YZr/azRiiZz/FtmoxkFiLziP1nLm2uJ68QTrzk7
-61vqZcM+oOKhjPMkf2YORHBFbwVOm/JDobDFrHjbE7gCMQD93L1TW1mlYdoujSV9
-qpUHZkfwJ7tlaNtMMSaGrtRh8PCl+TpzMvTpG30LPZY/VHlHxrb3RQL05ReCoHsn
-r2OHvzEh3E4/YjKjXKIVVFvZh4K6ljdPWgOeizGcp+LxHySe/HKgVr86ia2xKEqw
-tbSGD1okRrDrRu0rmRhAYgLh8BoKeJXROOKcyogDc3ViMNGJwVBE62ZajL/HcjPs
-NSSeaNoYt+njRUpOWF2RFj4pLDZQc2VNWTDiJR+ljvlBlqdZ/Raia9J76tU1MuAs
-wDTTTZpOA7URMqgR0gUigOGB2kSsWthscTfc3viL7WXBuh7a+3lURwQf9t3TnZLH
-HTNQNBgQS84Gyt8y8hOx5dlnxBoRr1+BZT90VlqE9Ccllrins74uK/pGVNyIvKNg
-Fk6Wfo9iCanP4Usdg1qj8mVAye8Zga/q/6C9/mpQ9rSc6z/vcoQ0Fehd03msTHpz
-++7djv8LKLsCd5TyCFsSCgAFxZL0qR6cp7S8K6kH7XH216TAag5Q+Zdl2j26law=
+DTE5MDMwMzE1MDAzOVoXDTIwMDMwMjE1MDAzOVowAKBBMD8wHwYDVR0jBBgwFoAU
+ph25JMBZgq7hOyO00iNEpQ9YS4gwHAYDVR0UBBUCE1x77BcsJJFQetHU2LcziCwA
+o94wDQYJKoZIhvcNAQELBQADggGBAKKNqqlyd4GKI7ZplQ8uMhST9vJrxwY7G9b9
+MNtCeINDl+SdLjfSizzu0P0rGzZ1CQvPcnb0Rd0hBOSIpIDqUkI8qvVWY+I2v3qo
+mr8bqc7na7I8uqEnoZGm9HQVnCRpJJLQ/ux+2CblzcW9TkmsKHkgcZ4Mko2G+1yX
+TDT1dSd65cfD/zBVmxXgo6U4PUeSOMIujuiye7993rM6fjmYhRtDJz3678TasDSo
+4LlMv4zZecNkOfPktz2TLsbWDdylF4S3jqo771p+YPcyuikWV3P3EfdKVQsmmY7U
+YmO4SDwdCXs1zNdzOUl7SMbE3hF59pIVWohsNQjGbw4E/Madhp1cs9tZSaexd/ys
+X/9uVPrFH9pf3NDPiswbfeA6siKHQvJdp3MmAHSJyG+Z1KrYZX42PQkEDhAdi2nO
+XnXPUyt5tAH5Q60+BWAsT6EAdsMgtgLfsvTRizEnpIe54FmW3ZLqio1jsDphwSSc
+/ZNaJB9MCENJ8LaNMvOENn6SjI0GjQ==
 -----END X509 CRL-----
diff --git a/test/test_certs/server.key.pem b/test/test_certs/server.key.pem
index e7688538f..956a6f924 100644
--- a/test/test_certs/server.key.pem
+++ b/test/test_certs/server.key.pem
@@ -1,240 +1,182 @@
 Public Key Info:
 	Public Key Algorithm: RSA
-	Key Security Level: High (4096 bits)
+	Key Security Level: High (3072 bits)
 
 modulus:
-	00:ce:1a:2b:3c:a6:37:70:4b:32:bd:b2:8f:bc:b9:fa
-	68:0d:d1:02:b6:d1:02:00:cc:47:e6:b8:92:7c:8c:5a
-	94:3c:36:16:fe:c6:02:c6:fc:25:00:3b:f7:c7:86:ec
-	a5:b7:0e:af:83:b7:71:df:e5:fe:e6:35:cc:73:b7:5f
-	65:fd:98:34:66:53:02:7e:e3:02:5a:53:60:f2:4c:30
-	ee:66:fd:50:8e:6a:20:dd:ca:65:38:d5:81:d8:b9:5e
-	b8:a6:62:82:ac:3b:f9:11:e1:c4:16:2e:c0:d8:bb:82
-	5d:fb:27:fa:32:15:ea:23:ec:e8:04:9b:80:26:af:56
-	cf:32:56:9d:92:6f:8a:ab:ad:75:65:80:1b:8e:bf:97
-	ad:cb:7e:bd:98:d8:bd:d5:8a:2d:c1:9f:23:6c:8d:6a
-	00:07:bf:9e:e8:eb:27:0b:21:83:5a:92:4c:64:d3:b1
-	e6:99:d1:a0:20:8a:6b:a8:13:e0:6c:30:1e:7d:54:bf
-	5f:55:41:01:1f:e7:67:ed:0a:7f:7d:ff:c0:42:9c:23
-	24:ae:e1:ac:22:fd:d7:be:db:2c:ca:76:de:de:ae:c8
-	69:19:96:a1:2a:94:9d:7e:d5:94:cf:e1:f9:7d:64:e3
-	e6:1a:16:44:ea:56:a8:85:c2:f1:90:8d:15:4e:11:fc
-	8e:6a:0e:a7:b9:d0:59:69:23:cc:0a:a3:db:ca:92:61
-	f6:d7:77:de:f9:a7:0d:d9:77:3b:6a:4e:dd:ef:81:59
-	af:58:b5:89:7c:e7:d7:70:9e:3e:f8:e5:2e:f4:1a:28
-	72:c8:ab:c7:1e:77:a7:83:8d:8f:3f:9a:e4:14:3b:44
-	8d:1d:0c:4c:74:c8:a9:ab:cc:34:e6:b8:18:8b:a9:e6
-	4f:c5:00:70:b5:84:41:23:0d:20:b0:60:88:a7:c8:d8
-	19:d9:73:06:0d:fd:70:44:d0:e3:c0:40:d2:3c:0a:74
-	33:bc:d7:df:99:0a:1e:19:94:4e:f4:ed:c9:73:fc:63
-	11:da:fd:c3:88:64:13:39:a7:3c:be:56:a0:a6:6b:16
-	b2:6c:cd:b4:68:cb:11:92:8a:02:5a:69:c7:f3:8c:a0
-	e2:84:8b:42:c6:03:b3:68:b3:e0:ee:e9:1c:ca:60:a1
-	2a:90:6c:0b:5b:68:31:8f:8d:c0:14:f8:eb:f4:fb:eb
-	fa:c6:d4:79:cb:43:2d:9c:f7:0e:fc:17:92:bb:01:bf
-	3e:f2:48:e6:d2:fb:52:d9:58:c8:2d:e6:6b:d3:f8:d4
-	b1:e6:81:d2:6a:89:38:83:f7:d9:7c:17:f6:8c:70:01
-	b8:81:d3:90:68:93:94:a6:8e:dc:d8:c0:c2:3d:e7:11
-	99:
+	00:d4:b8:dc:6a:e5:45:e7:b5:9e:a9:72:0c:4c:cc:03
+	cb:c0:65:6d:dc:e7:34:7a:36:35:6a:b9:d0:12:7c:29
+	dd:71:f1:e8:0e:0c:ac:13:d4:b2:3d:c2:11:f2:17:6e
+	fa:b6:cd:08:ae:80:af:5c:da:0d:23:ce:49:4c:09:97
+	fa:d1:e9:59:95:3f:83:38:9d:87:0f:0c:83:a7:f5:2b
+	9d:1d:1f:21:5c:8c:4e:0e:c8:e3:e2:5f:93:01:df:71
+	22:b7:f1:75:7b:f7:fd:87:b1:98:d6:41:93:80:22:c9
+	23:a4:4c:30:7a:23:b1:0d:ee:44:b1:94:38:ba:57:3f
+	0c:95:5e:06:5f:e0:d5:70:20:2f:45:89:fd:4d:0b:a0
+	41:14:4c:60:20:0e:8d:fc:7a:9b:7b:2f:58:d0:f4:56
+	ae:60:52:bd:7f:03:94:6c:6f:89:c4:1b:29:11:3a:2a
+	19:d9:e0:18:a3:dd:9f:79:aa:6c:b9:ca:a4:bb:9e:2a
+	c4:7c:2d:5e:d4:e7:97:ca:4b:74:97:09:11:64:57:27
+	31:53:a7:04:b3:c8:67:4d:0f:fe:c9:6b:62:79:71:88
+	d3:6e:92:23:2d:d5:3f:6f:ad:38:7e:5b:71:37:ab:ff
+	30:27:38:1a:1d:4e:d8:f3:d3:0f:7f:e4:26:ad:2d:e1
+	e1:2d:95:34:56:0a:c1:72:e7:c1:77:e6:3a:c5:05:92
+	b2:02:77:98:4d:fe:3d:70:05:6f:c9:8c:b3:03:02:90
+	36:ad:a2:c7:e4:bc:15:32:96:e6:41:df:45:4d:c1:d5
+	44:97:05:ef:5a:f2:7d:2e:e1:98:3d:14:3d:f7:24:61
+	98:66:e1:ba:06:58:1f:51:ac:9e:9b:8c:c2:b1:0e:da
+	42:9d:92:9c:54:f4:7a:99:55:dd:d6:99:39:97:29:be
+	03:72:7a:53:91:6e:96:25:78:b6:ce:70:c7:3d:bb:7a
+	ee:bb:dc:b8:16:6e:fd:26:b8:ed:5e:3a:95:7e:eb:bb
+	f1:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	35:c7:94:52:ae:18:b7:3f:98:0c:f1:e4:19:dd:f9:9e
-	5f:44:93:cd:ba:7a:28:55:25:c9:e9:8d:a7:dc:43:e2
-	7c:57:ac:e6:6c:2a:db:5b:7e:18:32:8d:b4:4d:db:c0
-	5e:25:01:dd:7f:e7:c2:01:d4:e2:a3:55:27:38:c9:36
-	e6:d6:69:8d:ed:c9:2f:ec:f2:77:39:5c:89:bd:21:e3
-	83:92:44:0b:f5:5b:80:24:49:07:6c:87:06:53:50:89
-	24:39:7e:59:8d:08:b0:06:d6:50:e7:80:40:cd:a4:f5
-	fb:0c:72:77:d1:4a:18:77:c0:0f:3b:b8:53:df:da:ea
-	13:fb:90:00:5f:04:b3:49:7e:e1:ae:6d:02:71:b2:15
-	92:8d:0e:d2:2c:74:54:9d:4a:d5:44:3e:4d:1c:15:75
-	ce:8f:cc:da:80:49:de:d8:ae:da:da:63:fe:c7:52:9b
-	96:b5:a1:6f:fc:4e:9d:3c:1a:8a:80:7f:e4:3a:51:f9
-	81:58:85:ff:9a:35:7f:20:07:26:8c:ae:d1:72:c6:a4
-	d2:d1:66:46:77:30:6d:c7:e9:47:27:7f:7e:61:e3:3f
-	b1:82:a1:a9:67:c0:35:11:6c:54:56:65:f0:b7:7b:d4
-	56:28:4b:71:4e:8d:88:e1:d6:80:de:9f:99:90:8d:f2
-	ef:07:ae:db:65:fb:70:90:89:22:c6:de:6a:06:83:01
-	16:51:a0:bb:3b:d2:ed:98:cc:62:24:df:37:e0:98:06
-	b3:88:1d:b9:c6:1c:d5:a7:18:e5:b7:3b:34:0f:63:90
-	f1:ab:0b:3e:e6:b4:9a:54:69:41:f6:c5:ad:03:44:b2
-	48:48:66:55:a8:4b:0e:bb:43:48:53:a7:07:23:a6:06
-	64:46:b5:e3:9d:9b:b2:de:35:67:cd:e6:e1:39:0f:0d
-	8b:c5:8b:68:bb:38:86:b7:a0:81:f4:b0:89:fa:6d:2d
-	56:80:77:66:6d:32:02:1f:93:82:47:01:37:35:95:6d
-	55:87:9c:75:cd:9a:f9:16:f4:09:3b:a8:60:47:5e:34
-	7f:6b:58:99:c8:db:fb:60:f5:dd:54:9c:27:42:5b:a7
-	4e:27:28:92:af:c6:76:56:c5:0f:db:73:1c:e0:06:bd
-	4a:4f:75:37:19:39:9a:a7:7f:f2:8c:18:a4:25:77:c4
-	e9:4a:3a:9d:3a:83:67:2b:bf:bd:c5:4d:bb:37:68:8e
-	6f:a9:0d:67:d4:87:e9:59:02:61:60:e1:3f:b0:81:81
-	89:ba:29:4a:f0:37:4b:42:95:90:99:fd:7d:a9:30:31
-	33:ba:dc:86:6b:ce:29:98:8b:37:f2:72:b1:90:79:a5
-	
+	00:a3:54:8d:69:46:41:36:78:2d:2a:cd:76:c4:40:a1
+	69:80:80:60:aa:8c:9b:ae:7a:90:e9:31:62:a1:ce:d4
+	16:43:b7:0a:06:3f:94:a0:65:5f:b6:2b:9c:bb:d5:62
+	50:fe:aa:cf:4f:ad:5e:f8:5c:34:5a:99:b9:8d:b8:90
+	08:f5:c3:c6:14:e2:7f:4e:a9:25:5a:58:b1:7d:f4:b1
+	58:21:54:15:b9:89:c1:25:78:fa:00:86:81:c9:9e:56
+	af:e1:ac:74:18:8b:81:0e:ff:3d:ea:c4:cf:0c:43:a9
+	4c:c4:89:fb:6e:cc:98:d5:a9:6c:f5:2c:69:a2:29:fb
+	2f:1e:40:e3:84:1a:8d:c7:59:ee:f1:e5:d1:a7:a6:95
+	95:62:90:81:fe:1b:2e:c9:fd:1a:04:ab:85:f6:6a:a5
+	63:9e:71:e9:2d:ed:01:b9:80:aa:b6:f8:63:bf:e6:79
+	0d:00:4d:20:9e:31:3c:91:9e:59:7d:0e:2b:0e:23:93
+	91:82:8b:2a:5c:34:51:a0:e0:83:5a:6b:5b:32:ac:c9
+	c0:4a:c6:1c:86:29:01:f8:93:99:01:93:7c:0c:4b:88
+	0e:bf:96:a5:40:d0:19:b3:e7:18:80:71:f5:db:72:3d
+	1b:b6:b0:2d:a4:d9:7c:e0:53:fa:a8:a5:e0:12:a1:07
+	10:21:82:15:60:b6:18:44:12:4a:16:e5:db:80:43:78
+	aa:87:eb:e0:c7:cb:dc:c5:53:8d:12:9d:ac:e3:8e:33
+	f1:3a:6f:ef:f2:bc:b9:b5:ad:be:f5:fb:93:83:c7:4d
+	3e:e2:c6:64:d9:a1:78:c9:54:d0:84:70:c3:f9:c7:4f
+	23:e0:aa:05:f4:c1:e5:cf:4a:bb:5b:bb:4b:a0:92:db
+	b1:f5:12:74:a1:7f:0a:86:f1:d0:46:11:4b:33:92:81
+	be:88:dc:44:e2:84:e3:c2:a7:f6:d8:45:cb:cd:cd:68
+	d7:e8:dd:c1:da:2b:07:d2:19:43:3a:23:af:ab:a3:0c
+	41:
 
 prime1:
-	00:fc:59:48:15:f7:ed:1a:7d:0b:ba:2d:4e:b2:bd:75
-	10:a4:f3:68:2b:db:18:6a:b2:ff:93:c8:0d:c4:4c:55
-	99:58:02:ba:60:43:81:ee:09:14:e5:5a:38:91:37:6d
-	f6:b4:4b:b3:5e:be:9e:3a:43:27:a7:06:06:a1:ae:dd
-	36:2f:8c:b1:17:1d:b5:55:bc:1a:05:cc:35:d2:03:25
-	18:97:f7:84:a4:2b:18:f9:50:67:ee:3f:c9:8c:d1:35
-	95:0e:9d:28:0b:f5:9d:00:cd:e5:e9:43:3f:8a:90:59
-	c1:ae:a2:74:60:2b:c8:9c:50:9e:f8:5f:f2:87:13:36
-	dd:8e:b3:d9:52:4c:26:40:7f:b6:52:81:9a:29:90:af
-	85:ba:4a:9c:e6:38:4e:7d:9e:05:2e:e4:af:b1:a4:51
-	5d:fe:1f:ce:aa:b2:e2:b8:74:9f:ac:86:c7:ab:a9:5e
-	5b:8a:33:49:c6:14:f1:10:0d:d6:02:55:6a:6a:57:92
-	5c:21:b3:c8:cf:b2:49:78:cb:23:47:d3:f5:5a:c9:ad
-	2c:4d:18:9d:c4:2b:84:e0:91:d9:8b:99:ce:cd:02:cb
-	b0:c2:db:02:f5:23:a2:e7:d4:93:ed:40:72:eb:29:4b
-	71:85:46:03:d3:f2:da:d3:f1:3f:89:b0:cf:7a:29:2b
-	5f:
+	00:d7:94:21:57:d8:54:46:4d:31:7c:0b:87:40:42:fd
+	a1:23:22:15:a6:42:29:4f:12:9c:f2:19:9b:62:a1:f3
+	33:e3:da:59:67:eb:96:36:c5:93:6f:38:4a:35:96:05
+	ef:e9:f7:10:c4:64:73:20:75:cd:86:c0:f0:46:ff:7b
+	3c:b6:e4:cf:83:4b:1a:06:da:98:3a:ec:7f:01:55:78
+	f4:86:ac:46:e7:f7:4d:8a:f0:bc:3f:b4:7e:a9:e8:46
+	1d:fc:77:83:90:e5:ea:0a:00:88:47:c2:c1:c7:6c:74
+	28:a9:c8:77:dc:73:40:23:af:a7:da:e4:91:cc:5e:fd
+	ec:0e:19:45:98:6c:e9:22:44:52:53:77:ec:00:de:24
+	61:1c:e2:fb:27:b7:bd:12:3d:ec:b8:15:91:38:d3:16
+	cf:59:e3:1f:05:25:15:2f:f1:63:0c:48:17:d7:4a:41
+	00:e4:ab:c7:80:c7:e8:a2:8e:4c:c4:ff:ff:27:3e:80
+	d7:
 
 prime2:
-	00:d1:15:96:34:3b:7b:31:af:5d:07:83:c8:1b:20:50
-	33:51:3d:6a:8f:83:80:86:cc:1b:b2:d1:d2:63:58:d3
-	4b:6f:d6:6e:fa:18:06:f3:9f:0d:1c:c6:fe:2e:64:72
-	b6:cd:8d:8e:93:e0:71:c6:8b:20:2b:49:32:99:70:e8
-	89:51:11:63:ad:53:ff:a7:2e:0f:3c:f8:e3:a0:63:16
-	a2:12:44:65:1f:d4:e8:81:03:54:9f:e3:1e:c6:a8:68
-	fa:fb:70:f7:ad:59:f9:e3:8e:f4:e4:e1:2e:c6:35:f5
-	43:8c:83:34:2d:f2:4f:ee:43:68:95:16:e9:51:f9:bc
-	1c:6b:f3:6b:46:83:b2:7d:90:6a:cc:8a:cb:a8:31:dd
-	64:cf:60:58:af:dd:82:9a:55:95:36:fa:cf:89:24:38
-	ad:bd:75:02:28:83:8f:95:2d:95:9e:c5:44:d7:c5:80
-	cb:53:74:82:12:9d:d6:1b:df:9f:6e:a8:6d:a4:99:1f
-	b9:b9:83:bb:c8:b9:f1:b1:9a:d1:a6:16:43:71:a8:27
-	4d:6d:c3:46:10:cd:be:1b:03:af:1c:67:9c:13:58:47
-	93:f2:07:eb:73:65:f0:b1:cd:10:11:5b:20:c6:2a:b4
-	9f:f0:52:53:0f:e2:8a:2a:e5:c1:d3:f8:4d:1f:66:5e
-	07:
+	00:fc:9b:9d:d3:d6:75:4e:2d:73:b9:f8:23:81:ba:7a
+	91:f5:10:bd:7f:f1:7c:17:70:78:ee:9e:0f:89:0e:7b
+	d9:4b:d9:b4:fa:78:23:23:3f:a7:c9:d0:41:8e:b3:c3
+	4b:35:75:ec:81:a9:06:89:f0:20:89:0c:60:5b:98:01
+	f2:27:f7:03:5f:d6:13:0f:b0:f2:00:bd:91:3e:32:dd
+	06:d2:35:17:aa:fd:3a:34:c4:d6:2e:dd:fc:80:86:59
+	67:01:95:d8:c9:26:48:88:07:d0:52:dd:37:e8:86:f2
+	36:4c:c6:95:db:18:d3:7e:e0:15:35:d1:34:f1:fa:7f
+	5f:96:a8:2f:e5:c7:96:26:0b:34:66:15:73:cf:36:05
+	38:6e:d6:53:80:7d:64:33:d7:46:38:f6:04:53:1d:f8
+	ec:3f:86:9c:80:30:b9:fb:3f:90:f8:24:c1:dc:04:5c
+	a8:ce:35:5c:b9:3d:69:ff:f8:0d:2a:e5:e1:e2:5d:e8
+	77:
 
 coefficient:
-	0b:81:01:5e:44:50:b1:e2:3f:99:45:3a:6f:97:ae:f9
-	b3:e9:fd:bd:d1:3e:f0:82:30:69:d7:99:89:fa:75:e8
-	e9:64:f2:76:6e:72:3d:81:c1:bf:5a:21:63:06:71:e3
-	28:92:bd:58:58:35:b5:d3:65:5a:79:89:01:bd:09:70
-	2d:b8:89:c3:76:25:f0:41:d7:72:08:0b:59:e8:8f:4e
-	22:fd:e9:97:a3:4a:13:40:de:1c:0f:fc:3f:87:a0:4f
-	ba:6e:41:cb:e7:df:04:67:90:14:3f:dd:18:33:01:6d
-	3b:a8:ae:7c:5a:e2:23:e1:9c:2b:a0:d6:8f:d1:8b:8c
-	c8:ca:39:17:11:82:65:d3:a2:c0:05:d3:bd:c5:b0:17
-	ea:62:a5:1a:fe:3e:c8:f0:fb:c6:5e:6b:60:50:a7:34
-	f1:ff:a9:70:79:16:ce:9e:c0:15:34:b3:cc:e6:22:1b
-	02:bb:b5:59:2a:b1:b8:82:f5:4d:b1:6b:a1:27:a9:1d
-	4a:22:44:98:08:c3:7e:34:7a:01:56:27:29:20:80:10
-	27:10:b8:d1:ab:d1:d6:5f:69:80:68:27:74:96:41:7f
-	c1:91:3a:b1:25:c0:39:e9:58:f6:4a:36:3f:73:c9:ab
-	39:7b:02:72:76:7a:2f:74:5a:63:93:b0:b2:52:d8:2c
-	
+	00:bd:53:27:e5:66:05:7e:58:42:63:76:de:18:00:18
+	2f:ef:e0:61:47:e6:b4:28:11:50:3e:84:63:3b:fa:ec
+	b1:0f:b1:a0:9a:ea:3a:70:7a:40:b2:55:cf:fa:3f:b8
+	95:eb:22:01:b7:27:37:43:bf:94:98:bc:b0:60:c2:85
+	93:ac:1b:3a:3b:47:51:f4:98:93:12:8a:88:a4:6c:30
+	72:e9:b0:0d:14:7b:c0:b3:94:1c:7e:3d:b1:85:67:de
+	80:2f:c6:aa:17:2a:2f:a5:d5:ec:f6:a0:13:d9:b1:73
+	a7:a1:91:10:50:61:26:4b:fe:82:6a:f3:53:5f:5a:7f
+	92:d0:dc:cb:c8:21:b3:60:01:6e:49:70:57:3c:03:9a
+	f2:fd:64:a9:71:cc:22:4c:0d:8d:f5:e9:6e:85:92:54
+	49:e7:bc:c3:c5:51:ff:35:62:f4:f3:8f:40:e3:a0:dc
+	37:4f:ec:9c:ae:af:da:60:c7:05:7b:23:ec:8f:be:93
+	3f:
 
 exp1:
-	00:af:90:01:f9:de:ba:23:b2:99:a5:16:7e:69:16:2c
-	4a:bf:27:e4:f2:96:04:7f:bf:36:d6:7e:d9:2d:17:9a
-	7a:0b:e4:21:fc:75:1b:01:1b:6a:61:42:8a:96:65:44
-	e8:dd:78:c9:3b:02:4d:1c:e5:b9:c1:97:0c:a8:11:fb
-	2f:06:97:d0:60:ef:b7:48:05:8c:e9:39:b0:bc:02:9a
-	1d:69:24:b8:30:6b:17:7d:e4:b5:d9:e8:a0:f5:8a:5b
-	c7:ef:19:e1:51:a8:b8:69:65:d6:2d:9a:2e:ab:dd:4f
-	c4:d3:15:8c:f7:97:9e:83:3a:07:cf:6f:19:51:66:49
-	c6:8c:d0:8d:42:97:5e:09:83:90:ba:08:16:d4:12:28
-	3b:56:67:30:8f:6e:df:14:c0:0a:85:1c:6f:2b:9c:d1
-	4b:1e:50:cc:bc:af:a5:d2:84:b8:ce:14:1a:f8:4f:e6
-	28:b3:96:89:1d:f9:55:d9:40:77:02:ba:a0:45:89:d5
-	76:a9:af:e5:e6:b1:f8:31:c4:ca:2f:df:c4:14:3c:b9
-	71:57:d5:e7:75:22:7d:d8:ab:3f:f9:c2:b1:40:aa:50
-	42:12:de:c2:49:00:59:07:07:3b:3f:55:96:5e:0b:25
-	c4:bd:de:ff:2c:c7:09:fd:68:1b:37:55:3e:93:93:ee
-	eb:
+	00:92:da:51:ac:69:ad:5f:06:8e:c3:15:87:58:fb:49
+	93:4f:3f:94:c7:e1:22:0a:bf:7f:32:5c:c7:40:f5:59
+	9a:eb:88:7e:87:10:31:0f:b6:9f:ac:90:07:dd:61:09
+	42:59:7a:f8:6d:10:90:6c:78:53:3d:8c:89:21:94:3f
+	fb:28:0b:ce:60:7d:f4:88:de:b7:fc:cb:c5:e8:be:b4
+	da:be:32:f5:4a:67:68:e7:50:fe:ab:d6:e4:c2:11:7c
+	52:48:fd:91:1e:4f:c0:92:77:b2:5e:50:09:79:34:24
+	1c:df:2b:b4:9a:f3:d7:a9:77:ab:3c:ad:9f:b4:3c:b1
+	74:f0:55:be:d7:0a:b9:f5:a1:dd:03:07:1a:39:ad:19
+	d3:1d:be:71:a0:a8:c5:9f:7b:97:99:fe:f7:22:62:89
+	93:4e:84:2d:49:6f:ed:72:ef:58:ad:b1:1e:ac:85:e4
+	aa:1b:1b:f9:97:7c:96:b8:c5:7e:fe:63:f5:08:62:c7
+	99:
 
 exp2:
-	1d:39:2f:2d:4d:c3:02:46:c8:71:ec:71:63:99:38:9c
-	73:96:69:f6:75:22:d9:b4:5d:8a:b8:d8:f7:19:cb:2e
-	98:0b:18:a7:cc:03:ec:b9:26:54:07:5c:2f:8f:ca:98
-	d2:52:1e:c3:7c:73:6a:94:b7:82:55:50:c5:31:8a:ce
-	e6:8d:cf:a8:c2:3c:d1:59:16:b8:26:f1:69:d1:6f:b0
-	67:6d:37:d5:23:24:fc:23:43:08:b5:ed:ef:46:4a:a6
-	09:ce:d8:4f:5a:6c:1a:ea:38:40:65:58:ec:4b:4e:64
-	8a:97:2c:0b:df:fa:5c:0a:ff:eb:16:b0:b5:cc:7a:06
-	5e:f0:3e:e6:34:32:16:6a:c1:02:a5:c3:a1:56:96:e3
-	28:39:07:2c:4d:81:9b:a0:aa:a2:6c:9b:e5:47:32:c4
-	d5:de:2c:d7:0c:cc:5c:c5:6a:4c:2e:b6:58:92:3a:56
-	30:eb:ef:e2:3a:3d:5a:d7:fe:a8:b0:d1:e2:57:a4:9f
-	88:d6:68:c0:bd:7c:92:9e:58:ff:25:cd:77:6d:51:50
-	f9:2e:79:f4:8f:4d:2a:e9:70:e8:3f:73:09:21:25:a0
-	00:0c:2b:54:8d:c2:fe:96:f2:cf:fa:34:b2:7d:f5:91
-	05:3d:fc:6e:13:f3:cb:db:21:24:47:68:40:23:46:b1
-	
+	00:96:0d:92:99:4d:a1:6d:09:0e:df:7f:89:07:fc:cf
+	e6:77:de:b3:d2:96:8e:12:16:5b:9f:d3:00:83:77:b9
+	16:01:3a:97:88:d9:68:75:fd:d0:1b:cf:bb:c1:9b:02
+	fd:60:0a:66:ad:36:cc:8d:8f:b8:a3:f0:58:24:d0:8d
+	07:5d:ba:1b:a5:08:33:56:74:d3:ac:a0:ee:f0:35:a2
+	99:f4:b0:59:18:d7:47:86:25:0e:dd:d4:3b:b3:d5:1a
+	b2:57:7c:bd:c3:ef:1b:d2:c2:61:7b:77:b1:48:4d:31
+	00:14:67:3a:89:65:9b:ec:98:0b:c1:66:3e:bf:27:00
+	16:b6:15:be:2e:0e:7b:20:aa:33:3c:18:ae:2c:7e:78
+	67:67:5f:a5:46:84:35:cb:9d:ab:37:16:dc:c6:ca:dd
+	1c:e9:37:7b:2b:a2:c6:37:7b:31:10:56:35:5a:0e:b5
+	44:09:0a:25:c4:5b:b8:e5:b6:61:8c:03:f6:44:53:68
+	4d:
 
 
+Public Key PIN:
+	pin-sha256:gzLO/Ev3MREDhGr+zFqlzXKZ3PJAsr3C+CojU0h77N8=
 Public Key ID:
-	sha256:01:06:99:B3:BD:7B:A9:83:6F:D4:D0:AF:49:52:0D:19:23:66:EC:EB:7E:8C:A7:E0:4A:C7:DC:A1:C0:98:9B:76
-	sha1:12:36:64:E2:56:30:BA:40:80:3C:72:1B:72:42:15:1B:E1:27:B5:C3
-Public key's random art:
-+--[ RSA 4096]----+
-|*o.=*o+          |
-|*o=o=*.          |
-|o=o*oE+          |
-| ..oo..o         |
-|  .   . S        |
-|       .         |
-|                 |
-|                 |
-|                 |
-+-----------------+
+	sha256:8332cefc4bf7311103846afecc5aa5cd7299dcf240b2bdc2f82a2353487becdf
+	sha1:d478f310ed6e6c332efa2445086f12b0de9e7bd0
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/test_certs/test_client.cert.pem b/test/test_certs/test_client.cert.pem
index 27838d74f..f1d8ad88f 100644
--- a/test/test_certs/test_client.cert.pem
+++ b/test/test_certs/test_client.cert.pem
@@ -1,33 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIMWId1Agdxxug/oIa6MA0GCSqGSIb3DQEBCwUAMHQxFTAT
-BgNVBAMTDGxvY2FsaG9zdCBDQTEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBGYWN0
-b3J5MRIwEAYDVQQHDAlHw7Z0ZWJvcmcxGjAYBgNVBAgMEVbDpHN0cmEgR8O2dGFs
-YW5kMQswCQYDVQQGEwJTRTAeFw0xNzAxMjQxNTM4NDJaFw0xODAxMjQxNTM4NDJa
-MDQxEjAQBgNVBAMTCWxvY2FsaG9zdDEeMBwGA1UECgwVR8O2dGVib3JnIEJpdCBG
-YWN0b3J5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApOz4wcdTiEdj
-O192j39Q1EhzLq9qqZghpWUxQHSV0/Fpm7kUj/wtK1xky130+H2ab+k/Sp8jjda0
-TVV7es7yXYQM2iYEDIc1i3oCtygFkISFpzNG5SGLV2GANovwYfgPhvpnGo9inAVJ
-lXv2DJouLBxsL3c86dA3auMjcJ8FNgfvSJ7So7vEdoZQo1QGKpToUUVPD9e+K/y+
-j4WI8swP8lJaZ/EIDK74ESAyyk7R+jYjItF4GrwR7RM7CxWHOENwO/3pxbiJF+oW
-XOt+2jsTTKyL1FZJHI2beBcPvQql9baBY/q0koT7cS8PJiGI/D6TqXQ25XkbTG/l
-dmzJ7K5toLJ+7iUcdt+q8sF0owS4hR/3VUXM24DgBduzvmihD9G0k0wDNmjHu3te
-8tGQogvMJRTUtiw1AEO2DiUUZqd6p/pFGrJfRyxU6nHBvr1ADeClBwcQB0hH2mVD
-59affexzBsUwhouk3v0fTgNQpX2/qfeKwVbnV4bEN1fd+xSwzdmSelLa6rE+pYER
-JOl+zdLSq0AtZE2GTp2A60jk+AurALcQqhdNU9YV8tCVhFTidO49GXqTmuAJAzvu
-SAoIqCFuU1TWeiNQCHI3clzxUAZcqDBxTZUvbkP3QK7v0Ib5c7HiRp5kmO4CQuUg
-y8mT1RZhaMp9qIy3HKUNEBdYwhj45wECAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT
-BgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQ3
-DVC7k5DA5XjW4dD+mWRthF48NjAfBgNVHSMEGDAWgBSLOwbxgKwVtYYG1FO8XU1n
-8CQL4DANBgkqhkiG9w0BAQsFAAOCAgEASw6rojEtxVNLmqhuCGRXpBkeJcEC3hgd
-usOmw3QFwMRwG0JkQuDTZobs20bWCSJzCnGcou6mvdOhjtaErZ/KUA2uAr9YvlmO
-+F7mpXlGjfETm3Ta8JzvTtqgCPjQmz+Wn7nnFmwl9MLOOh//NXQ1KJd/ixWtpaLG
-GhY3zduNczLT7O+qganFneostaZFpa/BL3PVXoI669zp7GmzJYSjuxQIyAMP/hKJ
-aFfTNIv9WhPzXrzEviLspJ7OwfWW/S46WZWcXzauXiYS5y21rfFSBSAo1J3oRV95
-qi2IMM4PVpwQISMPwdJe3f2+Gc6qn3TaHFrnSv8OuRNOdvuqV9MLn9uxovgTTyw4
-j1sb7kO6OoLCqrbdZ+lTHy48jahpV3q+Vcep8WA+fC42sV/lfMuuS3EaQTJIfu89
-+R+pFQPco60risM8Gy/k0QkwxVwoxsq5xM+SaGyHpEazSasX/qJBj+VH97a9rlje
-fzPpmApWRtZNMNx4qSx7ZEFVtSynM7vDWsWsB9x+OYdObzl4bbZUZ3MSCY0/smGO
-PIbNPmqhlr8bRuJGGlXuftOGLPnssWrZSbQhMzBJQWGiKsHQF+AsdQzaDrtgwuWM
-6REkiXd/cs0QXZh9P2ZzzIqKuIwwOazppJ5mdenWx/0X3Ex7PfdiGZPL8f8DEE7/
-lHXLHvTvWag=
+MIIErDCCAxSgAwIBAgIUWd061h82xfHsPXSBWRpIO5RuJmIwDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDE0OVoXDTIwMDMw
+MjE1MDE0OVowNDESMBAGA1UEAxMJbG9jYWxob3N0MR4wHAYDVQQKDBVHw7Z0ZWJv
+cmcgQml0IEZhY3RvcnkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDR
+olYEeoMRpM6sNBmGWbnVvrPNZ9RMct2sPiN8PRp0Bl6I1EYSZMG1GdZz/6IXIEhJ
+0q1mRae8+M44oDVCVtEfkLGNfCVAAqQWpEN7iwcvdE6Jy7YspqekdXDRk4zEbp0T
+e74z7qEKjaV2j/yLe/3Ae9jjwdbmPJaByw+ucHoTwGb2qRKrfSocfbqvMfgsFBIs
+B9AW9fxKqRCfghjoV5ADpdgwhkA8ewY8T09h5WG4//pOtdUUy7Cq3wY0j8+qSrro
+sVn5gRbnCE/BEzsl0l767l4a1zG43KUfcjlWgyToTssvcwxNTV+f5uaRnDb3UgFb
+awTO5rwZ8ZHjvUHhJwNBo0tEJ3xqIJ5DqSrCVDioT1+krPZORvoQujoumkR8MXpa
+ynTnF+EbGSuyVsEraYtU+2LoszT3BSNaZZDNEF0+ejNMOUtAL/LbfQ0RW20Odl72
+HFe//aC5mj97TU7o8MBpSUXaazUkYeTskZVz/hFhw0Q/7Yz3JjLpEbOzUgM402EC
+AwEAAaN2MHQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAPBgNV
+HQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBRz3ZIKLmZzYk8nB5x2KO6YYtLQEzAfBgNV
+HSMEGDAWgBSmHbkkwFmCruE7I7TSI0SlD1hLiDANBgkqhkiG9w0BAQsFAAOCAYEA
+MnbqyMM+8pxW4DBSp+4kpRaRZc6zjH7cp1ThBanApstEdXzMxZqTjCUT2KT6HhTS
+q3qR3f537fF+kafVeietMg4cWV2a73rMMMqlOURldFuXsAy4DPE+4zUR2r+sj5My
+GnwToFa90oOW6u9HsevsdAvxvusD3rKZuxQvO3HzWdCDfY5u8E40Hs+eIbDJK+sv
+wf5j/j66PikWgJxrHRpKrTzSlAl/7FsFlOOIMb4J/XfWUlx+7zzTyfVRbnIt6DRg
+DjQUXBxMbuoZpuMoIuLApL7GWz1VcIR6lN9Hwl3Qlmhv2U1bKPLHoMZAM+cn1Txg
+/Wv2n4yK8q0CbzKoL0kqYQVx55ZHqZeNXE9sfbIh4KiwaxOwEwU3mUUclYGXhbUF
+3i+HxbubgmoSQbLaoV6t+5ES021BQxLJNphMtTEwMNXFeAU8iOEMRytny4ZmcmeU
+A3c5wd1zmmN4p8HO1wXttEhRNQ6S7aBX8NZSkQBZNAwvYN5mp4C7q83zwzCQwfQ+
 -----END CERTIFICATE-----
diff --git a/test/test_certs/test_client.key.pem b/test/test_certs/test_client.key.pem
index 6bcd83661..99b351f23 100644
--- a/test/test_certs/test_client.key.pem
+++ b/test/test_certs/test_client.key.pem
@@ -1,240 +1,182 @@
 Public Key Info:
 	Public Key Algorithm: RSA
-	Key Security Level: High (4096 bits)
+	Key Security Level: High (3072 bits)
 
 modulus:
-	00:a4:ec:f8:c1:c7:53:88:47:63:3b:5f:76:8f:7f:50
-	d4:48:73:2e:af:6a:a9:98:21:a5:65:31:40:74:95:d3
-	f1:69:9b:b9:14:8f:fc:2d:2b:5c:64:cb:5d:f4:f8:7d
-	9a:6f:e9:3f:4a:9f:23:8d:d6:b4:4d:55:7b:7a:ce:f2
-	5d:84:0c:da:26:04:0c:87:35:8b:7a:02:b7:28:05:90
-	84:85:a7:33:46:e5:21:8b:57:61:80:36:8b:f0:61:f8
-	0f:86:fa:67:1a:8f:62:9c:05:49:95:7b:f6:0c:9a:2e
-	2c:1c:6c:2f:77:3c:e9:d0:37:6a:e3:23:70:9f:05:36
-	07:ef:48:9e:d2:a3:bb:c4:76:86:50:a3:54:06:2a:94
-	e8:51:45:4f:0f:d7:be:2b:fc:be:8f:85:88:f2:cc:0f
-	f2:52:5a:67:f1:08:0c:ae:f8:11:20:32:ca:4e:d1:fa
-	36:23:22:d1:78:1a:bc:11:ed:13:3b:0b:15:87:38:43
-	70:3b:fd:e9:c5:b8:89:17:ea:16:5c:eb:7e:da:3b:13
-	4c:ac:8b:d4:56:49:1c:8d:9b:78:17:0f:bd:0a:a5:f5
-	b6:81:63:fa:b4:92:84:fb:71:2f:0f:26:21:88:fc:3e
-	93:a9:74:36:e5:79:1b:4c:6f:e5:76:6c:c9:ec:ae:6d
-	a0:b2:7e:ee:25:1c:76:df:aa:f2:c1:74:a3:04:b8:85
-	1f:f7:55:45:cc:db:80:e0:05:db:b3:be:68:a1:0f:d1
-	b4:93:4c:03:36:68:c7:bb:7b:5e:f2:d1:90:a2:0b:cc
-	25:14:d4:b6:2c:35:00:43:b6:0e:25:14:66:a7:7a:a7
-	fa:45:1a:b2:5f:47:2c:54:ea:71:c1:be:bd:40:0d:e0
-	a5:07:07:10:07:48:47:da:65:43:e7:d6:9f:7d:ec:73
-	06:c5:30:86:8b:a4:de:fd:1f:4e:03:50:a5:7d:bf:a9
-	f7:8a:c1:56:e7:57:86:c4:37:57:dd:fb:14:b0:cd:d9
-	92:7a:52:da:ea:b1:3e:a5:81:11:24:e9:7e:cd:d2:d2
-	ab:40:2d:64:4d:86:4e:9d:80:eb:48:e4:f8:0b:ab:00
-	b7:10:aa:17:4d:53:d6:15:f2:d0:95:84:54:e2:74:ee
-	3d:19:7a:93:9a:e0:09:03:3b:ee:48:0a:08:a8:21:6e
-	53:54:d6:7a:23:50:08:72:37:72:5c:f1:50:06:5c:a8
-	30:71:4d:95:2f:6e:43:f7:40:ae:ef:d0:86:f9:73:b1
-	e2:46:9e:64:98:ee:02:42:e5:20:cb:c9:93:d5:16:61
-	68:ca:7d:a8:8c:b7:1c:a5:0d:10:17:58:c2:18:f8:e7
-	01:
+	00:d1:a2:56:04:7a:83:11:a4:ce:ac:34:19:86:59:b9
+	d5:be:b3:cd:67:d4:4c:72:dd:ac:3e:23:7c:3d:1a:74
+	06:5e:88:d4:46:12:64:c1:b5:19:d6:73:ff:a2:17:20
+	48:49:d2:ad:66:45:a7:bc:f8:ce:38:a0:35:42:56:d1
+	1f:90:b1:8d:7c:25:40:02:a4:16:a4:43:7b:8b:07:2f
+	74:4e:89:cb:b6:2c:a6:a7:a4:75:70:d1:93:8c:c4:6e
+	9d:13:7b:be:33:ee:a1:0a:8d:a5:76:8f:fc:8b:7b:fd
+	c0:7b:d8:e3:c1:d6:e6:3c:96:81:cb:0f:ae:70:7a:13
+	c0:66:f6:a9:12:ab:7d:2a:1c:7d:ba:af:31:f8:2c:14
+	12:2c:07:d0:16:f5:fc:4a:a9:10:9f:82:18:e8:57:90
+	03:a5:d8:30:86:40:3c:7b:06:3c:4f:4f:61:e5:61:b8
+	ff:fa:4e:b5:d5:14:cb:b0:aa:df:06:34:8f:cf:aa:4a
+	ba:e8:b1:59:f9:81:16:e7:08:4f:c1:13:3b:25:d2:5e
+	fa:ee:5e:1a:d7:31:b8:dc:a5:1f:72:39:56:83:24:e8
+	4e:cb:2f:73:0c:4d:4d:5f:9f:e6:e6:91:9c:36:f7:52
+	01:5b:6b:04:ce:e6:bc:19:f1:91:e3:bd:41:e1:27:03
+	41:a3:4b:44:27:7c:6a:20:9e:43:a9:2a:c2:54:38:a8
+	4f:5f:a4:ac:f6:4e:46:fa:10:ba:3a:2e:9a:44:7c:31
+	7a:5a:ca:74:e7:17:e1:1b:19:2b:b2:56:c1:2b:69:8b
+	54:fb:62:e8:b3:34:f7:05:23:5a:65:90:cd:10:5d:3e
+	7a:33:4c:39:4b:40:2f:f2:db:7d:0d:11:5b:6d:0e:76
+	5e:f6:1c:57:bf:fd:a0:b9:9a:3f:7b:4d:4e:e8:f0:c0
+	69:49:45:da:6b:35:24:61:e4:ec:91:95:73:fe:11:61
+	c3:44:3f:ed:8c:f7:26:32:e9:11:b3:b3:52:03:38:d3
+	61:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	44:b8:a9:7e:b5:3b:cd:51:51:bb:ef:af:4b:63:d5:9e
-	5f:01:ff:b6:00:4f:e2:a0:42:76:c3:eb:03:a9:5a:c3
-	01:2a:6e:18:6f:56:b8:cb:94:98:3b:55:4f:3a:2b:bc
-	2a:5d:9a:8d:d1:79:d3:24:5f:c4:c9:95:c6:3a:6d:2b
-	22:56:e8:9f:66:98:81:ce:81:eb:b9:2d:f0:73:41:20
-	b7:40:50:51:7e:30:58:0b:75:09:23:b1:73:dc:9e:ac
-	79:a5:e5:48:5f:ee:ca:ec:39:19:1c:aa:0d:de:40:d7
-	08:90:db:c6:67:8f:55:bf:81:be:5b:8a:15:f8:e9:e6
-	ac:82:2a:0b:c3:45:fe:3b:15:04:8c:c9:fa:37:cc:0c
-	71:b0:db:9c:d2:5c:df:9f:55:18:20:a0:4b:eb:53:c9
-	b9:1f:0a:a8:98:9e:10:5a:35:68:a1:41:43:4e:a3:5f
-	e3:8c:22:94:55:2f:80:98:b4:a6:a9:9b:b2:d8:72:e1
-	55:5e:1c:06:d3:39:ec:c9:11:c0:6e:30:51:66:c4:47
-	f2:ad:e1:30:83:0e:6e:c3:15:6b:26:97:b2:d4:2c:6a
-	7b:c7:d9:33:5c:ca:24:ab:a8:dc:3b:1b:46:25:35:3d
-	fa:21:fe:ad:e7:a4:c4:58:eb:d8:48:c4:6a:e6:d3:ae
-	b2:f1:c6:b1:ed:7b:ca:23:fc:51:bc:9f:3a:3e:56:9e
-	6d:23:b0:e5:9a:46:ae:f9:ee:8f:1a:5e:cc:42:37:22
-	6e:4b:52:37:0d:36:59:72:1a:19:c1:17:f9:45:55:bd
-	33:ce:15:5b:b5:ee:a3:88:a2:b8:46:fe:b8:e2:93:54
-	0a:68:81:a3:b8:63:95:c6:b2:96:d0:f8:ac:d6:5d:df
-	97:58:85:6f:eb:2d:66:3b:27:7a:db:2c:7d:8d:04:01
-	44:af:4a:91:2e:e8:f7:6c:e8:52:7a:70:a4:31:9a:f0
-	b7:d3:bc:dd:f4:46:d0:61:f9:5f:57:98:c0:79:b9:e1
-	0f:6e:76:33:66:46:82:7a:31:61:a4:88:19:48:15:86
-	0e:b1:40:6a:af:1a:3f:75:db:12:bc:79:c7:f2:fe:41
-	49:02:88:3b:66:33:44:12:9d:43:f4:e6:cf:0d:4d:c5
-	44:d4:a9:4e:0d:fe:dd:00:87:bf:5e:f2:aa:5f:71:cf
-	f8:4a:24:4c:2c:bf:ee:88:3d:f5:78:e1:5c:95:a7:4c
-	82:c8:65:7d:e7:b3:d7:98:b2:f2:4b:66:5c:1c:f7:d5
-	6a:6e:af:a7:e9:98:31:e8:92:99:1d:64:85:fb:8a:f6
-	6c:3b:a1:dc:22:be:fc:f8:8c:3b:51:c4:c0:dc:44:71
-	
+	00:95:fb:36:df:6d:67:68:b0:28:cd:3b:59:27:ad:fa
+	2e:da:89:79:63:d7:97:fa:76:6e:4c:e6:c6:74:51:00
+	c1:ad:d0:e7:4e:5a:ca:8b:6c:2e:58:28:15:b4:ba:26
+	f6:91:1a:91:c4:a2:01:28:4a:3a:00:79:5e:a1:5f:cb
+	ae:71:af:16:32:c3:d3:d0:0f:e5:c3:10:24:cb:8b:10
+	80:7d:d0:48:56:c6:0b:55:d5:6b:d0:93:a0:a5:0d:c4
+	b5:cc:c2:b3:8a:24:28:43:8c:a3:dc:f7:97:0f:94:5e
+	2f:e0:6b:84:47:a2:a0:86:a8:87:a3:e8:4c:3d:5c:99
+	d5:05:d5:63:91:5f:ef:e4:b9:0d:9b:0a:cd:0d:69:3b
+	d2:e4:7d:92:7b:5a:f2:6d:d8:17:74:87:77:9a:83:4b
+	1d:d1:01:a3:75:e9:6f:5b:f5:52:20:cc:02:96:42:1c
+	41:c7:ab:98:9c:22:8c:b8:91:07:8f:40:fb:c2:ef:6b
+	16:92:a5:74:bd:8e:31:07:c1:8a:2a:48:92:5b:55:da
+	7a:aa:d2:67:15:66:50:d4:ad:40:c4:83:0f:96:4e:1c
+	bd:2d:f6:e2:27:d5:14:83:55:2c:e8:fb:33:b3:23:79
+	ac:cc:02:bd:74:62:31:4e:a5:22:1a:2b:c9:83:56:d8
+	14:5b:2f:9a:2c:c4:a9:ec:ae:9f:31:4b:1e:87:c3:b4
+	18:6e:a0:28:de:d7:cd:d4:f0:a6:9e:c2:9b:8e:f3:a2
+	11:99:34:ea:41:fd:64:28:95:37:18:3a:2e:88:47:a4
+	ca:e4:46:f3:3f:1d:2e:51:7c:53:41:59:a4:5f:d9:43
+	c8:c9:c3:36:e0:31:61:77:9b:c4:46:3c:06:ad:90:2c
+	bc:8c:0b:05:20:e0:18:bd:ba:5c:78:a4:37:22:c5:d2
+	af:2c:c1:e1:dd:4f:bb:ba:49:37:94:e7:0c:11:ef:05
+	ab:ec:c8:8b:cf:2b:ad:54:8b:b2:18:7d:f9:54:34:62
+	a1:
 
 prime1:
-	00:cb:37:46:9c:11:91:72:90:0e:18:7a:ad:d9:c4:cb
-	3d:64:2c:47:9a:2f:04:69:05:d5:22:b4:f0:af:3e:30
-	26:2e:32:35:83:ba:e1:80:3b:5a:5d:1c:c9:ac:c5:85
-	f2:87:93:8e:f3:dd:7c:f5:cd:a5:77:8b:c2:bf:47:67
-	4d:c7:df:49:cd:41:bf:6c:14:f8:95:0e:db:00:70:d7
-	3a:43:b8:ae:43:be:a3:ce:48:5d:1b:c5:30:14:34:91
-	2c:6e:c5:00:81:ab:86:4b:9f:f0:ab:45:27:62:e0:ea
-	2d:89:61:a2:bd:06:4d:2e:c7:2c:9d:bd:fd:f5:39:b8
-	29:2a:f4:2e:bf:1f:13:9d:c8:d0:bb:56:67:d3:de:2d
-	31:63:22:61:5c:30:14:ea:b7:72:a8:f4:ea:d6:db:0b
-	35:86:a6:e4:8d:c7:c2:9f:2b:33:85:d7:05:45:f7:05
-	d4:5a:74:8f:26:4a:91:b3:7a:cc:8d:57:1b:c2:a8:b8
-	e8:b5:ef:b0:24:4d:1d:8d:03:a1:79:0b:d4:0b:06:1a
-	62:ca:5c:b8:aa:f9:ff:f4:cb:54:e1:6e:a5:d7:41:46
-	7c:2d:36:4b:15:01:c9:17:45:3c:33:44:79:4c:99:b0
-	43:0d:f7:c0:05:13:e5:82:3d:53:a3:2b:88:d9:ee:3b
-	83:
+	00:f2:25:5e:4c:a7:a8:39:38:1f:48:5e:bc:e7:55:f8
+	38:ff:cf:98:88:17:fb:0d:0d:0b:dd:9c:6e:4c:e6:b9
+	95:28:c4:c2:af:1b:bc:4c:5e:00:a0:ed:6b:a8:11:be
+	4a:b8:fa:fa:a7:63:ba:10:9c:6e:25:52:26:a2:ac:24
+	67:5b:c3:5f:25:ff:b0:75:05:6f:48:6d:b6:c8:f0:d4
+	9e:91:4d:f6:b3:82:94:cf:89:f5:db:6f:b5:0d:3e:e1
+	a6:b6:32:8c:90:9e:c9:15:60:de:95:e0:bf:02:71:2f
+	da:2a:4a:55:bb:11:90:91:1a:cd:b8:02:1c:61:a0:d0
+	7d:61:8b:f8:4d:d8:19:6b:a5:5e:55:19:6f:a0:0e:69
+	74:67:ed:72:67:64:e1:52:e3:b0:96:97:93:ab:5c:7b
+	4e:fe:e0:6b:12:1a:b2:1a:f5:f7:76:ca:d1:91:29:b8
+	9c:b4:15:a3:24:cd:b8:93:7a:58:16:a7:c6:bb:8b:a9
+	ef:
 
 prime2:
-	00:cf:c3:9b:a6:b3:b2:65:0b:88:8c:64:db:1e:00:21
-	42:a5:bd:47:75:0d:a4:29:e5:e9:9b:b7:1a:cf:df:9f
-	a3:44:9c:67:a4:a9:0c:87:97:94:94:40:54:44:3b:bf
-	1a:f3:71:97:05:d6:a5:ad:28:f5:a9:94:92:f5:7f:f8
-	cd:82:40:6e:ca:ff:d8:3f:18:84:42:83:dd:9e:87:bf
-	fa:2e:96:5e:fc:1d:db:d4:d5:dd:2d:c3:71:f4:bf:54
-	6d:06:21:95:8f:0a:89:b8:14:62:7c:a7:9b:10:fc:ae
-	4b:0c:51:ac:46:5a:ee:04:cc:e2:ad:fc:97:50:32:b9
-	c7:1e:40:6f:07:de:45:7f:2e:ac:12:39:30:b8:7b:6d
-	0f:07:75:bd:58:c2:e2:e7:52:2a:6f:7e:8a:2f:07:c5
-	eb:10:db:8d:10:2e:d4:a2:1c:28:ca:f5:c4:de:56:6a
-	20:f3:47:21:b7:4c:b6:04:93:86:e6:78:b5:89:64:cb
-	9e:f2:cd:78:e7:43:e6:a0:94:41:b4:c5:a8:c7:43:2b
-	20:17:50:7a:a9:c0:ee:db:9a:f0:48:85:1f:1f:64:11
-	4e:4d:dd:99:6f:49:7a:f2:65:2a:83:98:96:5b:a3:7e
-	64:da:77:00:7e:4b:7a:55:d9:cf:d7:73:fb:63:1a:f8
-	2b:
+	00:dd:a0:c7:06:ae:1c:66:57:51:fe:ea:0f:b7:4c:b7
+	62:a3:d6:b3:02:fb:a8:16:1a:08:bd:15:00:2f:17:99
+	05:50:8a:7c:7b:1e:1b:24:10:7f:6b:4a:aa:b1:46:bc
+	4a:0f:f1:3b:9a:6e:94:39:58:04:b1:31:ff:99:ad:c7
+	f2:97:2d:cc:d3:e4:a4:c8:db:cf:b4:69:f8:2d:c0:aa
+	16:09:bd:02:87:74:66:93:89:b7:c0:0e:07:3b:9c:9c
+	e4:0c:56:8b:a8:6a:78:bc:db:4a:1c:7f:67:f6:18:37
+	09:ba:27:9a:24:a4:f6:fe:2c:9a:24:c5:e9:8b:3c:ff
+	dc:dc:2b:16:8f:34:46:b3:41:26:43:9b:6d:41:5d:ba
+	78:11:d5:2c:7a:28:2d:e0:4c:19:fe:42:12:62:81:10
+	b4:6f:6e:0c:12:34:4c:65:91:9b:2e:47:97:ef:ec:77
+	b0:bf:a9:bd:ce:a2:6f:d9:63:6b:73:1d:01:6b:27:e7
+	af:
 
 coefficient:
-	69:74:f7:c6:34:ec:d8:f9:08:c2:d8:5b:6a:61:4e:33
-	b3:9b:dd:f1:30:8d:2e:bf:12:2d:74:de:53:6c:d2:88
-	e5:9f:5d:5f:f1:e3:59:00:c4:1d:e3:5a:1d:07:6a:53
-	ea:c8:46:0e:b1:61:5d:03:27:d9:1a:67:54:8d:bb:85
-	53:07:39:19:56:8a:dd:9f:f4:30:13:fa:2e:ce:1c:8e
-	1c:cb:d6:54:b7:a9:92:26:87:f6:60:c1:04:41:fc:7c
-	f7:fd:fb:a7:fc:f2:d0:2c:4a:65:ef:62:5b:f9:b4:d6
-	e8:f6:68:57:1f:b2:d1:d6:c4:78:0e:d4:66:39:cd:4c
-	42:d7:5b:d1:ce:ae:5a:b6:25:12:7f:d1:2c:ae:95:4c
-	14:cb:0a:31:7c:a8:0a:71:b8:98:c8:2b:03:19:92:d0
-	e1:4c:a8:c4:0b:8c:b9:8b:d0:9a:b3:8f:27:b3:a4:09
-	8b:6d:95:e3:12:a0:60:e6:e7:b9:8f:53:fa:b4:56:f1
-	cd:fe:11:31:20:01:fd:82:73:f1:51:ba:13:71:f1:0f
-	8b:78:3f:36:71:7e:15:93:35:01:06:8b:40:a3:b5:23
-	22:9d:c7:c7:88:c8:25:07:dd:0d:1d:70:43:37:3e:ea
-	25:b0:54:f0:5d:83:29:ca:5a:ec:4e:f5:a7:66:f0:fa
+	07:26:29:12:92:ee:ea:a5:06:87:8c:81:9a:b9:ba:b5
+	f3:49:28:0b:b7:e3:3c:02:ad:a4:d2:cd:bd:80:ca:45
+	ee:21:5f:41:00:75:d6:e6:6e:38:88:ad:23:26:39:e4
+	45:09:c2:48:ed:c6:b3:6c:c3:ea:f6:2a:b3:06:58:d7
+	55:88:8f:54:4c:6e:8d:29:c9:91:65:48:49:4f:3a:f1
+	8d:62:c7:e9:a1:07:e9:11:14:0e:3a:4f:98:e2:04:78
+	a8:b3:ab:6f:9f:c3:b0:31:58:2f:e7:dc:61:f2:62:9c
+	71:f8:0a:a7:a7:d8:bb:4f:9d:23:d5:9c:81:54:ce:00
+	6c:37:c8:09:6f:76:5c:66:cf:b9:57:b7:00:b2:da:6d
+	39:91:e6:4f:ea:c3:c5:ea:e3:15:53:63:65:ec:56:cc
+	06:7a:f3:4c:33:0a:6c:8c:bd:94:a1:89:5c:ba:1b:ca
+	c2:2f:cd:4e:a4:67:31:fb:de:a6:e0:5a:eb:ff:9e:85
 	
 
 exp1:
-	4a:04:cd:3c:45:8d:e3:db:a2:b6:b9:e0:9f:04:76:3e
-	db:40:e1:a7:c0:5e:6b:de:8a:fe:84:47:72:9d:45:2e
-	72:ff:28:cc:dd:82:0b:92:12:dc:fd:82:5b:e2:ea:62
-	27:8d:d0:b0:f4:c8:f2:43:40:74:e5:bc:3e:ad:c4:6b
-	e9:54:64:6e:55:f7:62:67:d5:0f:7e:04:b9:09:60:eb
-	c1:05:00:bc:7e:30:ee:0f:1f:92:e0:e5:1d:46:f4:65
-	e9:c6:e9:e3:51:55:ae:30:08:9a:69:aa:e9:f2:20:7a
-	0b:a3:3b:82:7c:4c:1a:b0:c3:88:85:4e:7e:46:d2:d4
-	73:e7:d3:2b:1c:27:a9:fe:1e:41:4e:3c:ad:48:2c:cf
-	e3:5a:ff:79:73:ad:fa:bc:6d:10:2b:7d:6a:5b:08:9f
-	2b:77:98:a2:27:d3:b4:e4:28:75:24:97:b0:1f:44:c9
-	4f:55:4b:5a:d8:28:6f:e6:57:a1:57:cc:2d:c0:04:f2
-	06:6a:d2:8e:b6:64:00:1c:05:71:b0:a4:40:8b:ad:8a
-	b4:48:c7:9e:c7:46:ba:a4:61:3b:67:71:12:91:9d:19
-	d7:e2:01:c1:1a:10:63:e0:7d:07:f3:75:f7:37:b7:a3
-	04:f0:6b:c9:ad:b0:98:1a:bc:5f:1f:99:4e:3f:de:ff
-	
+	00:d5:cd:9c:e7:be:19:50:fc:76:d2:a5:a3:d1:f7:1c
+	86:e7:88:5b:3b:bf:40:d2:13:34:e8:e5:d8:96:5a:1a
+	7e:d3:52:78:3b:b9:17:97:ae:60:8b:b7:56:99:3d:a1
+	71:c4:c7:06:4e:8a:45:9d:a9:21:b0:1e:4b:32:d3:20
+	09:8b:02:84:9e:be:97:05:9c:58:d7:f0:d7:b5:b0:bf
+	6b:8b:0c:f5:c9:26:81:52:86:93:e8:bf:47:73:7c:94
+	2d:69:2e:54:e2:d4:f0:e3:c9:76:7f:8b:c3:db:da:28
+	d0:4f:0a:f7:8b:87:44:c8:7a:8c:2d:ee:df:34:6c:93
+	ea:41:19:1f:93:4c:3d:95:c8:9b:f4:33:d3:55:d5:a3
+	d3:3e:78:6f:cd:4f:4b:8c:ae:b2:1b:25:97:23:75:33
+	03:5b:14:b8:35:72:10:d4:b1:5d:61:2c:4f:c2:06:be
+	94:ce:85:54:59:88:b3:72:b4:51:d7:1f:28:e0:2b:bf
+	4d:
 
 exp2:
-	0d:a2:8b:bb:83:fd:88:2e:1a:97:04:23:71:33:96:fb
-	35:bf:57:4a:32:4b:fc:c7:ee:ed:de:35:6f:41:00:cc
-	09:3b:ae:7d:9a:ee:8c:93:81:17:bd:a5:0a:19:55:b0
-	62:1b:a9:4a:a3:cc:99:b1:9f:75:b2:9f:76:67:20:9f
-	f4:15:60:70:08:1c:5b:ff:b2:e6:5e:9b:13:c5:5a:ef
-	03:51:b1:08:20:b9:85:9d:47:77:b2:64:ef:28:03:55
-	68:5a:99:e3:1a:50:f1:78:bd:01:eb:49:fc:f2:68:49
-	da:94:1d:97:3c:6e:74:78:31:c4:33:58:86:d5:dd:65
-	58:f1:e7:97:7f:99:d5:ff:ed:21:01:09:d6:81:9b:25
-	aa:5a:aa:c3:81:7e:bc:a9:a2:c9:50:67:a7:30:7e:67
-	af:e2:88:be:70:24:5a:43:38:d6:21:0c:fb:7e:76:56
-	95:40:ac:d0:c7:c3:06:47:dc:49:91:d0:70:24:e2:4c
-	1b:29:2a:ef:1a:80:af:37:2b:9c:be:80:16:1b:ad:5f
-	dc:c7:d6:54:ff:a9:6d:56:1c:c0:d5:a3:b6:3e:ad:f8
-	12:9a:21:70:b1:44:d5:55:98:55:ac:94:e9:8c:b0:45
-	d4:24:8d:2e:bc:ab:59:a9:02:bf:e4:07:b2:78:59:a3
+	25:7e:40:8d:49:c1:36:33:09:85:15:75:c9:2d:aa:4c
+	7e:a9:20:a9:9d:87:47:0d:ea:72:8a:6d:f8:89:86:72
+	96:b8:86:ec:91:20:48:4e:9e:2f:b9:76:fc:fc:99:77
+	f2:10:7e:63:d6:d7:2e:88:4c:6a:e9:a9:73:07:2a:2f
+	49:12:0f:77:bd:53:7f:43:68:74:fe:04:65:41:15:c5
+	1a:aa:a6:15:e2:44:44:2b:65:31:91:6d:f9:d0:b9:dd
+	fe:94:59:96:09:45:19:b6:03:68:a4:c9:22:a1:e0:15
+	be:2f:5a:ed:5e:17:06:d2:e6:d4:d7:c2:75:b2:c1:1a
+	4d:08:e1:0d:22:eb:df:01:63:86:c6:71:8a:40:5f:fe
+	56:0d:f9:33:45:3e:d5:96:2a:43:90:4b:e9:ec:29:b6
+	4c:af:92:4d:36:19:c2:89:0a:76:9e:d7:fe:57:c3:bb
+	dc:00:cc:42:7b:ca:6e:3d:5a:7d:23:e8:0c:87:b8:b3
 	
 
 
+Public Key PIN:
+	pin-sha256:D+tc7nZ0YZF4F7T/SRUEtn87FOB7swuWXyf06p8Vp2w=
 Public Key ID:
-	sha256:99:0C:C5:EF:0C:3C:DC:71:32:9D:02:23:F8:28:E8:3B:55:D8:00:3D:D0:12:F3:56:33:03:B1:FD:30:3B:71:F1
-	sha1:37:0D:50:BB:93:90:C0:E5:78:D6:E1:D0:FE:99:64:6D:84:5E:3C:36
-Public key's random art:
-+--[ RSA 4096]----+
-|     ...+oo  o   |
-|      .+ *.o. E  |
-|      . *.=. = o |
-|       o ..=+ o  |
-|        S *+.+   |
-|         . o+    |
-|                 |
-|                 |
-|                 |
-+-----------------+
+	sha256:0feb5cee767461917817b4ff491504b67f3b14e07bb30b965f27f4ea9f15a76c
+	sha1:73dd920a2e6673624f27079c7628ee9862d2d013
 
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

From 863038905ce87c989e81fa189b8088968d6d6a79 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 3 Mar 2019 10:34:09 -0500
Subject: [PATCH 841/879] Tests: Version test removed

- Veriying that the diag  command emits the correct commit SHA1 creates
  sporadic failures when CMake has not been run against the current
  commit, and this is not a good test.
---
 test/version.t | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/test/version.t b/test/version.t
index 1076aad86..1b852d6a5 100755
--- a/test/version.t
+++ b/test/version.t
@@ -82,29 +82,6 @@ class TestVersion(TestCase):
         _, hash, _ = run_cmd_wait(git_cmd)
         return hash.rstrip("\n")
 
-    def test_under_version(self):
-        """_version and diagnostics output expected version and syntax"""
-        code, out, err = self.t("_version")
-
-        # version = "x.x.x (git-hash)" or simply "x.x.x"
-        # corresponding to "compiled from git" or "compiled from tarball"
-        version = out.split()
-
-        if 2 >= len(version) > 0:
-            git = version[1]
-            git_expected = "({0})".format(self.slurp_git())
-            self.assertEqual(git_expected, git)
-        else:
-            raise ValueError("Unexpected output from _version '{0}'".format(
-                out))
-
-        ver = version[0]
-        ver_expected = self.slurp()
-        self.assertEqual(ver_expected, ver)
-
-        code, out, err = self.t.diag()
-        self.assertIn(ver_expected, out)
-
     def test_version_option(self):
         """Verify that  'task --version' returns something valid"""
         code, out, err = self.t("--version")

From b87703eb39e4ad89ef8f8447440d890d555678f6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 3 Mar 2019 10:50:49 -0500
Subject: [PATCH 842/879] Tests: REmoved check for absence of a segfault

- Testing for the absence of a segfault is not a good test.
---
 test/project.t | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/test/project.t b/test/project.t
index 4ce43e6e7..0254e0713 100755
--- a/test/project.t
+++ b/test/project.t
@@ -251,22 +251,6 @@ class TestBug299(TestCase):
         self.assertRegexpMatches(out, "three.*baz")
 
 
-class TestBug555(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_log_with_project_segfault(self):
-        """555: log with a project causes a segfault
-
-        Reported in bug 555
-        """
-        code, out, err = self.t("log description project:p")
-
-        self.assertNotIn("Segmentation fault", out)
-        self.assertNotIn("Segmentation fault", err)
-        self.assertIn("Logged task", out)
-
-
 class TestBug605(TestCase):
     def setUp(self):
         self.t = Task()

From b0c9bf6c8db4059bb775a55305390db553aaf5ba Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Sun, 24 Feb 2019 15:54:49 +0100
Subject: [PATCH 843/879] Fix #2002

---
 src/commands/CmdContext.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 55482067f..b1a15dc36 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -71,7 +71,10 @@ int CmdContext::execute (std::string& output)
     else if (words.size ())          setContext (words, out);
   }
   else
+  {
     listContexts (out);
+    out << "Use 'task context none' to unset the current context.";
+  }
 
   output = out.str ();
   return 0;

From 2821c5ac446a7c5eb098c8aac546b6acafe10923 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Sun, 24 Feb 2019 15:59:17 +0100
Subject: [PATCH 844/879] Add missing newline

---
 src/commands/CmdContext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index b1a15dc36..bc36177b6 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -73,7 +73,7 @@ int CmdContext::execute (std::string& output)
   else
   {
     listContexts (out);
-    out << "Use 'task context none' to unset the current context.";
+    out << "Use 'task context none' to unset the current context.\n";
   }
 
   output = out.str ();

From 0e58226f3bc4aa4a3bd3ac6530c7ee7ab5cde8f2 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Sun, 24 Feb 2019 18:33:51 +0100
Subject: [PATCH 845/879] Fix #1999

---
 src/commands/CmdInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index a65856f96..8d4633342 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -536,7 +536,7 @@ int CmdInfo::execute (std::string& output)
 
             Task before (undo[previous].substr (4));
             Task after (undo[current].substr (4));
-            journal.set (row, 1, taskInfoDifferences (before, after, dateformat, last_timestamp, timestamp.toEpoch()));
+            journal.set (row, 1, taskInfoDifferences (before, after, dateformat, last_timestamp, Datetime(after.get("modified")).toEpoch()));
           }
         }
       }

From f06eb12d100ebd4950f8600babdea76875ca4dd6 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Sun, 24 Feb 2019 18:34:10 +0100
Subject: [PATCH 846/879] Add unit test

---
 test/tw-1999.t | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100755 test/tw-1999.t

diff --git a/test/tw-1999.t b/test/tw-1999.t
new file mode 100755
index 000000000..c9c2e2abf
--- /dev/null
+++ b/test/tw-1999.t
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# https://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase, Taskd, ServerTestCase
+
+
+class TestBug1999(TestCase):
+    """Bug 1999: Taskwarrior reports wrong active tim
+    """
+    def setUp(self):
+        self.t = Task()
+
+    def test_correct_active_time(self):
+        """Ensure correct active time locally
+        """
+        desc = "Testing task"
+        self.t(("add", desc))
+        self.t(("start", "1"))
+        self.t.faketime("+10m")
+        self.t(("stop", "1"))
+
+        code, out, err = self.t(("info", "1"))
+        self.assertIn("duration: 0:10:00", out)
+
+
+class TestBug1999Server(ServerTestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.taskd = Taskd()
+        # This takes a while...
+        cls.taskd.start()
+
+    def setUp(self):
+        self.t1 = Task(taskd=self.taskd)
+        self.t2 = Task(taskd=self.taskd)
+
+    def test_correct_active_time(self):
+        """Ensure correct active time across different clients
+        """
+        desc = "Testing task"
+        self.t1(("add", desc))
+        self.t1(("start", "1"))
+        self.t1.faketime("+10m")
+        self.t1(("stop", "1"))
+
+        self.t1("sync")
+
+        code, out, err = self.t1(("info", "1"))
+        self.assertIn("duration: 0:10:00", out)
+
+        self.t2("sync")
+
+        code2, out2, err2 = self.t2(("info", "1"))
+        self.assertIn("duration: 0:10:00", out2)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4 ft=python

From 62944f3c7d9b36fb20f6869d3e915e4ce5069f55 Mon Sep 17 00:00:00 2001
From: Lionel Miller <delonorm@gmail.com>
Date: Sun, 17 Feb 2019 13:49:03 +0300
Subject: [PATCH 847/879] Workaround for alias grep=rg in fish

---
 scripts/fish/task.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index f67ed00e3..20569635b 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -186,7 +186,7 @@ end
 
 function __fish.task.list.command
   # ignore special commands
-  __fish.task.list._command $argv | grep -Ev '^_'
+  __fish.task.list._command $argv | command grep -Ev '^_'
 end
 
 function __fish.task.list.command_mods

From 2ac1787dae75540ca5684ee29065452de54e67be Mon Sep 17 00:00:00 2001
From: Chad Phillips <chad@apartmentlines.com>
Date: Tue, 19 Mar 2019 21:28:30 -0700
Subject: [PATCH 848/879] JSON encode/decode string UDAs

Previously, multiline string UDAs were not preserved when editing
a task via 'task X edit'. String UDAs are now JSON encoded/decoded
during the edit cycle to allow preservation of multiline
---
 src/commands/CmdEdit.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index a8ff452ed..eda3e557c 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -298,7 +298,12 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 
       std::string type = Context::getContext ().config.get ("uda." + uda + ".type");
       if (type == "string" || type == "numeric")
-        before << "  UDA " << uda << ": " << padding << task.get (uda) << '\n';
+      {
+        auto value = task.get (uda);
+        if (type == "string")
+          value = json::encode (value);
+        before << "  UDA " << uda << ": " << padding << value << '\n';
+      }
       else if (type == "date")
         before << "  UDA " << uda << ": " << padding << formatDate (task, uda, dateformat) << '\n';
       else if (type == "duration")
@@ -662,6 +667,8 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
     if (type != "")
     {
       auto value = findValue (after, "\n  UDA " + col.first + ":");
+      if (type == "string")
+        value = json::decode (value);
       if ((task.get (col.first) != value) && (type != "date" ||
            (task.get (col.first) != Datetime (value, dateformat).toEpochString ())) &&
            (type != "duration" ||

From 18395a8dc0cc9e004438467f3bbef8c0e69fd43d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 14 Apr 2019 19:38:01 -0400
Subject: [PATCH 849/879] - Thanks to Chad Phillips

---
 AUTHORS   |  5 +++++
 ChangeLog | 24 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f1988ec77..4c9574999 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -146,7 +146,12 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Tiago Matias
   Simon Ruderich
   Kirill Bobyrev
+  Simon Désaulniers
+  Janik Rabe
+  mrossinek
+  taiyu-len
   Lionel Miller
+  Chad Phillips
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 384b9e6ae..e8f478489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,29 +97,41 @@
            Thanks to tom-doerr
 - TW #2020 reserved.lines is not affecting the burndown height
            Thanks to ad₋si
+- TW #2047 Exiting the task editor with an error code doesn't remove the lock file
+           Thanks to coaxial
+- TW #2051 doc/man: ready tasks sorted with started tasks 1st
+           Thanks to Simon Désaulniers
+- TW #2053 Do not set CMP0037 on CMake 3.11.0 and above
+           Thanks to Janik Rabe
+- #2077    Change taskrc override priority, respect verbose override, refactor.
+           Thanks to taiyu-len
+- #2108    CmdHistory: repeat unit if a larger unit changes
+           Thanks to Janik Rabe
+- #2132    JSON encode/decode string UDAs
+           Thanks to Chad Phillips
 - Added 'juhannus' as a synonym for 'midsommarafton'
-          Thanks to Lynoure Braakman
+           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
   virtual tag.
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
-          Thanks to Fidel Mato
+           Thanks to Fidel Mato
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
   removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
-          Thanks to Ran Benita
+           Thanks to Ran Benita
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
-          Thanks to jrabbit
+           Thanks to jrabbit
 - Improved certificate validation diagnostics
-          Thanks to Jelle van der Waa
+           Thanks to Jelle van der Waa
 - Improved portability for SunOS-like OSes.
-          Thanks to Antonio Huete Jimenez
+           Thanks to Antonio Huete Jimenez
 - Updated the 'timesheet' command with a more compact report that accepts a
   filter, and has a default filter showing the last four weeks of completed and
   started tasks.

From 415ce36861c37b7801d0be6c6d22b36742d965ba Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 14 Apr 2019 19:40:55 -0400
Subject: [PATCH 850/879] Updated AUTHOR and Changelog

---
 AUTHORS   | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 4c9574999..d72a80873 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -152,6 +152,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   taiyu-len
   Lionel Miller
   Chad Phillips
+  Lionel Miller
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index e8f478489..92470d39a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,8 @@
 - The message telling you to sync now indicates how many local changes will be
   synced.
 - Removed compile-time language settings and I18N.
+- Workaround for alias grep=rg in fish
+          Thanks to Lionel Miller.
 
 ------ current release ---------------------------
 

From fb97883bef9f1881f08b0005786be3ec954f5acc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 26 Apr 2019 20:45:46 -0400
Subject: [PATCH 851/879] Build: Do not set CMP0037 on CMake 3.11.0 and above

- This policy is no longer necessary because CMake issue #16062, which caused
  incorrect warnings to be shown, has been resolved in 3.11.0.
- Thanks to Janik Rabe
---
 ChangeLog           | 2 ++
 test/CMakeLists.txt | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92470d39a..2193146aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -145,6 +145,8 @@
 - Removed compile-time language settings and I18N.
 - Workaround for alias grep=rg in fish
           Thanks to Lionel Miller.
+- Do not set CMP0037 on CMake 3.11.0 and above
+          Thanks to Janik Rabe
 
 ------ current release ---------------------------
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f1f79bd12..3e37e5e3b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,10 @@
 cmake_minimum_required (VERSION 3.0)
 
-# See this CMake issue before complaining about the following.
-# https://cmake.org/Bug/view.php?id=16062
-if(POLICY CMP0037)
+# This is a work-around for the following CMake issue:
+# https://gitlab.kitware.com/cmake/cmake/issues/16062
+# The issue has been fixed in CMake 3.11.0; the policy is set
+# to OLD for compatibility with older versions of CMake only.
+if(POLICY CMP0037 AND ${CMAKE_VERSION} VERSION_LESS "3.11.0")
   cmake_policy(SET CMP0037 OLD)
 endif()
 

From ac9752327546f1778bae0e6f7b2163c173ae5ee4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 26 Apr 2019 20:54:16 -0400
Subject: [PATCH 852/879] libshared: Upgraded to
 4178b49db1c5fed5006a4ab6aa2df3f9937f770b

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index aa4471478..4178b49db 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit aa4471478a88ad53ee8f087700726341a8a80157
+Subproject commit 4178b49db1c5fed5006a4ab6aa2df3f9937f770b

From da49dbdd846c94efbc222781765105a9d17553e7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 19 May 2019 11:43:21 +0300
Subject: [PATCH 853/879] Add TODOs to make zsh completion awesome

---
 scripts/zsh/_task | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 61b6df24c..a4c7caad8 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -23,12 +23,15 @@
 #
 # https://www.opensource.org/licenses/mit-license.php
 #
+
+# TODO: environment leakage! + these should be used dynamically and not only when this file is loaded
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
 _task_tags=($(task _tags))
 _task_zshids=( ${(f)"$(task _zshids)"} )
 _task_config=($(task _config))
 _task_columns=($(task _columns))
+# TODO: The 2 following can be static but not leak to environment as well
 _task_modifiers=(
   'before' \
   'after' \
@@ -56,6 +59,7 @@ _task_conjunctions=(
   '>=' \
   '>'
 )
+# TODO: as before
 _task_cmds=($(task _commands; task _aliases))
 _task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
 
@@ -167,6 +171,7 @@ _regex_words values 'task frequencies' \
   'y:years'
 _task_frequencies=("$reply[@]")
 
+# TODO: environment leakage! + values not calculated dynamically
 task_freqs=(
   \( "$_task_freqs[@]" \|
      \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
@@ -174,6 +179,7 @@ task_freqs=(
 )
 
 # attributes
+# TODO: This should include UDAs as well
 local -a task_attributes
 _regex_words -t ':' default 'task attributes' \
   'des*cription:Task description text' \
@@ -256,6 +262,7 @@ _task_subcommands() {
 ## first level completion => task sub-command completion
 (( $+functions[_task_default] )) ||
 _task_default() {
+  # TODO: Fix indentation
     local cmd ret=1
 
   integer i=1

From f04d66e10ba6d968da9ab85f1625622efcf60303 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 19 May 2019 11:44:05 +0300
Subject: [PATCH 854/879] Fix small TODO and move main function to bottom

---
 scripts/zsh/_task | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index a4c7caad8..20bbc4ecb 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -65,12 +65,6 @@ _task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
 
 _task_aliases=($(task _aliases))
 
-_task() {
-    _arguments -s -S \
-        "*::task default:_task_default"
-    return 0
-}
-
 local -a reply args word
 word=$'[^\0]#\0'
 
@@ -262,8 +256,7 @@ _task_subcommands() {
 ## first level completion => task sub-command completion
 (( $+functions[_task_default] )) ||
 _task_default() {
-  # TODO: Fix indentation
-    local cmd ret=1
+  local cmd ret=1
 
   integer i=1
   while (( i < $#words ))
@@ -289,4 +282,5 @@ _task_default() {
   return ret
 }
 
-_task "$@"
+_arguments -s -S \
+    "*::task default:_task_default"

From e1998346e117e102a158caaaca27f80f273b2b29 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 19 May 2019 23:02:42 +0300
Subject: [PATCH 855/879] Complete attributes dynamically incl UDAs

This is the major refinement of the completion: Most of it just moved
the global variables from up above to inside _task_filter so every array
of attributes will be calculated dynamically there.
---
 scripts/zsh/_task | 403 +++++++++++++++++++++++-----------------------
 1 file changed, 205 insertions(+), 198 deletions(-)

diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 20bbc4ecb..b0835c6c0 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -22,207 +22,205 @@
 # SOFTWARE.
 #
 # https://www.opensource.org/licenses/mit-license.php
-#
-
-# TODO: environment leakage! + these should be used dynamically and not only when this file is loaded
-typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
-_task_projects=($(task _projects))
-_task_tags=($(task _tags))
-_task_zshids=( ${(f)"$(task _zshids)"} )
-_task_config=($(task _config))
-_task_columns=($(task _columns))
-# TODO: The 2 following can be static but not leak to environment as well
-_task_modifiers=(
-  'before' \
-  'after' \
-  'none' \
-  'any' \
-  'is' \
-  'isnt' \
-  'has' \
-  'hasnt' \
-  'startswith' \
-  'endswith' \
-  'word' \
-  'noword'
-)
-_task_conjunctions=(
-  'and' \
-  'or' \
-  'xor' \
-  '\)' \
-  '\(' \
-  '<' \
-  '<=' \
-  '=' \
-  '!=' \
-  '>=' \
-  '>'
-)
-# TODO: as before
-_task_cmds=($(task _commands; task _aliases))
-_task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
-
-_task_aliases=($(task _aliases))
-
-local -a reply args word
-word=$'[^\0]#\0'
-
-# priorities
-local -a task_priorities
-_regex_words values 'task priorities' \
-  'H:High' \
-  'M:Middle' \
-  'L:Low'
-task_priorities=("$reply[@]")
-
-# projects
-local -a task_projects
-task_projects=(
-  /"$word"/
-  ":values:task projects:compadd -a _task_projects"
-)
-
-local -a _task_dates
-_regex_words values 'task dates' \
-  'tod*ay:Today' \
-  'yes*terday:Yesterday' \
-  'tom*orrow:Tomorrow' \
-  'sow:Start of week' \
-  'soww:Start of work week' \
-  'socw:Start of calendar week' \
-  'som:Start of month' \
-  'soq:Start of quarter' \
-  'soy:Start of year' \
-  'eow:End of week' \
-  'eoww:End of work week' \
-  'eocw:End of calendar week' \
-  'eom:End of month' \
-  'eoq:End of quarter' \
-  'eoy:End of year' \
-  'mon:Monday' \
-  'tue:Tuesday'\
-  'wed:Wednesday' \
-  'thu:Thursday' \
-  'fri:Friday' \
-  'sat:Saturday' \
-  'sun:Sunday' \
-  'good*friday:Good Friday' \
-  'easter:Easter' \
-  'eastermonday:Easter Monday' \
-  'ascension:Ascension' \
-  'pentecost:Pentecost' \
-  'midsommar:Midsommar' \
-  'midsommarafton:Midsommarafton' \
-  'later:Later' \
-  'someday:Some Day'
-_task_dates=("$reply[@]")
-
-local -a _task_reldates
-_regex_words values 'task reldates' \
-  'hrs:n hours' \
-  'day:n days' \
-  '1st:first' \
-  '2nd:second' \
-  '3rd:third' \
-  'th:4th, 5th, etc.' \
-  'wks:weeks'
-_task_reldates=("$reply[@]")
-
-task_dates=(
-  \( "$_task_dates[@]" \|
-    \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
-  \)
-)
-
-local -a task_zshids
-if (( $#_task_zshids )); then
-  _regex_words values 'task IDs' $_task_zshids
-  task_zshids=("$reply[@]")
-fi
-
-_regex_words values 'task frequencies' \
-  'daily:Every day' \
-  'day:Every day' \
-  'weekdays:Every day skipping weekend days' \
-  'weekly:Every week' \
-  'biweekly:Every two weeks' \
-  'fortnight:Every two weeks' \
-  'monthly:Every month' \
-  'quarterly:Every three months' \
-  'semiannual:Every six months' \
-  'annual:Every year' \
-  'yearly:Every year' \
-  'biannual:Every two years' \
-  'biyearly:Every two years'
-_task_freqs=("$reply[@]")
-
-local -a _task_frequencies
-_regex_words values 'task frequencies' \
-  'd:days' \
-  'w:weeks' \
-  'q:quarters' \
-  'y:years'
-_task_frequencies=("$reply[@]")
-
-# TODO: environment leakage! + values not calculated dynamically
-task_freqs=(
-  \( "$_task_freqs[@]" \|
-     \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
-  \)
-)
-
-# attributes
-# TODO: This should include UDAs as well
-local -a task_attributes
-_regex_words -t ':' default 'task attributes' \
-  'des*cription:Task description text' \
-  'status:Status of task - pending, completed, deleted, waiting' \
-  'pro*ject:Project name:$task_projects' \
-  'pri*ority:priority:$task_priorities' \
-  'du*e:Due date:$task_dates' \
-  're*cur:Recurrence frequency:$task_freqs' \
-  'un*til:Expiration date:$task_dates' \
-  'li*mit:Desired number of rows in report' \
-  'wa*it:Date until task becomes pending:$task_dates' \
-  'ent*ry:Date task was created:$task_dates' \
-  'end:Date task was completed/deleted:$task_dates' \
-  'st*art:Date task was started:$task_dates' \
-  'sc*heduled:Date task is scheduled to start:$task_dates' \
-  'dep*ends:Other tasks that this task depends upon:$task_zshids'
-task_attributes=("$reply[@]")
-
-args=(
-  \( "$task_attributes[@]" \|
-  \( /'(project|description|status|entry|end|start|scheduled|depends|due|wait|recur|priority|until|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
-  \( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
-  \( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
-  \( /"$word"/ \)
-  \) \#
-)
-_regex_arguments _task_attributes "${args[@]}"
-
-## task commands
 
 # filter completion
 (( $+functions[_task_filter] )) ||
 _task_filter() {
+
+  local -a reply
+  local word=$'[^\0]#\0'
+
+  # projects
+  local _task_projects=($(task _projects))
+  local task_projects=(
+    /"$word"/
+    ":values:task projects:compadd -a _task_projects"
+  )
+
+  _regex_words values 'task dates' \
+    'tod*ay:Today' \
+    'yes*terday:Yesterday' \
+    'tom*orrow:Tomorrow' \
+    'sow:Start of week' \
+    'soww:Start of work week' \
+    'socw:Start of calendar week' \
+    'som:Start of month' \
+    'soq:Start of quarter' \
+    'soy:Start of year' \
+    'eow:End of week' \
+    'eoww:End of work week' \
+    'eocw:End of calendar week' \
+    'eom:End of month' \
+    'eoq:End of quarter' \
+    'eoy:End of year' \
+    'mon:Monday' \
+    'tue:Tuesday'\
+    'wed:Wednesday' \
+    'thu:Thursday' \
+    'fri:Friday' \
+    'sat:Saturday' \
+    'sun:Sunday' \
+    'good*friday:Good Friday' \
+    'easter:Easter' \
+    'eastermonday:Easter Monday' \
+    'ascension:Ascension' \
+    'pentecost:Pentecost' \
+    'midsommar:Midsommar' \
+    'midsommarafton:Midsommarafton' \
+    'later:Later' \
+    'someday:Some Day'
+  local _task_dates=("$reply[@]")
+
+  _regex_words values 'task reldates' \
+    'hrs:n hours' \
+    'day:n days' \
+    '1st:first' \
+    '2nd:second' \
+    '3rd:third' \
+    'th:4th, 5th, etc.' \
+    'wks:weeks'
+  local _task_reldates=("$reply[@]")
+
+  local task_dates=(
+    \( "$_task_dates[@]" \|
+      \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
+    \)
+  )
+
+  # This data is a little bit differnt, it may contain any kind of character so
+  # we parse it manually and quote using '${(q)_desc}' the descriptions
+  local -a _task_zshids
+  local _id desc
+  task _zshids | while IFS=':' read _id desc; do
+    _task_zshids+=("$_id:${(qq)desc}")
+  done
+  _regex_words values 'task IDs' $_task_zshids
+  local task_zshids=("$reply[@]")
+
+  _regex_words values 'task frequencies' \
+    'daily:Every day' \
+    'day:Every day' \
+    'weekdays:Every day skipping weekend days' \
+    'weekly:Every week' \
+    'biweekly:Every two weeks' \
+    'fortnight:Every two weeks' \
+    'monthly:Every month' \
+    'quarterly:Every three months' \
+    'semiannual:Every six months' \
+    'annual:Every year' \
+    'yearly:Every year' \
+    'biannual:Every two years' \
+    'biyearly:Every two years'
+  local _task_freqs=("$reply[@]")
+
+  _regex_words values 'task frequencies' \
+    'd:days' \
+    'w:weeks' \
+    'q:quarters' \
+    'y:years'
+  local _task_frequencies=("$reply[@]")
+
+  local task_freqs=(
+    \( "$_task_freqs[@]" \|
+       \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
+    \)
+  )
+
+  # task statuses
+  local _task_statuses=(
+    pending
+    completed
+    deleted
+    waiting
+  )
+  _regex_words statuses 'task statuses' \
+    "${_task_statuses}"
+  local task_statuses=("${reply[@]}")
+
+  # attributes
+  local _task_all_attributes=(
+    'des*cription:Task description text'
+    'status:Status of task:$task_statuses'
+    'pro*ject:Project name:$task_projects'
+    'pri*ority:priority:$task_priorities'
+    'du*e:Due date:$task_dates'
+    're*cur:Recurrence frequency:$task_freqs'
+    'un*til:Expiration date:$task_dates'
+    'li*mit:Desired number of rows in report'
+    'wa*it:Date until task becomes pending:$task_dates'
+    'ent*ry:Date task was created:$task_dates'
+    'end:Date task was completed/deleted:$task_dates'
+    'st*art:Date task was started:$task_dates'
+    'sc*heduled:Date task is scheduled to start:$task_dates'
+    'depends:Other tasks that this task depends upon:$task_zshids'
+  )
+  ## add UDAs as attributes
+  local uda_name uda_label uda_values
+  local -a udas_spec
+  task _udas | while read uda_name; do
+    uda_label="$(task _get rc.uda."$uda_name".label)"
+    # TODO: we could have got the values of every uda and try to complete that
+    # but that can become extremly slow with a lot of udas
+    #uda_values=(${(@s:,:)"$(task _get rc.uda."$uda_name".values)"})
+    udas_spec+=("${uda_name}:${(q)uda_label}")
+  done
+  _task_all_attributes=("${_task_all_attributes[@]}" "${udas_spec[@]}")
+  _regex_words -t ':' default 'task attributes' "${_task_all_attributes[@]}"
+  local task_attributes=("$reply[@]")
+
+  local _task_tags=($(task _tags))
+  local _task_config=($(task _config))
+  local _task_modifiers=(
+    'before'
+    'after'
+    'none'
+    'any'
+    'is'
+    'isnt'
+    'has'
+    'hasnt'
+    'startswith'
+    'endswith'
+    'word'
+    'noword'
+  )
+  local _task_conjunctions=(
+    'and'
+    'or'
+    'xor'
+    '\)'
+    '\('
+    '<'
+    '<='
+    '='
+    '!='
+    '>='
+    '>'
+  )
+  _regex_arguments _task_attributes \
+    \( "${task_attributes[@]}" \| \
+    \( /'(project|description|status|entry|end|start|scheduled|depends|due|wait|recur|priority|until|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \| \
+    \( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \| \
+    \( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \| \
+    \( /"$word"/ \) \
+    \) \#
+
   _task_attributes "$@"
 
   # TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
   _describe -t default 'task conjunctions' _task_conjunctions
 }
 
-# execute completion
-(( $+functions[_task_execute] )) ||
-_task_execute() {
-  _files
-}
-
 # id-only completion
-(( $+functions[_task_id] )) ||
-_task_id() {
-  _describe -t values 'task IDs' _task_zshids
+(( $+functions[_task_ids] )) ||
+_task_ids() {
+  local _ids=( ${(f)"$(task _zshids)"} )
+  _describe 'task ids' _ids
+}
+(( $+functions[_task_aliases] )) ||
+_task_aliases() {
+  local _aliases=( ${(f)"$(task _aliases)"} )
+  _describe 'task aliases' _aliases
 }
 
 # subcommand-only function
@@ -233,6 +231,7 @@ _task_subcommands() {
   local cmd category desc
   local lastcategory=''
   # The list is sorted by category, in the right order.
+  local _task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
   for _zshcmd in "$_task_zshcmds[@]"; do
     # Parse out the three fields
     cmd=${_zshcmd%%:*}
@@ -253,30 +252,38 @@ _task_subcommands() {
   done
 }
 
+## contexts
+(( $+functions[_task_context] )) ||
+_task_context() {
+  local _contexts=(${(f)"$(task _context)"})
+  _describe 'task contexts' _contexts
+}
+
 ## first level completion => task sub-command completion
 (( $+functions[_task_default] )) ||
 _task_default() {
   local cmd ret=1
 
   integer i=1
+  local _task_cmds=($(task _commands; task _aliases))
   while (( i < $#words ))
   do
     cmd="${_task_cmds[(r)$words[$i]]}"
     if (( $#cmd )); then
-      _call_function ret _task_${cmd} ||
-        _call_function ret _task_filter ||
-          _message "No command remaining."
+      if (( $+functions[_task_${cmd}] )); then
+        _task_${cmd}
+        return ret
+      fi
+      _call_function ret _task_filter ||
+        _message "No command remaining."
       return ret
     fi
     (( i++ ))
   done
 
-  # update IDs
-  _task_zshids=( ${(f)"$(task _zshids)"} )
-
   _task_subcommands
-  _describe -t tasks 'task IDs' _task_zshids
-  _describe -t aliases 'task aliases' _task_aliases
+  # _task_ids
+  _task_aliases
   _call_function ret _task_filter
 
   return ret

From 82ed5d35b7d5994606873ccf1916e9af445d8b1c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 20 May 2019 00:38:27 +0300
Subject: [PATCH 856/879] Truely remove priority from hardcoded attrributes

---
 scripts/zsh/_task | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index b0835c6c0..3e60a7eff 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -142,7 +142,6 @@ _task_filter() {
     'des*cription:Task description text'
     'status:Status of task:$task_statuses'
     'pro*ject:Project name:$task_projects'
-    'pri*ority:priority:$task_priorities'
     'du*e:Due date:$task_dates'
     're*cur:Recurrence frequency:$task_freqs'
     'un*til:Expiration date:$task_dates'

From 04bc1a7998d0c26183df268f2be4d08e087e3acf Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Aug 2019 14:01:22 -0400
Subject: [PATCH 857/879] - Thanks to Adrien Lemaire.

---
 AUTHORS                  | 1 +
 ChangeLog                | 2 ++
 src/Task.cpp             | 1 +
 src/commands/CmdInfo.cpp | 7 ++++---
 src/commands/CmdTags.cpp | 7 ++++++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d72a80873..a04907448 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -336,3 +336,4 @@ suggestions:
   Martin F. Krafft
   tom-doerr
   ad-si
+  Adrien Lemaire
diff --git a/ChangeLog b/ChangeLog
index 2193146aa..c91784531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,8 @@
            Thanks to Janik Rabe
 - #2132    JSON encode/decode string UDAs
            Thanks to Chad Phillips
+- #2176    How to get the full list of tags ?
+           Thanks to Adrien Lemaire
 - Added 'juhannus' as a synonym for 'midsommarafton'
            Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/Task.cpp b/src/Task.cpp
index 98f0b3dae..84c6c41e1 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1255,6 +1255,7 @@ bool Task::hasTag (const std::string& tag) const
   // Note: This list must match that in ::feedback_reserved_tags.
   if (isupper (tag[0]))
   {
+    // NOTE: This list should be kept synchronized with the list in CmdTags.cpp for the _tags command.
     if (tag == "BLOCKED")   return is_blocked;
     if (tag == "UNBLOCKED") return !is_blocked;
     if (tag == "BLOCKING")  return is_blocking;
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 8d4633342..d28c5395f 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -307,11 +307,15 @@ int CmdInfo::execute (std::string& output)
       if (task.hasTag ("DELETED"))   virtualTags += "DELETED ";
       if (task.hasTag ("DUE"))       virtualTags += "DUE ";
       if (task.hasTag ("DUETODAY"))  virtualTags += "DUETODAY ";
+      if (task.hasTag ("LATEST"))    virtualTags += "LATEST ";
       if (task.hasTag ("MONTH"))     virtualTags += "MONTH ";
       if (task.hasTag ("ORPHAN"))    virtualTags += "ORPHAN ";
       if (task.hasTag ("OVERDUE"))   virtualTags += "OVERDUE ";
       if (task.hasTag ("PARENT"))    virtualTags += "PARENT ";
       if (task.hasTag ("PENDING"))   virtualTags += "PENDING ";
+      if (task.hasTag ("PRIORITY"))  virtualTags += "PRIORITY ";
+      if (task.hasTag ("PROJECT"))   virtualTags += "PROJECT ";
+      if (task.hasTag ("QUARTER"))   virtualTags += "QUARTER ";
       if (task.hasTag ("READY"))     virtualTags += "READY ";
       if (task.hasTag ("SCHEDULED")) virtualTags += "SCHEDULED ";
       if (task.hasTag ("TAGGED"))    virtualTags += "TAGGED ";
@@ -324,9 +328,6 @@ int CmdInfo::execute (std::string& output)
       if (task.hasTag ("WEEK"))      virtualTags += "WEEK ";
       if (task.hasTag ("YEAR"))      virtualTags += "YEAR ";
       if (task.hasTag ("YESTERDAY")) virtualTags += "YESTERDAY ";
-      if (task.hasTag ("LATEST"))    virtualTags += "LATEST ";
-      if (task.hasTag ("PROJECT"))   virtualTags += "PROJECT ";
-      if (task.hasTag ("PRIORITY"))  virtualTags += "PRIORITY ";
       // If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well.
 
       row = view.addRow ();
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index c5d64ca80..110257194 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -189,11 +189,15 @@ int CmdCompletionTags::execute (std::string& output)
   unique["DELETED"]   = 0;
   unique["DUE"]       = 0;
   unique["DUETODAY"]  = 0;
+  unique["LATEST"]    = 0;
   unique["MONTH"]     = 0;
   unique["ORPHAN"]    = 0;
   unique["OVERDUE"]   = 0;
   unique["PARENT"]    = 0;
   unique["PENDING"]   = 0;
+  unique["PRIORITY"]  = 0;
+  unique["PROJECT"]   = 0;
+  unique["QUARTER"]   = 0;
   unique["READY"]     = 0;
   unique["SCHEDULED"] = 0;
   unique["TAGGED"]    = 0;
@@ -206,7 +210,8 @@ int CmdCompletionTags::execute (std::string& output)
   unique["WEEK"]      = 0;
   unique["YEAR"]      = 0;
   unique["YESTERDAY"] = 0;
-  // If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well.
+
+  // If you update the above list, update src/commands/CmdInfo.cpp and src/Task.cpp as well.
 
   std::stringstream out;
   for (auto& it : unique)

From e186d375dccda6b44bd72e900c900e0dd36a56cd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Aug 2019 19:57:52 -0400
Subject: [PATCH 858/879] Issue 2091: duration of task is set to a wrong and
 extremely big value

- Thanks to Wray Zheng.
---
 AUTHORS          |  1 +
 ChangeLog        |  2 ++
 src/feedback.cpp | 12 ++++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a04907448..7e85d72c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -337,3 +337,4 @@ suggestions:
   tom-doerr
   ad-si
   Adrien Lemaire
+  Wray Zheng
diff --git a/ChangeLog b/ChangeLog
index c91784531..face46372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,8 @@
            Thanks to Chad Phillips
 - #2176    How to get the full list of tags ?
            Thanks to Adrien Lemaire
+- #2091    duration of task is set to a wrong and extremely big value
+           Thanks to Wray Zheng
 - Added 'juhannus' as a synonym for 'midsommarafton'
            Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 8cdf6a5c1..419dc72ce 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -170,10 +170,14 @@ std::string taskInfoDifferences (
     }
     else if (name == "start")
     {
-      out << format ("{1} deleted (duration: {2}).",
-                     Lexer::ucFirst (name),
-                     Duration (current_timestamp - last_timestamp).format ())
-          << "\n";
+      if (last_timestamp > 0)
+        out << format ("{1} deleted (duration: {2}).",
+                       Lexer::ucFirst (name),
+                       Duration (current_timestamp - last_timestamp).format ())
+            << "\n";
+      else
+        out << format ("{1} deleted.", Lexer::ucFirst (name))
+            << "\n";
     }
     else
     {

From 10b64adb58988ec8d67891601ef394651fbc7bef Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Fri, 18 Sep 2020 00:24:47 -0400
Subject: [PATCH 859/879] CmdAdd: Make sure a UUID is printed if ID does not
 exist

This fixes a regression was introduced in
4e80d5d5fdb317f746a902ba83c891d7b20fe44f.

Currently, if a user (with default configuration) adds a completed or
deleted task, they do not get a confirmation message ("Created task
..."). This is due to the fact that:
a) new-uuid is not set by default
b) new-id is set by default, but only prints message if the added task
   is in pending or waiting state

Make sure to print a message containing UUID reference if the newly
added task is in completed or deleted state.
---
 src/commands/CmdAdd.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index de9eef8ac..e76d68ac2 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -63,13 +63,15 @@ int CmdAdd::execute (std::string& output)
   // asked for this if they just wanted a human-friendly number.
 
   if (Context::getContext ().verbose ("new-uuid") &&
-           status != Task::recurring)
-    output += format ("Created task {1}.\n", task.get ("uuid"));
-
-  else if (Context::getContext ().verbose ("new-uuid") &&
            status == Task::recurring)
     output += format ("Created task {1} (recurrence template).\n", task.get ("uuid"));
 
+  else if (Context::getContext ().verbose ("new-uuid") ||
+          (Context::getContext ().verbose ("new-id") &&
+            (status == Task::completed ||
+             status == Task::deleted)))
+    output += format ("Created task {1}.\n", task.get ("uuid"));
+
   else if (Context::getContext ().verbose ("new-id") &&
       (status == Task::pending ||
        status == Task::waiting))

From 4ae73ba87157f9c84d00706f632079d21a8ff814 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 Nov 2020 17:36:01 -0500
Subject: [PATCH 860/879] Updated libshared for bug fix

---
 src/libshared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libshared b/src/libshared
index 4178b49db..459ea5992 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 4178b49db1c5fed5006a4ab6aa2df3f9937f770b
+Subproject commit 459ea5992bef93d3bb7975d83634cd1deeed7f48

From 47298767148226a60936865f59f05ec4351c2117 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 20 Nov 2020 17:47:13 -0500
Subject: [PATCH 861/879] Updated build to use C++17 by default

---
 cmake/CXXSniffer.cmake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake
index 4fe1e6e90..a2d0ba222 100644
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -1,15 +1,15 @@
-message ("-- Configuring C++14")
+message ("-- Configuring C++17")
 message ("-- System: ${CMAKE_SYSTEM_NAME}")
 
 include (CheckCXXCompilerFlag)
 
-CHECK_CXX_COMPILER_FLAG("-std=c++14"   _HAS_CXX14)
+CHECK_CXX_COMPILER_FLAG("-std=c++17"   _HAS_CXX17)
 
-if (_HAS_CXX14)
-  set (_CXX14_FLAGS "-std=c++14")
-else (_HAS_CXX14)
- message (FATAL_ERROR "C++14 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
-endif (_HAS_CXX14)
+if (_HAS_CXX17)
+  set (_CXX14_FLAGS "-std=c++17")
+else (_HAS_CXX17)
+ message (FATAL_ERROR "C++17 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
+endif (_HAS_CXX17)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (LINUX true)

From 3855ba9136e007828e997cd993ca43db9f626f93 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 21 Nov 2020 00:25:58 -0500
Subject: [PATCH 862/879] travis: Disable testing on gentoo

We would love to test on gentoo, but this currently breaks CI. Open to
community contributions to improve our coverage of this distrubition.
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08c092ad7..b72147f9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,6 @@ sudo: required
 language: generic
 matrix:
   include:
-    - name: "Gentoo (latest)"
-      os: linux
-      env: CONTAINER=gentoo
-      services: docker
     - name: "Centos 7"
       os: linux
       env: CONTAINER=centos7

From 720c561b75e687d87dc683b924a37295224a7811 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 21 Nov 2020 12:38:10 -0500
Subject: [PATCH 863/879] tests: Use updated Thread object API

Replace isAlive with is_alive as the former is no longer supported in
Python 3.9.
---
 test/basetest/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 200066c94..12e5bd975 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -160,7 +160,7 @@ def _retrieve_output(thread, timeout, queue, thread_error):
     """
     # Try to join the thread on failure abort
     thread.join(timeout)
-    if thread.isAlive():
+    if thread.is_alive():
         # Join should have killed the thread. This is unexpected
         raise TimeoutWaitingFor(thread_error + ". Unexpected error")
 

From 52c49169b4fb0b9445bd22a522d3bbef30fd42e3 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 21 Nov 2020 12:39:03 -0500
Subject: [PATCH 864/879] tests: Use updated unittest methods

---
 test/abbreviation.t            |  2 +-
 test/alias.t                   |  6 +--
 test/annotate.t                | 24 ++++++------
 test/append.t                  |  6 +--
 test/calc.t                    | 10 ++---
 test/calendar.t                |  2 +-
 test/color.cmd.t               |  6 +--
 test/columns.t                 | 72 +++++++++++++++++-----------------
 test/commands.t                | 12 +++---
 test/custom.t                  |  2 +-
 test/custom.tag_ind.t          |  6 +--
 test/date.iso.t                |  4 +-
 test/default.t                 |  2 +-
 test/diag.t                    |  4 +-
 test/dom2.t                    | 16 ++++----
 test/due.t                     |  4 +-
 test/duplicate.t               |  2 +-
 test/encoding.t                |  4 +-
 test/enpassant.t               | 18 ++++-----
 test/export.t                  |  2 +-
 test/feature.559.t             |  2 +-
 test/feature.default.project.t | 12 +++---
 test/feature.recurrence.t      |  4 +-
 test/format.t                  | 60 ++++++++++++++--------------
 test/gc.t                      |  8 ++--
 test/helpers.t                 |  4 +-
 test/history.t                 | 56 +++++++++++++-------------
 test/hooks.env.t               |  2 +-
 test/ids.t                     | 16 ++++----
 test/import.t                  |  8 ++--
 test/info.t                    | 38 +++++++++---------
 test/logo.t                    |  2 +-
 test/project.t                 | 66 +++++++++++++++----------------
 test/rc.override.t             |  4 +-
 test/recurrence.t              | 16 ++++----
 test/sequence.t                |  2 +-
 test/sorting.t                 |  4 +-
 test/special.t                 |  2 +-
 test/stats.t                   | 10 ++---
 test/template.t                |  6 +--
 test/timesheet.t               |  4 +-
 test/tw-1379.t                 | 22 +++++------
 test/tw-1837.t                 |  4 +-
 test/uda.t                     | 32 +++++++--------
 test/uda_orphan.t              |  4 +-
 test/uda_sort.t                |  2 +-
 test/undo.t                    |  8 ++--
 test/upgrade.t                 | 10 ++---
 test/verbose.t                 | 14 +++----
 test/version.t                 |  4 +-
 50 files changed, 315 insertions(+), 315 deletions(-)

diff --git a/test/abbreviation.t b/test/abbreviation.t
index 600bc18b4..44acccb3e 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -109,7 +109,7 @@ class TestBug1006(TestCase):
 
         expected = "Description +des\n"
         errormsg = "Attribute not completed in description"
-        self.assertRegexpMatches(out, expected, msg=errormsg)
+        self.assertRegex(out, expected, msg=errormsg)
 
         notexpected = "description"
         self.assertNotIn(notexpected, out, msg=errormsg)
diff --git a/test/alias.t b/test/alias.t
index e4e54bfae..4898e343d 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -172,7 +172,7 @@ class TestBug1031(TestCase):
         code, out, err = self.t("1 info")
 
         expected = "Description\s+to"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_alias_to_to(self):
         """1031: alias working as expected: 'from -- to' -> 'to to'"""
@@ -180,7 +180,7 @@ class TestBug1031(TestCase):
         code, out, err = self.t("1 info")
 
         expected = "Description\s+to to"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_alias_to_from(self):
         """1031: alias working as expected: 'to -- from' -> 'to from'"""
@@ -188,7 +188,7 @@ class TestBug1031(TestCase):
         code, out, err = self.t("1 info")
 
         expected = "Description\s+to from"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
 
 class Test1445(TestCase):
diff --git a/test/annotate.t b/test/annotate.t
index 1acc879d2..a233bbe4b 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -87,17 +87,17 @@ class TestAnnotate(TestCase):
 
         self.assertTasksExist(out)
 
-        self.assertRegexpMatches(out, "one\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo1",
+        self.assertRegex(out, "one\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo1",
                                  msg='full - first  annotation task 1')
-        self.assertRegexpMatches(out, "foo1\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo2",
+        self.assertRegex(out, "foo1\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo2",
                                  msg='full - first  annotation task 1')
-        self.assertRegexpMatches(out, "foo2\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo3",
+        self.assertRegex(out, "foo2\n.+\d{1,2}/\d{1,2}/\d{4}\s+foo3",
                                  msg='full - first  annotation task 1')
-        self.assertRegexpMatches(out, "two\n.+\d{1,2}/\d{1,2}/\d{4}\s+bar1",
+        self.assertRegex(out, "two\n.+\d{1,2}/\d{1,2}/\d{4}\s+bar1",
                                  msg='full - first  annotation task 1')
-        self.assertRegexpMatches(out, "bar1\n.+\d{1,2}/\d{1,2}/\d{4}\s+bar2",
+        self.assertRegex(out, "bar1\n.+\d{1,2}/\d{1,2}/\d{4}\s+bar2",
                                  msg='full - first  annotation task 1')
-        self.assertRegexpMatches(out, "three\n.+\d{1,2}/\d{1,2}/\d{4}\s+baz1",
+        self.assertRegex(out, "three\n.+\d{1,2}/\d{1,2}/\d{4}\s+baz1",
                                  msg='full - first  annotation task 1')
 
     def test_annotate_dateformat(self):
@@ -114,17 +114,17 @@ class TestAnnotate(TestCase):
 
         self.assertTasksExist(out)
 
-        self.assertRegexpMatches(out, "one\n.+\d{1,6}\s+\d{1,6}\s+foo1",
+        self.assertRegex(out, "one\n.+\d{1,6}\s+\d{1,6}\s+foo1",
                                  msg="dateformat - first  annotation task 1")
-        self.assertRegexpMatches(out, "foo1\n.+\d{1,6}\s+\d{1,6}\s+foo2",
+        self.assertRegex(out, "foo1\n.+\d{1,6}\s+\d{1,6}\s+foo2",
                                  msg="dateformat - second  annotation task 1")
-        self.assertRegexpMatches(out, "foo2\n.+\d{1,6}\s+\d{1,6}\s+foo3",
+        self.assertRegex(out, "foo2\n.+\d{1,6}\s+\d{1,6}\s+foo3",
                                  msg="dateformat - third  annotation task 1")
-        self.assertRegexpMatches(out, "two\n.+\d{1,6}\s+\d{1,6}\s+bar1",
+        self.assertRegex(out, "two\n.+\d{1,6}\s+\d{1,6}\s+bar1",
                                  msg="dateformat - first  annotation task 2")
-        self.assertRegexpMatches(out, "bar1\n.+\d{1,6}\s+\d{1,6}\s+bar2",
+        self.assertRegex(out, "bar1\n.+\d{1,6}\s+\d{1,6}\s+bar2",
                                  msg="dateformat - second  annotation task 2")
-        self.assertRegexpMatches(out, "three\n.+\d{1,6}\s+\d{1,6}\s+baz1",
+        self.assertRegex(out, "three\n.+\d{1,6}\s+\d{1,6}\s+baz1",
                                  msg="dateformat - first  annotation task 3")
 
 class TestAnnotationPropagation(TestCase):
diff --git a/test/append.t b/test/append.t
index 1179aa995..70e03aadf 100755
--- a/test/append.t
+++ b/test/append.t
@@ -51,7 +51,7 @@ class TestAppend(TestCase):
         code, out, err = self.t("info 1")
 
         expected = "Description\s+foo\sbar\n"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_append_error_on_empty(self):
         """Should cause an error when nothing is appended"""
@@ -82,10 +82,10 @@ class TestBug440(TestCase):
         code2, out2, err2 = self.t("2 ls")
 
         self.assertNotIn("Foo", out1)
-        self.assertRegexpMatches(out1, "\w+ Appendtext")
+        self.assertRegex(out1, "\w+ Appendtext")
 
         self.assertNotIn("Foo", out2)
-        self.assertRegexpMatches(out2, "\w+ Appendtext")
+        self.assertRegex(out2, "\w+ Appendtext")
 
 
 if __name__ == "__main__":
diff --git a/test/calc.t b/test/calc.t
index 8a4d8cea2..816810845 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -51,7 +51,7 @@ class TestCalc(TestCase):
         self.assertIn("Eval literal number ↑'3600'", out)
         self.assertIn("Eval literal number ↑'60'", out)
         self.assertIn("Eval literal number ↑'56'", out)
-        self.assertRegexpMatches(out, re.compile("^45296$", re.MULTILINE))
+        self.assertRegex(out, re.compile("^45296$", re.MULTILINE))
         self.assertNotIn("Error", out)
         self.assertNotIn("Error", err)
 
@@ -63,7 +63,7 @@ class TestCalc(TestCase):
         self.assertIn("Eval literal number ↑'3600'", out)
         self.assertIn("Eval literal number ↑'60'", out)
         self.assertIn("Eval literal number ↑'56'", out)
-        self.assertRegexpMatches(out, re.compile("^45296$", re.MULTILINE))
+        self.assertRegex(out, re.compile("^45296$", re.MULTILINE))
         self.assertNotIn("Error", out)
         self.assertNotIn("Error", err)
 
@@ -74,7 +74,7 @@ class TestCalc(TestCase):
         self.assertIn("Eval literal number ↑'2'", out)
         self.assertIn("Eval _neg_ ↓'3' → ↑'-3'", out)
         self.assertIn("Eval literal number ↑'2'", out)
-        self.assertRegexpMatches(out, re.compile("^5$", re.MULTILINE))
+        self.assertRegex(out, re.compile("^5$", re.MULTILINE))
         self.assertNotIn("Error", out)
         self.assertNotIn("Error", err)
 
@@ -90,7 +90,7 @@ class TestCalc(TestCase):
         """version"""
         code, out, err = run_cmd_wait_nofail((CALC, "--version"))
 
-        self.assertRegexpMatches(out, "calc \d\.\d+\.\d+")
+        self.assertRegex(out, "calc \d\.\d+\.\d+")
         self.assertIn("Copyright", out)
         self.assertGreaterEqual(code, 1)
 
@@ -103,7 +103,7 @@ class TestCalc(TestCase):
         self.assertNotIn("Error: Unexpected stack size: 2", out)
         self.assertNotIn("Error: Unexpected stack size: 2", err)
         self.assertIn("Eval literal duration ↑'PT15M'", out)
-        self.assertRegexpMatches(out, re.compile("^PT15M$", re.MULTILINE))
+        self.assertRegex(out, re.compile("^PT15M$", re.MULTILINE))
 
 
 class TestBug1254(TestCase):
diff --git a/test/calendar.t b/test/calendar.t
index 2249c6d95..e4a761d9f 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -58,7 +58,7 @@ class TestCalendarCommandLine(TestCase):
     def test_basic_command_color(self):
         """Verify 'calendar rc._forcecolor:on' does not fail"""
         code, out, err = self.t("calendar rc._forcecolor:on")
-        self.assertRegexpMatches(out, "Su.+Mo.+Tu.+We.+Th.+Fr.+Sa")
+        self.assertRegex(out, "Su.+Mo.+Tu.+We.+Th.+Fr.+Sa")
 
     def test_basic_command_details(self):
         """Verify 'calendar rc.calendar.details:full rc.calendar.details.report:list' does not fail"""
diff --git a/test/color.cmd.t b/test/color.cmd.t
index d4dd1d791..28764dd46 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -63,17 +63,17 @@ class TestColorCommand(TestCase):
     def test_colors_sample(self):
         """ Verify 'task colors red' shows a sample"""
         code, out, err = self.t("colors rc._forcecolor:on red")
-        self.assertRegexpMatches(out, "Your sample:\n\n  .\[31mtask color red.\[0m")
+        self.assertRegex(out, "Your sample:\n\n  .\[31mtask color red.\[0m")
 
     def test_colors_legend(self):
         """ Verify 'task colors legend' shows theme colors"""
         code, out, err = self.t("colors rc._forcecolor:on legend")
-        self.assertRegexpMatches(out, "color.debug\s+.\[0m\s.\[38;5;4mcolor4\s+.\[0m")
+        self.assertRegex(out, "color.debug\s+.\[0m\s.\[38;5;4mcolor4\s+.\[0m")
 
     def test_colors_legend_override(self):
         """Verify 'task colors legend' obeys rc overrides"""
         code, out, err = self.t("colors rc._forcecolor:on rc.color.debug:red legend")
-        self.assertRegexpMatches(out, "color.debug\s+.\[0m\s.\[31mred\s+.\[0m")
+        self.assertRegex(out, "color.debug\s+.\[0m\s.\[31mred\s+.\[0m")
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/columns.t b/test/columns.t
index 16307e3cc..5456457f1 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -54,7 +54,7 @@ class TestDescriptionFormats(TestCase):
         """Verify formatting of 'description.combined' column"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,description.combined")
         self.assertIn("one long description to exceed a certain string size", out)
-        self.assertRegexpMatches(out, r"\d{4}-\d{2}-\d{2} annotation")
+        self.assertRegex(out, r"\d{4}-\d{2}-\d{2} annotation")
         self.assertNotIn("[1]", out)
 
     def test_description_desc(self):
@@ -66,7 +66,7 @@ class TestDescriptionFormats(TestCase):
     def test_description_oneline(self):
         """Verify formatting of 'description.oneline' column"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,description.oneline")
-        self.assertRegexpMatches(out, r"one long description to exceed a certain string size \d{4}-\d{2}-\d{2}")
+        self.assertRegex(out, r"one long description to exceed a certain string size \d{4}-\d{2}-\d{2}")
         self.assertIn("annotation", out)
         self.assertNotIn("[1]", out)
 
@@ -243,14 +243,14 @@ class TestRecurringAttributeFormats(TestCase):
     def test_recurrence_formats_short(self):
         """Verify formatting of assorted short recurrence columns"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,status,due,recur.indicator,mask,imask,parent.short")
-        self.assertRegexpMatches(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+R\s+-")
-        self.assertRegexpMatches(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+R\s+0\s+[0-9a-fA-F]{8}")
+        self.assertRegex(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+R\s+-")
+        self.assertRegex(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+R\s+0\s+[0-9a-fA-F]{8}")
 
     def test_recurrence_formats_long(self):
         """Verify formatting of assorted long recurrence columns"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,status,due,recur.duration,mask,imask,parent.long")
-        self.assertRegexpMatches(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+P30D\s+-")
-        self.assertRegexpMatches(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+P30D\s+0\s+[0-9a-fA-F-]{36}")
+        self.assertRegex(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+P30D\s+-")
+        self.assertRegex(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+P30D\s+0\s+[0-9a-fA-F-]{36}")
 
     def test_recurrence_format_unrecognized(self):
         """Verify *.donkey formatting fails"""
@@ -279,23 +279,23 @@ class TestProjectFormats(TestCase):
     def test_project_format_full(self):
         """Verify project.full formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,project.full,description")
-        self.assertRegexpMatches(out, r'1\s+TOP\s+one')
-        self.assertRegexpMatches(out, r'2\s+TOP.MIDDLE\s+two')
-        self.assertRegexpMatches(out, r'3\s+TOP.MIDDLE.BOTTOM\s+three')
+        self.assertRegex(out, r'1\s+TOP\s+one')
+        self.assertRegex(out, r'2\s+TOP.MIDDLE\s+two')
+        self.assertRegex(out, r'3\s+TOP.MIDDLE.BOTTOM\s+three')
 
     def test_project_format_parent(self):
         """Verify project.parent formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,project.parent,description")
-        self.assertRegexpMatches(out, r'1\s+TOP\s+one')
-        self.assertRegexpMatches(out, r'2\s+TOP\s+two')
-        self.assertRegexpMatches(out, r'3\s+TOP\s+three')
+        self.assertRegex(out, r'1\s+TOP\s+one')
+        self.assertRegex(out, r'2\s+TOP\s+two')
+        self.assertRegex(out, r'3\s+TOP\s+three')
 
     def test_project_format_indented(self):
         """Verify project.indented formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,project.indented,description")
-        self.assertRegexpMatches(out, r'1\s+TOP\s+one')
-        self.assertRegexpMatches(out, r'2\s+MIDDLE\s+two')
-        self.assertRegexpMatches(out, r'3\s+BOTTOM\s+three')
+        self.assertRegex(out, r'1\s+TOP\s+one')
+        self.assertRegex(out, r'2\s+MIDDLE\s+two')
+        self.assertRegex(out, r'3\s+BOTTOM\s+three')
 
     def test_project_format_unrecognized(self):
         """Verify project.donkey formatting fails"""
@@ -316,17 +316,17 @@ class TestTagsFormats(TestCase):
     def test_tags_format_list(self):
         """Verify tags.list formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,tags.list")
-        self.assertRegexpMatches(out, r'1\s+tag1\stag2$')
+        self.assertRegex(out, r'1\s+tag1\stag2$')
 
     def test_tags_format_indicator(self):
         """Verify tags.indicator formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,tags.indicator")
-        self.assertRegexpMatches(out, r'1\s+\+$')
+        self.assertRegex(out, r'1\s+\+$')
 
     def test_tags_format_count(self):
         """Verify tags.count formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,tags.count")
-        self.assertRegexpMatches(out, r'1\s+\[2\]$')
+        self.assertRegex(out, r'1\s+\[2\]$')
 
     def test_tags_format_unrecognized(self):
         """Verify tags.donkey formatting fails"""
@@ -348,50 +348,50 @@ class TestDateFormats(TestCase):
     def test_date_format_formatted(self):
         """Verify due.formatted formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.formatted")
-        self.assertRegexpMatches(out, r'1\s+\d{4}-\d{2}-\d{2}')
-        self.assertRegexpMatches(out, r'2\s+\d{4}-\d{2}-\d{2}')
+        self.assertRegex(out, r'1\s+\d{4}-\d{2}-\d{2}')
+        self.assertRegex(out, r'2\s+\d{4}-\d{2}-\d{2}')
 
     def test_date_format_julian(self):
         """Verify due.julian formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.julian")
-        self.assertRegexpMatches(out, r'1\s+\d+\.\d+')
-        self.assertRegexpMatches(out, r'2\s+\d+\.\d+')
+        self.assertRegex(out, r'1\s+\d+\.\d+')
+        self.assertRegex(out, r'2\s+\d+\.\d+')
 
     def test_date_format_epoch(self):
         """Verify due.epoch formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.epoch")
-        self.assertRegexpMatches(out, r'1\s+\d{10}')
-        self.assertRegexpMatches(out, r'2\s+\d{10}')
+        self.assertRegex(out, r'1\s+\d{10}')
+        self.assertRegex(out, r'2\s+\d{10}')
 
     def test_date_format_iso(self):
         """Verify due.iso formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.iso")
-        self.assertRegexpMatches(out, r'1\s+\d{8}T\d{6}Z')
-        self.assertRegexpMatches(out, r'2\s+\d{8}T\d{6}Z')
+        self.assertRegex(out, r'1\s+\d{8}T\d{6}Z')
+        self.assertRegex(out, r'2\s+\d{8}T\d{6}Z')
 
     def test_date_format_age(self):
         """Verify due.age formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.age")
-        self.assertRegexpMatches(out, r'1\s+[0-9.]+d')
-        self.assertRegexpMatches(out, r'2\s+-[0-9.]+[hmin]+')
+        self.assertRegex(out, r'1\s+[0-9.]+d')
+        self.assertRegex(out, r'2\s+-[0-9.]+[hmin]+')
 
     def test_date_format_remaining(self):
         """Verify due.remaining formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.remaining")
-        self.assertRegexpMatches(out, r'1')
-        self.assertRegexpMatches(out, r'2\s+\d+\S+')
+        self.assertRegex(out, r'1')
+        self.assertRegex(out, r'2\s+\d+\S+')
 
     def test_date_format_relative(self):
         """Verify due.relative formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.relative")
-        self.assertRegexpMatches(out, r'1\s+-[0-9.]+d')
-        self.assertRegexpMatches(out, r'2\s+[0-9.]+[hmin]+')
+        self.assertRegex(out, r'1\s+-[0-9.]+d')
+        self.assertRegex(out, r'2\s+[0-9.]+[hmin]+')
 
     def test_date_format_countdown(self):
         """Verify due.countdown formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.countdown")
-        self.assertRegexpMatches(out, r'1\s+\d+\S+')
-        self.assertRegexpMatches(out, r'2\s+')
+        self.assertRegex(out, r'1\s+\d+\S+')
+        self.assertRegex(out, r'2\s+')
 
     def test_date_format_unrecognized(self):
         """Verify due.donkey formatting fails"""
@@ -430,12 +430,12 @@ class TestUDAFormats(TestCase):
     def test_uda_format_formatted(self):
         """Verify priority.default formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,priority.default")
-        self.assertRegexpMatches(out, r'1\s+H')
+        self.assertRegex(out, r'1\s+H')
 
     def test_uda_format_indicator(self):
         """Verify priority.indicator formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,priority.indicator")
-        self.assertRegexpMatches(out, r'1\s+P')
+        self.assertRegex(out, r'1\s+P')
 
     def test_uda_format_unrecognized(self):
         """Verify priority.donkey formatting fails"""
diff --git a/test/commands.t b/test/commands.t
index d143b831a..21f1c21a0 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -42,16 +42,16 @@ class TestCommands(TestCase):
     def test_command_dna(self):
         """Verify 'add', 'modify', 'list' dna"""
         code, out, err = self.t("commands")
-        self.assertRegexpMatches(out, "add\s+operation\s+RW\s+Mods\s+Adds a new task")
-        self.assertRegexpMatches(out, "list\s+report\s+RO\s+ID\s+GC\s+Ctxt\s+Filt\s+Most details of")
-        self.assertRegexpMatches(out, "modify\s+operation\s+RW\s+Filt\s+Mods\s+Modifies the")
+        self.assertRegex(out, "add\s+operation\s+RW\s+Mods\s+Adds a new task")
+        self.assertRegex(out, "list\s+report\s+RO\s+ID\s+GC\s+Ctxt\s+Filt\s+Most details of")
+        self.assertRegex(out, "modify\s+operation\s+RW\s+Filt\s+Mods\s+Modifies the")
 
     def test_command_dna_color(self):
         """Verify 'add', 'modify', 'list' dna"""
         code, out, err = self.t("commands rc._forcecolor:on")
-        self.assertRegexpMatches(out, "add\s+operation\s+RW\s+Mods\s+Adds a new task")
-        self.assertRegexpMatches(out, "list\s+report\s+RO\s+ID\s+GC\s+Ctxt\s+Filt\s+Most details of")
-        self.assertRegexpMatches(out, "modify\s+operation\s+RW\s+Filt\s+Mods\s+Modifies the")
+        self.assertRegex(out, "add\s+operation\s+RW\s+Mods\s+Adds a new task")
+        self.assertRegex(out, "list\s+report\s+RO\s+ID\s+GC\s+Ctxt\s+Filt\s+Most details of")
+        self.assertRegex(out, "modify\s+operation\s+RW\s+Filt\s+Mods\s+Modifies the")
 
 
 if __name__ == "__main__":
diff --git a/test/custom.t b/test/custom.t
index 3ae702bca..9fd0c876a 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -48,7 +48,7 @@ class TestCustomReports(TestCase):
     def test_custom_report_help(self):
         """Verify custom report description is shown in help"""
         code, out, err = self.t("help")
-        self.assertRegexpMatches(out, "task <filter> foo\s+DESC\n")
+        self.assertRegex(out, "task <filter> foo\s+DESC\n")
 
     def test_custom_filter(self):
         """Verify custome report filtr is applied"""
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index ed8217918..bcc2fef0a 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -51,13 +51,13 @@ class TestCustomTagIndicator(TestCase):
     def test_default_indicator(self):
         """Verify default tag indicator (+) is shown"""
         code, out, err = self.t("foo")
-        self.assertRegexpMatches(out, "ID.+T")
-        self.assertRegexpMatches(out, "1\s+\+")
+        self.assertRegex(out, "ID.+T")
+        self.assertRegex(out, "1\s+\+")
 
     def test_custom_indicator(self):
         """Verify custom tag indicator (TAG) is shown"""
         code, out, err = self.t("rc.tag.indicator:TAG foo")
-        self.assertRegexpMatches(out, "1\s+TAG")
+        self.assertRegex(out, "1\s+TAG")
 
 
 if __name__ == "__main__":
diff --git a/test/date.iso.t b/test/date.iso.t
index 96c1c20da..802c7637b 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -47,7 +47,7 @@ class TestDateISOAndEpoch(TestCase):
         # Partial date, because _get returns local time, and that would make
         # the test sensitive to TZ.
         code, out, err = self.t("_get 1.due")
-        self.assertRegexpMatches(out, "^2015-07-0.T..:..:..$")
+        self.assertRegex(out, "^2015-07-0.T..:..:..$")
 
     def test_epoch(self):
         """Verify adding epoch dates works regardless of rc.dateformat"""
@@ -56,7 +56,7 @@ class TestDateISOAndEpoch(TestCase):
         # Partial date, because _get returns local time, and that would make
         # the test sensitive to TZ.
         code, out, err = self.t("_get 1.due")
-        self.assertRegexpMatches(out, "^2009-02-1.T..:..:..$")
+        self.assertRegex(out, "^2009-02-1.T..:..:..$")
 
 
 if __name__ == "__main__":
diff --git a/test/default.t b/test/default.t
index cef949255..1ed4e2679 100755
--- a/test/default.t
+++ b/test/default.t
@@ -52,7 +52,7 @@ class TestCMD(TestCase):
     def test_info_command(self):
         """info command"""
         code, out, err = self.t('1')
-        self.assertRegexpMatches(out, 'Description\s+one')
+        self.assertRegex(out, 'Description\s+one')
 
 
 class TestDefaults(TestCase):
diff --git a/test/diag.t b/test/diag.t
index 953b84cc5..803a54f54 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -48,8 +48,8 @@ class TestDiagnostics(TestCase):
         self.t.activate_hooks()
         code, out, err = self.t.diag()
         self.tap(out)
-        self.assertRegexpMatches(out, "Compliance:\s+C\+\+14")
-        self.assertRegexpMatches(out, "libgnutls:\s+\d+\.\d+\.\d+")
+        self.assertRegex(out, "Compliance:\s+C\+\+14")
+        self.assertRegex(out, "libgnutls:\s+\d+\.\d+\.\d+")
         self.assertIn("edlin", out)
         self.assertIn("strict", out)
 
diff --git a/test/dom2.t b/test/dom2.t
index 40458801d..540b46ce0 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -159,12 +159,12 @@ class TestDOM(TestCase):
     def test_dom_annotation_entry(self):
         """ DOM 3.annotations.1.entry """
         code, out, err = self.t("_get 3.annotations.1.entry")
-        self.assertRegexpMatches(out, r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}")
 
     def test_dom_annotation_entry_second(self):
         """ DOM 3.annotations.1.entry """
         code, out, err = self.t("_get 3.annotations.1.entry.second")
-        self.assertRegexpMatches(out, r"\d{1,2}")
+        self.assertRegex(out, r"\d{1,2}")
 
     def test_dom_annotation_description(self):
         """ DOM 3.annotations.1.description """
@@ -175,7 +175,7 @@ class TestDOM(TestCase):
         """ DOM system.version """
         code, out, err = self.t("_get system.version")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d\.\d+\.\d+")
+        self.assertRegex(out, r"\d\.\d+\.\d+")
 
     def test_dom_system_os(self):
         """ DOM system.os """
@@ -200,19 +200,19 @@ class TestDOM(TestCase):
         """ DOM tw.width """
         code, out, err = self.t("_get tw.width")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d+")
+        self.assertRegex(out, r"\d+")
 
     def test_dom_tw_height(self):
         """ DOM tw.height """
         code, out, err = self.t("_get tw.height")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d+")
+        self.assertRegex(out, r"\d+")
 
     def test_dom_tw_version(self):
         """ DOM tw.version """
         code, out, err = self.t("_get tw.version")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d\.\d+\.\d+")
+        self.assertRegex(out, r"\d\.\d+\.\d+")
 
     def test_dom_context_program(self):
         """ DOM context.program """
@@ -230,13 +230,13 @@ class TestDOM(TestCase):
         """ DOM context.width """
         code, out, err = self.t("_get context.width")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d+")
+        self.assertRegex(out, r"\d+")
 
     def test_dom_context_height(self):
         """ DOM context.height """
         code, out, err = self.t("_get context.height")
         self.assertEqual(code, 0)
-        self.assertRegexpMatches(out, r"\d+")
+        self.assertRegex(out, r"\d+")
 
     def test_dom_rc_name(self):
         """ DOM rc.dateformat """
diff --git a/test/due.t b/test/due.t
index 7a3fe1473..82788e4d7 100755
--- a/test/due.t
+++ b/test/due.t
@@ -64,8 +64,8 @@ class TestDue(TestCase):
     def test_due(self):
         """due tasks displayed correctly"""
         code, out, err = self.t("list")
-        self.assertRegexpMatches(out, "\033\[31m.+{0}.+\033\[0m".format(self.just))
-        self.assertRegexpMatches(out, "\s+{0}\s+".format(self.almost))
+        self.assertRegex(out, "\033\[31m.+{0}.+\033\[0m".format(self.just))
+        self.assertRegex(out, "\s+{0}\s+".format(self.almost))
 
 
 class TestBug418(TestCase):
diff --git a/test/duplicate.t b/test/duplicate.t
index 3ad205358..9a339b228 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -65,7 +65,7 @@ class TestDuplication(TestCase):
     def test_duplication_showing_uuid(self):
         """Verify duplicate can show uuid"""
         code, out, err = self.t("1 duplicate rc.verbose:new-uuid")
-        self.assertRegexpMatches(out, "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
+        self.assertRegex(out, "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
 
 
 class TestDuplication2(TestCase):
diff --git a/test/encoding.t b/test/encoding.t
index 42d49b315..7f7d9b2aa 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -71,9 +71,9 @@ class TestUtf8(TestCase):
         code, out, err = self.t("ls")
 
         expected = re.compile("\S\s{4}abc", re.MULTILINE)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
         expected = re.compile("\S\s{5}def", re.MULTILINE)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
 
 if __name__ == "__main__":
diff --git a/test/enpassant.t b/test/enpassant.t
index e40319002..10713a2c2 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -54,19 +54,19 @@ class TestEnpassantMultiple(BaseTestEnpassant):
     def validate_info(self, id, desc):
         code, out, err = self.t((id, "info"))
 
-        self.assertRegexpMatches(
+        self.assertRegex(
             out, "Status +Completed",
             msg="enpassant {0} status change".format(id),
         )
-        self.assertRegexpMatches(
+        self.assertRegex(
             out, "Priority +H",
             msg="enpassant {0} priority change".format(id),
         )
-        self.assertRegexpMatches(
+        self.assertRegex(
             out, "Tags +tag",
             msg="enpassant {0} tag change".format(id),
         )
-        self.assertRegexpMatches(
+        self.assertRegex(
             out, "Description +{0}".format(desc),
             msg="enpassant {0} description change".format(id),
         )
@@ -95,27 +95,27 @@ class TestEnpassant(BaseTestEnpassant):
     def perform_action(self, action):
         self.t(("1", action, "oneanno"))
         code, out, err = self.t("1 info")
-        self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno",
+        self.assertRegex(out, "Description +one\n[0-9: -]+ oneanno",
                                  msg="{0} enpassant annotation".format(action))
 
         self.t(("2", action, "/two/TWO/"))
         code, out, err = self.t("2 info")
-        self.assertRegexpMatches(out, "Description +TWO",
+        self.assertRegex(out, "Description +TWO",
                                  msg="{0} enpassant modify".format(action))
 
         self.t(("3", action, "+threetag"))
         code, out, err = self.t("3 info")
-        self.assertRegexpMatches(out, "Tags +threetag",
+        self.assertRegex(out, "Tags +threetag",
                                  msg="{0} enpassant tag".format(action))
 
         self.t(("4", action, "pri:H"))
         code, out, err = self.t("4 info")
-        self.assertRegexpMatches(out, "Priority +H",
+        self.assertRegex(out, "Priority +H",
                                  msg="{0} enpassant priority".format(action))
 
         self.t(("5", action, "pro:PROJ"))
         code, out, err = self.t("5 info")
-        self.assertRegexpMatches(out, "Project +PROJ",
+        self.assertRegex(out, "Project +PROJ",
                                  msg="{0} enpassant project".format(action))
 
     def test_done(self):
diff --git a/test/export.t b/test/export.t
index f7ef9ba51..1d9c8d046 100755
--- a/test/export.t
+++ b/test/export.t
@@ -77,7 +77,7 @@ class TestExportCommand(TestCase):
         if expected_value is not None:
             if regexp:
                 # Match to pattern if checking with regexp
-                self.assertRegexpMatches(value, expected_value)
+                self.assertRegex(value, expected_value)
             else:
                 # Equality match if checking with string
                 self.assertEqual(value, expected_value)
diff --git a/test/feature.559.t b/test/feature.559.t
index 646f6d2e4..0dce9bcd3 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -68,7 +68,7 @@ class TestFeature559(TestCase):
         code, out, err = self.t.runError("rc.data.location=locationdoesnotexist list")
         self.assertNotIn("footask", out)
         self.assertNotIn("Error", out)
-        self.assertRegexpMatches(err, re.compile("Error:.+does not exist", re.DOTALL))
+        self.assertRegex(err, re.compile("Error:.+does not exist", re.DOTALL))
 
 
 if __name__ == "__main__":
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index 7fe44b1ba..aeb126967 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -56,16 +56,16 @@ class TestDefaultProject(TestCase):
         self.assertIn("foobar", out)
 
         expected = "Project\s+garden"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
         self.t("1 modify project:")
         code, out, err = self.t("1 info")
 
         self.assertIn("foobar", out)
-        self.assertNotRegexpMatches(out, expected)
+        self.assertNotRegex(out, expected)
 
         notexpected = "Project\s+" + self.default_project
-        self.assertNotRegexpMatches(out, notexpected)
+        self.assertNotRegex(out, notexpected)
 
     def test_without_project(self):
         """default.project applied when no project is specified"""
@@ -77,7 +77,7 @@ class TestDefaultProject(TestCase):
         self.assertIn("foobar", out)
 
         expected = "Project\s+" + self.default_project
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_default_project_inline_override(self):
         """no project applied when default.project is overridden"""
@@ -125,7 +125,7 @@ class TestDefaultProject(TestCase):
         code, out, err = self.t("1 info")
 
         expected = "Description\s+foobar\n[0-9-: ]+ Hello"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
         self.assertNotIn("Project", out)
 
     def test_time_default_project(self):
@@ -158,7 +158,7 @@ class TestDefaultProject(TestCase):
         code, out, err = self.t("1 info")
 
         self.assertIn(DESC, out)
-        self.assertRegexpMatches(out, "Status\s+Recurring")  # is a parent task
+        self.assertRegex(out, "Status\s+Recurring")  # is a parent task
         self.assertIn(self.default_project, out)
 
         self.t.faketime("+1d")
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 9c9d510e9..a0958bd3d 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -62,8 +62,8 @@ class TestRecurrenceProblems(TestCase):
         self.t("add foo due:today recur:yearly until:eom")
         code, out, err = self.t("info 1")
 
-        self.assertNotRegexpMatches(out, "Until\s+\d{10}")
-        self.assertRegexpMatches(out, "Until\s+\d+\/\d+\/\d{4}")
+        self.assertNotRegex(out, "Until\s+\d{10}")
+        self.assertRegex(out, "Until\s+\d+\/\d+\/\d{4}")
 
 
 if __name__ == "__main__":
diff --git a/test/format.t b/test/format.t
index 7e274e2ce..255098264 100755
--- a/test/format.t
+++ b/test/format.t
@@ -69,20 +69,20 @@ class TestCountdown(TestCase):
         self.t.config("report.up.sort",           "due+")
 
         code, out, err = self.t("up")
-        self.assertRegexpMatches(out, " one\n.+ two\n")
-        self.assertRegexpMatches(out, " two\n.+ three\n")
-        self.assertRegexpMatches(out, " three\n.+ four\n")
-        self.assertRegexpMatches(out, " four\n.+ five\n")
-        self.assertRegexpMatches(out, " five\n.+ six\n")
-        self.assertRegexpMatches(out, " six\n.+ seven\n")
-        self.assertRegexpMatches(out, " seven\n.+ eight\n")
-        self.assertRegexpMatches(out, " eight\n.+ nine\n")
-        self.assertRegexpMatches(out, " nine\n.+ ten\n")
-        self.assertRegexpMatches(out, " ten\n.+ eleven\n")
-        self.assertRegexpMatches(out, " eleven\n.+ twelve\n")
-        self.assertRegexpMatches(out, " twelve\n.+ thirteen\n")
-        self.assertRegexpMatches(out, " thirteen\n.+ fourteen\n")
-        self.assertRegexpMatches(out, " fourteen\n.+ fifteen\n")
+        self.assertRegex(out, " one\n.+ two\n")
+        self.assertRegex(out, " two\n.+ three\n")
+        self.assertRegex(out, " three\n.+ four\n")
+        self.assertRegex(out, " four\n.+ five\n")
+        self.assertRegex(out, " five\n.+ six\n")
+        self.assertRegex(out, " six\n.+ seven\n")
+        self.assertRegex(out, " seven\n.+ eight\n")
+        self.assertRegex(out, " eight\n.+ nine\n")
+        self.assertRegex(out, " nine\n.+ ten\n")
+        self.assertRegex(out, " ten\n.+ eleven\n")
+        self.assertRegex(out, " eleven\n.+ twelve\n")
+        self.assertRegex(out, " twelve\n.+ thirteen\n")
+        self.assertRegex(out, " thirteen\n.+ fourteen\n")
+        self.assertRegex(out, " fourteen\n.+ fifteen\n")
 
     def test_countdown_down(self):
         """Verify countdown sorting: descending"""
@@ -93,20 +93,20 @@ class TestCountdown(TestCase):
         self.t.config("report.down.sort",         "due-")
 
         code, out, err = self.t("down")
-        self.assertRegexpMatches(out, " fifteen\n.+ fourteen\n")
-        self.assertRegexpMatches(out, " fourteen\n.+ thirteen\n")
-        self.assertRegexpMatches(out, " thirteen\n.+ twelve\n")
-        self.assertRegexpMatches(out, " twelve\n.+ eleven\n")
-        self.assertRegexpMatches(out, " eleven\n.+ ten\n")
-        self.assertRegexpMatches(out, " ten\n.+ nine\n")
-        self.assertRegexpMatches(out, " nine\n.+ eight\n")
-        self.assertRegexpMatches(out, " eight\n.+ seven\n")
-        self.assertRegexpMatches(out, " seven\n.+ six\n")
-        self.assertRegexpMatches(out, " six\n.+ five\n")
-        self.assertRegexpMatches(out, " five\n.+ four\n")
-        self.assertRegexpMatches(out, " four\n.+ three\n")
-        self.assertRegexpMatches(out, " three\n.+ two\n")
-        self.assertRegexpMatches(out, " two\n.+ one\n")
+        self.assertRegex(out, " fifteen\n.+ fourteen\n")
+        self.assertRegex(out, " fourteen\n.+ thirteen\n")
+        self.assertRegex(out, " thirteen\n.+ twelve\n")
+        self.assertRegex(out, " twelve\n.+ eleven\n")
+        self.assertRegex(out, " eleven\n.+ ten\n")
+        self.assertRegex(out, " ten\n.+ nine\n")
+        self.assertRegex(out, " nine\n.+ eight\n")
+        self.assertRegex(out, " eight\n.+ seven\n")
+        self.assertRegex(out, " seven\n.+ six\n")
+        self.assertRegex(out, " six\n.+ five\n")
+        self.assertRegex(out, " five\n.+ four\n")
+        self.assertRegex(out, " four\n.+ three\n")
+        self.assertRegex(out, " three\n.+ two\n")
+        self.assertRegex(out, " two\n.+ one\n")
 
 
 class TestFormatDepends(TestCase):
@@ -118,12 +118,12 @@ class TestFormatDepends(TestCase):
     def test_depends_default(self):
         self.t.config("report.formatdep.columns", "description,depends")
         code, out, err = self.t("formatdep")
-        self.assertRegexpMatches(out, "one\s+1")
+        self.assertRegex(out, "one\s+1")
 
     def test_depends_count(self):
         self.t.config("report.formatdep.columns", "description,depends.count")
         code, out, err = self.t("formatdep")
-        self.assertRegexpMatches(out, "one\s+\[1\]")
+        self.assertRegex(out, "one\s+\[1\]")
 
 
 class TestBug101(TestCase):
diff --git a/test/gc.t b/test/gc.t
index e278bd5b9..7b3367904 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -50,7 +50,7 @@ class TestGC(TestCase):
         self.t.config("gc", "0")
         self.t("1 done")
         code, out, err = self.t("gctest")
-        self.assertRegexpMatches(out, "1\s+one", "should still have ID")
+        self.assertRegex(out, "1\s+one", "should still have ID")
 
     def test_gc_off_mod(self):
         """mod by ID after done with gc off"""
@@ -59,7 +59,7 @@ class TestGC(TestCase):
         self.t("gctest")
         self.t("2 mod +TWO")
         code, out, err = self.t("gctest")
-        self.assertRegexpMatches(out, "2\s+two\s+TWO", "modified 'two'")
+        self.assertRegex(out, "2\s+two\s+TWO", "modified 'two'")
 
     def test_gc_on_id(self):
         """IDs reshuffle after report when GC on"""
@@ -67,8 +67,8 @@ class TestGC(TestCase):
         self.t("1 done")
         self.t("2 mod +TWO")
         code, out, err = self.t("gctest")
-        self.assertRegexpMatches(out, "1\s+two\s+TWO")
-        self.assertRegexpMatches(out, "2\s+three")
+        self.assertRegex(out, "1\s+two\s+TWO")
+        self.assertRegex(out, "2\s+three")
 
 
 if __name__ == "__main__":
diff --git a/test/helpers.t b/test/helpers.t
index c990995f2..c573c4bb1 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -120,13 +120,13 @@ class TestBug956(TestCase):
     def test_uuids_header(self):
         """956: Verify 'uuids' does not print a header"""
         code, out, err = self.t("rc.verbose:nothing uuids")
-        self.assertRegexpMatches(out, "[0-9a-f-]*\n")
+        self.assertRegex(out, "[0-9a-f-]*\n")
         self.assertNotIn("TASKRC", out)
 
     def test_uuids_helper_header(self):
         """956: Verify '_uuids' does not print a header"""
         code, out, err = self.t("rc.verbose:nothing _uuids")
-        self.assertRegexpMatches(out, "[0-9a-f-]*\n")
+        self.assertRegex(out, "[0-9a-f-]*\n")
         self.assertNotIn("TASKRC", out)
 
 
diff --git a/test/history.t b/test/history.t
index 1dff59d6f..62cc388d4 100755
--- a/test/history.t
+++ b/test/history.t
@@ -55,17 +55,17 @@ class TestHistoryDaily(TestCase):
     def test_history_daily(self):
         """Verify 'history.daily' correctly categorizes data"""
         code, out, err = self.t("history.daily")
-        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
-        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
-        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+        self.assertRegex(out, "7\s+1\s+0\s+6")
+        self.assertRegex(out, "2\s+3\s+3\s+-4")
+        self.assertRegex(out, "4\s+2\s+1\s+1")
 
         code, out, err = self.t("ghistory.daily rc._forcecolor:on")
-        self.assertRegexpMatches(out, "\s7.+\s1.+")
-        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+        self.assertRegex(out, "\s7.+\s1.+")
+        self.assertRegex(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.daily")
-        self.assertRegexpMatches(out, "2015\s+January\s+2\s+\++X+\s")
-        self.assertRegexpMatches(out, "\s+February\s+2\s+\++X+\-+")
+        self.assertRegex(out, "2015\s+January\s+2\s+\++X+\s")
+        self.assertRegex(out, "\s+February\s+2\s+\++X+\-+")
 
 class TestHistoryWeekly(TestCase):
     def setUp(self):
@@ -88,17 +88,17 @@ class TestHistoryWeekly(TestCase):
     def test_history_weekly(self):
         """Verify 'history.weekly' correctly categorizes data"""
         code, out, err = self.t("history.weekly")
-        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
-        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
-        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+        self.assertRegex(out, "7\s+1\s+0\s+6")
+        self.assertRegex(out, "2\s+3\s+3\s+-4")
+        self.assertRegex(out, "4\s+2\s+1\s+1")
 
         code, out, err = self.t("ghistory.weekly rc._forcecolor:on")
-        self.assertRegexpMatches(out, "\s7.+\s1.+")
-        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+        self.assertRegex(out, "\s7.+\s1.+")
+        self.assertRegex(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.weekly")
-        self.assertRegexpMatches(out, "2014\s+December\s+28\s+\++X+\s")
-        self.assertRegexpMatches(out, "2015\s+February\s+1\s+\++X+\-+")
+        self.assertRegex(out, "2014\s+December\s+28\s+\++X+\s")
+        self.assertRegex(out, "2015\s+February\s+1\s+\++X+\-+")
 
 
 class TestHistoryMonthly(TestCase):
@@ -122,17 +122,17 @@ class TestHistoryMonthly(TestCase):
     def test_history_monthly(self):
         """Verify 'history.monthly' correctly categorizes data"""
         code, out, err = self.t("history.monthly")
-        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
-        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
-        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+        self.assertRegex(out, "7\s+1\s+0\s+6")
+        self.assertRegex(out, "2\s+3\s+3\s+-4")
+        self.assertRegex(out, "4\s+2\s+1\s+1")
 
         code, out, err = self.t("ghistory.monthly rc._forcecolor:on")
-        self.assertRegexpMatches(out, "\s7.+\s1.+")
-        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+        self.assertRegex(out, "\s7.+\s1.+")
+        self.assertRegex(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.monthly")
-        self.assertRegexpMatches(out, "2015\s+January\s+\++X+\s")
-        self.assertRegexpMatches(out, "\s+February\s+\++X+\-+")
+        self.assertRegex(out, "2015\s+January\s+\++X+\s")
+        self.assertRegex(out, "\s+February\s+\++X+\-+")
 
 
 class TestHistoryAnnual(TestCase):
@@ -160,17 +160,17 @@ class TestHistoryAnnual(TestCase):
     def test_history_annual(self):
         """Verify 'history.annual' correctly categorizes data"""
         code, out, err = self.t("history.annual")
-        self.assertRegexpMatches(out, "7\s+1\s+0\s+6")
-        self.assertRegexpMatches(out, "2\s+3\s+3\s+-4")
-        self.assertRegexpMatches(out, "4\s+2\s+1\s+1")
+        self.assertRegex(out, "7\s+1\s+0\s+6")
+        self.assertRegex(out, "2\s+3\s+3\s+-4")
+        self.assertRegex(out, "4\s+2\s+1\s+1")
 
         code, out, err = self.t("ghistory.annual rc._forcecolor:on")
-        self.assertRegexpMatches(out, "\s7.+\s1.+")
-        self.assertRegexpMatches(out, "\s2.+\s3.+\s3.+")
+        self.assertRegex(out, "\s7.+\s1.+")
+        self.assertRegex(out, "\s2.+\s3.+\s3.+")
 
         code, out, err = self.t("ghistory.annual")
-        self.assertRegexpMatches(out, "2014\s+\++X+\s")
-        self.assertRegexpMatches(out, "2015\s+\++X+\-+")
+        self.assertRegex(out, "2014\s+\++X+\s")
+        self.assertRegex(out, "2015\s+\++X+\-+")
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/hooks.env.t b/test/hooks.env.t
index 5aac2f8f5..d6c0dd3b9 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -68,7 +68,7 @@ class TestHooksOnLaunch(TestCase):
         self.t.hooks.add_default(hookname, log=True)
 
         code, out, err = self.t("diagnostics")
-        self.assertRegexpMatches(out, r"on-launch-good-env\s+\(executable\)")
+        self.assertRegex(out, r"on-launch-good-env\s+\(executable\)")
 
     def test_onlaunch_builtin_env_debug(self):
         """Verify that 'debug.hooks' shows hook details"""
diff --git a/test/ids.t b/test/ids.t
index dfd3eb46b..bff11424e 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -50,42 +50,42 @@ class TestIDs(TestCase):
     def test_ids_count_A(self):
         """ids +A"""
         code, out, err = self.t("ids +A")
-        self.assertRegexpMatches(out, "^1-3 5$")
+        self.assertRegex(out, "^1-3 5$")
 
     def test_ids_count_B(self):
         """ids +B"""
         code, out, err = self.t("ids +B")
-        self.assertRegexpMatches(out, "^1 3 5$")
+        self.assertRegex(out, "^1 3 5$")
 
     def test_ids_count_A_B(self):
         """ids +A -B"""
         code, out, err = self.t("ids +A -B")
-        self.assertRegexpMatches(out, "^2$")
+        self.assertRegex(out, "^2$")
 
     def test_get_ids_count_A(self):
         """_ids +A"""
         code, out, err = self.t("_ids +A")
-        self.assertRegexpMatches(out, "^1\n2\n3\n5$")
+        self.assertRegex(out, "^1\n2\n3\n5$")
 
     def test_get_zshids_count_A(self):
         """_zshids +A"""
         code, out, err = self.t("_zshids +A")
-        self.assertRegexpMatches(out, "^1:one\n2:two\n3:three\n5:five$")
+        self.assertRegex(out, "^1:one\n2:two\n3:three\n5:five$")
 
     def test_uuids_count_A(self):
         """uuids +A"""
         code, out, err = self.t("uuids +A")
-        self.assertRegexpMatches(out, "{0} {0} {0} {0}".format(UUID_REGEXP))
+        self.assertRegex(out, "{0} {0} {0} {0}".format(UUID_REGEXP))
 
     def test_get_uuids_count_A(self):
         """_uuids +A"""
         code, out, err = self.t("_uuids +A")
-        self.assertRegexpMatches(out, "{0}\n{0}\n{0}\n{0}".format(UUID_REGEXP))
+        self.assertRegex(out, "{0}\n{0}\n{0}\n{0}".format(UUID_REGEXP))
 
     def test_get_zshuuids_count_A(self):
         """_zshuuids +A"""
         code, out, err = self.t("_zshuuids +A")
-        self.assertRegexpMatches(
+        self.assertRegex(
             out, "{0}:one\n{0}:two\n{0}:three\n{0}:five".format(UUID_REGEXP))
 
     def test_ids_ranges(self):
diff --git a/test/import.t b/test/import.t
index 817d72f0f..7676082ef 100755
--- a/test/import.t
+++ b/test/import.t
@@ -79,19 +79,19 @@ class TestImport(TestCase):
 
     def assertData1(self):
         code, out, err = self.t("list")
-        self.assertRegexpMatches(out, "1.+A.+zero")
-        self.assertRegexpMatches(out, "2.+B.+one")
+        self.assertRegex(out, "1.+A.+zero")
+        self.assertRegex(out, "2.+B.+one")
         self.assertNotIn("two", out)
 
         code, out, err = self.t("completed")
         self.assertNotIn("zero", out)
         self.assertNotIn("one", out)
         # complete has completion date as 1st column
-        self.assertRegexpMatches(out, "2/13/2009.+two")
+        self.assertRegex(out, "2/13/2009.+two")
 
     def assertData2(self):
         code, out, err = self.t("list")
-        self.assertRegexpMatches(out, "3.+three")
+        self.assertRegex(out, "3.+three")
 
     def assertData3(self):
         code, out, err = self.t("list")
diff --git a/test/info.t b/test/info.t
index 19af3f844..aa6fcb209 100755
--- a/test/info.t
+++ b/test/info.t
@@ -64,21 +64,21 @@ class TestInfoCommand(TestCase):
         self.t("1 annotate bar", input="n\n")
         code, out, err = self.t("1 info")
 
-        self.assertRegexpMatches(out, "ID\s+1")
-        self.assertRegexpMatches(out, "Description\s+foo")
-        self.assertRegexpMatches(out, "\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\s+bar")
-        self.assertRegexpMatches(out, "Status\s+Recurring")
-        self.assertRegexpMatches(out, "Project\s+P")
-        self.assertRegexpMatches(out, "Recurrence\s+P1M")
-        self.assertRegexpMatches(out, "Entered\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Waiting until\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Scheduled\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Start\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Due\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Until\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
-        self.assertRegexpMatches(out, "Last modified\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "ID\s+1")
+        self.assertRegex(out, "Description\s+foo")
+        self.assertRegex(out, "\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\s+bar")
+        self.assertRegex(out, "Status\s+Recurring")
+        self.assertRegex(out, "Project\s+P")
+        self.assertRegex(out, "Recurrence\s+P1M")
+        self.assertRegex(out, "Entered\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Waiting until\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Scheduled\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Start\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Due\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Until\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
+        self.assertRegex(out, "Last modified\s+\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}")
 
-        self.assertRegexpMatches(out, "Tags\s+tag")
+        self.assertRegex(out, "Tags\s+tag")
         self.assertIn("ACTIVE", out)
         self.assertIn("ANNOTATED", out)
         self.assertIn("MONTH", out)
@@ -89,11 +89,11 @@ class TestInfoCommand(TestCase):
         self.assertIn("YEAR", out)
         self.assertIn("UDA", out)
 
-        self.assertRegexpMatches(out, "UUID\s+[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
-        self.assertRegexpMatches(out, "Urgency\s+\d+(\.\d+)?")
-        self.assertRegexpMatches(out, "Priority\s+H")
+        self.assertRegex(out, "UUID\s+[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
+        self.assertRegex(out, "Urgency\s+\d+(\.\d+)?")
+        self.assertRegex(out, "Priority\s+H")
 
-        self.assertRegexpMatches(out, "Annotation of 'bar' added.")
+        self.assertRegex(out, "Annotation of 'bar' added.")
         self.assertIn("project", out)
         self.assertIn("active", out)
         self.assertIn("annotations", out)
@@ -113,7 +113,7 @@ class TestBug425(TestCase):
         self.t("1 modify Bar in Bar")
 
         code, out, err = self.t("1 ls")
-        self.assertRegexpMatches(out, "1\s+Bar in Bar")
+        self.assertRegex(out, "1\s+Bar in Bar")
 
 
 if __name__ == "__main__":
diff --git a/test/logo.t b/test/logo.t
index c6583fbfb..175efb0c5 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -43,7 +43,7 @@ class TestLogoCommand(TestCase):
     def test_logo_command(self):
         """Check that there are colors. For coverage"""
         code, out, err = self.t("logo rc._forcecolor:on")
-        self.assertRegexpMatches(out, ".\[48;5;\d+m  .\[0m")
+        self.assertRegex(out, ".\[48;5;\d+m  .\[0m")
 
     def test_logo_command_no_color(self):
         """Check that it only works with color. For coverage"""
diff --git a/test/project.t b/test/project.t
index 0254e0713..d0832506f 100755
--- a/test/project.t
+++ b/test/project.t
@@ -53,39 +53,39 @@ class TestProjects(TestCase):
         code, out, err = self.t("project:B projects")
 
         expected = "1 project \(1 task\)"
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_project_progress(self):
         """project status/progress is shown and is up-to-date"""
 
         code, out, err = self.t("add one pro:foo")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "0%",
+        self.assertRegex(err, self.STATUS.format("foo", "0%",
                                                          "1 task"))
 
         code, out, err = self.t("add two pro:foo")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "0%",
+        self.assertRegex(err, self.STATUS.format("foo", "0%",
                                                          "2 of 2 tasks"))
 
         code, out, err = self.t("add three pro:foo")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "0%",
+        self.assertRegex(err, self.STATUS.format("foo", "0%",
                                                          "3 of 3 tasks"))
 
         code, out, err = self.t("add four pro:foo")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "0%",
+        self.assertRegex(err, self.STATUS.format("foo", "0%",
                                                          "4 of 4 tasks"))
 
         code, out, err = self.t("1 done")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "25%",
+        self.assertRegex(err, self.STATUS.format("foo", "25%",
                                                          "3 of 4 tasks"))
 
         code, out, err = self.t("2 delete", input="y\n")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "33%",
+        self.assertRegex(err, self.STATUS.format("foo", "33%",
                                                          "2 of 3 tasks"))
 
         code, out, err = self.t("3 modify pro:bar")
-        self.assertRegexpMatches(err, self.STATUS.format("foo", "50%",
+        self.assertRegex(err, self.STATUS.format("foo", "50%",
                                                          "1 of 2 tasks"))
-        self.assertRegexpMatches(err, self.STATUS.format("bar", "0%",
+        self.assertRegex(err, self.STATUS.format("bar", "0%",
                                                          "1 task"))
 
     def test_project_spaces(self):
@@ -93,7 +93,7 @@ class TestProjects(TestCase):
 
         self.t("add hello pro:bob")
         code, out, err = self.t('1 mod pro:"foo bar"')
-        self.assertRegexpMatches(err, self.STATUS.format("foo bar", "0%",
+        self.assertRegex(err, self.STATUS.format("foo bar", "0%",
                                                          "1 task"))
 
     def add_tasks(self):
@@ -184,25 +184,25 @@ class TestSubprojects(TestCase):
     def test_project_exact1(self):
         """Verify single character exact"""
         code, out, err = self.t("list project:b")
-        self.assertRegexpMatches(out, r"\bb\s")
+        self.assertRegex(out, r"\bb\s")
 
     def test_project_top1(self):
         """Verify single character parent"""
         code, out, err = self.t("list project:a")
-        self.assertRegexpMatches(out, r"\babc\s")
-        self.assertRegexpMatches(out, r"\bab\s")
-        self.assertRegexpMatches(out, r"\ba\s")
+        self.assertRegex(out, r"\babc\s")
+        self.assertRegex(out, r"\bab\s")
+        self.assertRegex(out, r"\ba\s")
 
     def test_project_top2(self):
         """Verify double character parent"""
         code, out, err = self.t("list project:ab")
-        self.assertRegexpMatches(out, r"\babc\s")
-        self.assertRegexpMatches(out, r"\bab\s")
+        self.assertRegex(out, r"\babc\s")
+        self.assertRegex(out, r"\bab\s")
 
     def test_project_exact3(self):
         """Verify triple character exact"""
         code, out, err = self.t("list project:abc")
-        self.assertRegexpMatches(out, r"\babc\s")
+        self.assertRegex(out, r"\babc\s")
 
     def test_project_mismatch4(self):
         """Verify quad character mismatch"""
@@ -227,13 +227,13 @@ class TestBug299(TestCase):
         """
         code, out, err = self.t("list project.isnt:one pro.isnt:two")
 
-        self.assertNotRegexpMatches(out, "one.*foo")
-        self.assertRegexpMatches(out, "ones.*faz")
-        self.assertRegexpMatches(out, "phone.*boo")
-        self.assertRegexpMatches(out, "bones.*too")
+        self.assertNotRegex(out, "one.*foo")
+        self.assertRegex(out, "ones.*faz")
+        self.assertRegex(out, "phone.*boo")
+        self.assertRegex(out, "bones.*too")
 
-        self.assertNotRegexpMatches(out, "two.*bar")
-        self.assertRegexpMatches(out, "three.*baz")
+        self.assertNotRegex(out, "two.*bar")
+        self.assertRegex(out, "three.*baz")
 
     def test_project_exclusion_hasnt(self):
         """299: check project exclusion using project.hasnt:<name>
@@ -242,13 +242,13 @@ class TestBug299(TestCase):
         """
         code, out, err = self.t("list project.hasnt:one pro.hasnt:two")
 
-        self.assertNotRegexpMatches(out, "one.*foo")
-        self.assertNotRegexpMatches(out, "ones.*faz")
-        self.assertNotRegexpMatches(out, "phone.*boo")
-        self.assertNotRegexpMatches(out, "bones.*too")
+        self.assertNotRegex(out, "one.*foo")
+        self.assertNotRegex(out, "ones.*faz")
+        self.assertNotRegex(out, "phone.*boo")
+        self.assertNotRegex(out, "bones.*too")
 
-        self.assertNotRegexpMatches(out, "two.*bar")
-        self.assertRegexpMatches(out, "three.*baz")
+        self.assertNotRegex(out, "two.*bar")
+        self.assertRegex(out, "three.*baz")
 
 
 class TestBug605(TestCase):
@@ -386,16 +386,16 @@ class TestBug899(TestCase):
     def test_log_project(self):
         """899: Verify task log behaves correctly when logging into a project"""
         code, out, err = self.t("add one pro:A")
-        self.assertRegexpMatches(err, " 0% complete \(1 task ")
+        self.assertRegex(err, " 0% complete \(1 task ")
 
         code, out, err = self.t("add two pro:A")
-        self.assertRegexpMatches(err, " 0% complete \(2 of 2 ")
+        self.assertRegex(err, " 0% complete \(2 of 2 ")
 
         code, out, err = self.t("1 done")
-        self.assertRegexpMatches(err, " 50% complete \(1 of 2 ")
+        self.assertRegex(err, " 50% complete \(1 of 2 ")
 
         code, out, err = self.t("log three pro:A")
-        self.assertRegexpMatches(err, " 66% complete \(1 of 3 ")
+        self.assertRegex(err, " 66% complete \(1 of 3 ")
 
 
 class TestBug1267(TestCase):
diff --git a/test/rc.override.t b/test/rc.override.t
index 8eb37f1eb..1e25d3429 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -46,10 +46,10 @@ class TestOverride(TestCase):
     def test_override(self):
         """Verify override is displayed in 'show' command"""
         code, out, err = self.t("show regex")
-        self.assertRegexpMatches(out, r"regex +0")
+        self.assertRegex(out, r"regex +0")
 
         code, out, err = self.t("rc.regex:1 show regex")
-        self.assertRegexpMatches(out, r"regex +1")
+        self.assertRegex(out, r"regex +1")
 
 
 class TestRCSegfault(TestCase):
diff --git a/test/recurrence.t b/test/recurrence.t
index dcb9afb0f..d94d85c12 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -58,12 +58,12 @@ class TestRecurrenceSorting(TestCase):
     def test_sort_ascending(self):
         """Verify sorting by 'recur+' is correct"""
         code, out, err = self.t("asc rc.verbose:nothing")
-        self.assertRegexpMatches(out, "4\s+P1D\s+one\s+6\s+P3D\s+three\s+5\s+P7D\s+two")
+        self.assertRegex(out, "4\s+P1D\s+one\s+6\s+P3D\s+three\s+5\s+P7D\s+two")
 
     def test_sort_descending(self):
         """Verify sorting by 'recur-' is correct"""
         code, out, err = self.t("desc rc.verbose:nothing")
-        self.assertRegexpMatches(out, "5\s+P7D\s+two\s+6\s+P3D\s+three\s+4\s+P1D\s+one")
+        self.assertRegex(out, "5\s+P7D\s+two\s+6\s+P3D\s+three\s+4\s+P1D\s+one")
 
 
 class TestRecurrenceDisabled(TestCase):
@@ -177,9 +177,9 @@ class TestRecurrenceTasks(TestCase):
         #   3 complex
         #   4 complex
         code, out, err = self.t("minimal rc.verbose:nothing")
-        self.assertRegexpMatches(out, "1\s+simple")
-        self.assertRegexpMatches(out, "3\s+complex")
-        self.assertRegexpMatches(out, "4\s+complex")
+        self.assertRegex(out, "1\s+simple")
+        self.assertRegex(out, "3\s+complex")
+        self.assertRegex(out, "4\s+complex")
 
         # Modify a child task and do not propagate the change.
         self.t("3 modify complex2", input="n\n")
@@ -316,7 +316,7 @@ class TestBug955(TestCase):
 
         self.t("add foo due:now recur:1day")
         code, out, err = self.t("ls")
-        self.assertRegexpMatches(out, re.compile("^2 tasks", re.MULTILINE))
+        self.assertRegex(out, re.compile("^2 tasks", re.MULTILINE))
 
     def test_no_prompt_for_parent_on_child_delete_confirmation_off(self):
         """955: Deleting a child of a recurring task prompts for parent deletion (confirmation:off)
@@ -332,7 +332,7 @@ class TestBug955(TestCase):
 
         # 1 task remains.
         code, out, err = self.t("ls")
-        self.assertRegexpMatches(out, re.compile("^1 task", re.MULTILINE))
+        self.assertRegex(out, re.compile("^1 task", re.MULTILINE))
 
         code, out, err = self.t("2 delete", input="y\ny\n")
         self.assertIn("Deleting task 2", out)
@@ -357,7 +357,7 @@ class TestBug955(TestCase):
 
         # 2 tasks intact.
         code, out, err = self.t("ls")
-        self.assertRegexpMatches(out, re.compile("^2 tasks", re.MULTILINE))
+        self.assertRegex(out, re.compile("^2 tasks", re.MULTILINE))
 
         code, out, err = self.t("2 delete", input="y\ny\n")
         self.assertIn("Deleted 2 tasks", out)
diff --git a/test/sequence.t b/test/sequence.t
index da3d23dc9..6f8a2bec4 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -58,7 +58,7 @@ class TestSequences(TestCase):
         """Test sequences in start/stop"""
         self.t("1,2 start")
         code, out, err = self.t("_get 1.start 2.start")
-        self.assertRegexpMatches(out, "\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2} \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\n")
+        self.assertRegex(out, "\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2} \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\n")
 
         self.t("1,2 stop")
         code, out, err = self.t("_get 1.start 2.start")
diff --git a/test/sorting.t b/test/sorting.t
index 696717465..df408e8ba 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -56,7 +56,7 @@ class MetaTestSorting(MetaTest):
 
             for expected in expectations:
                 regex = re.compile(expected, re.DOTALL)
-                self.assertRegexpMatches(out, regex)
+                self.assertRegex(out, regex)
 
         # Title of test in report
         test.__doc__ = "{0} sort:{1}".format(classname, _filter)
@@ -261,7 +261,7 @@ class TestSortNone(TestCase):
         code, out, err = self.t("_get 1.uuid 2.uuid 3.uuid")
         uuid1, uuid2, uuid3 = out.strip().split(' ')
         code, out, err = self.t("%s %s %s list rc.report.list.sort:none rc.report.list.columns:id,description rc.report.list.labels:id,desc" % (uuid2, uuid3, uuid1))
-        self.assertRegexpMatches(out, ' 2 two\n 3 three\n 1 one')
+        self.assertRegex(out, ' 2 two\n 3 three\n 1 one')
 
 
 if __name__ == "__main__":
diff --git a/test/special.t b/test/special.t
index 194ef57ba..5025e4f09 100755
--- a/test/special.t
+++ b/test/special.t
@@ -51,7 +51,7 @@ class TestSpecialTags(TestCase):
     def test_nocolor(self):
         self.t("add should have no red +nocolor priority:H")
         code, out, err = self.t("ls")
-        self.assertRegexpMatches(out, r"\s1\s+nocolor\s+should have no red")
+        self.assertRegex(out, r"\s1\s+nocolor\s+should have no red")
 
     def test_nonag(self):
         self.t("add should be red +nonag")
diff --git a/test/stats.t b/test/stats.t
index 7534fcf07..5442643b4 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -48,13 +48,13 @@ class TestStatisticsCommand(TestCase):
         self.t("log three")
 
         code, out, err = self.t("stats")
-        self.assertRegexpMatches(out, "Pending\s+1\n")
-        self.assertRegexpMatches(out, "Completed\s+1\n")
-        self.assertRegexpMatches(out, "Deleted\s+1\n")
-        self.assertRegexpMatches(out, "Total\s+3\n")
+        self.assertRegex(out, "Pending\s+1\n")
+        self.assertRegex(out, "Completed\s+1\n")
+        self.assertRegex(out, "Deleted\s+1\n")
+        self.assertRegex(out, "Total\s+3\n")
 
         code, out, err = self.t("stats rc._forcecolor:on")
-        self.assertRegexpMatches(out, "Pending\s+1\n")
+        self.assertRegex(out, "Pending\s+1\n")
 
 
 if __name__ == "__main__":
diff --git a/test/template.t b/test/template.t
index 7a8a3cf6f..f8937615f 100644
--- a/test/template.t
+++ b/test/template.t
@@ -51,8 +51,8 @@ from basetest import Taskd, ServerTestCase
 #     self.assertIsInstance(a, b)
 #     self.assertNotIsInstance(a, b)
 #     self.assertRaises(e)
-#     self.assertRegexpMatches(t, r)
-#     self.assertNotRegexpMatches(t, r)
+#     self.assertRegex(t, r)
+#     self.assertNotRegex(t, r)
 #     self.tap("")
 
 class TestBugNumber(TestCase):
@@ -74,7 +74,7 @@ class TestBugNumber(TestCase):
         code, out, err = self.t("version")
 
         expected = "Copyright \(C\) \d{4} - %d" % (datetime.now().year,)
-        self.assertRegexpMatches(out.decode("utf8"), expected)
+        self.assertRegex(out.decode("utf8"), expected)
 
         # TAP diagnostics on the bas
         self.tap("Yay TAP diagnostics")
diff --git a/test/timesheet.t b/test/timesheet.t
index d9131344c..204dba010 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -78,7 +78,7 @@ class TestTimesheet(TestCase):
             "Started.+PS2.+Completed.+C2.+"
             "Started.+PS1.+Completed.+C1.+"
             "Started.+PS0.+Completed.+C0", re.DOTALL)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_one_week(self):
         """One week of started and completed"""
@@ -86,7 +86,7 @@ class TestTimesheet(TestCase):
         code, out, err = self.t("timesheet (+PENDING and start.after:now-1wk) or (+COMPLETED and end.after:now-1wk)")
 
         expected = re.compile("Started.+PS0.+Completed.+C0", re.DOTALL)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
         self.assertNotIn("PS1", out)
         self.assertNotIn("PS2", out)
         self.assertNotIn("C1", out)
diff --git a/test/tw-1379.t b/test/tw-1379.t
index 8f68a45ac..4f346c54d 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -60,7 +60,7 @@ class TestBug1379(TestCase):
         self.t("add dep:1 Blocked")
 
         code, out, err = self.t("all +BLOCKED")
-        self.assertRegexpMatches(out, self.RED + r".*Blocked.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Blocked.*" + self.CLEAR)
 
     def test_color_UNBLOCKED(self):
         """color.tag.UNBLOCKED changes color of UNBLOCKED tasks"""
@@ -70,7 +70,7 @@ class TestBug1379(TestCase):
         self.t("add dep:1 Blocked")
 
         code, out, err = self.t("all +UNBLOCKED")
-        self.assertRegexpMatches(out, self.RED + r".*Blocks.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Blocks.*" + self.CLEAR)
 
     def test_color_BLOCKING(self):
         """color.tag.BLOCKING changes color of BLOCKING tasks"""
@@ -80,7 +80,7 @@ class TestBug1379(TestCase):
         self.t("add dep:1 Blocked")
 
         code, out, err = self.t("all +BLOCKING")
-        self.assertRegexpMatches(out, self.RED + r".*Blocks.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Blocks.*" + self.CLEAR)
 
     def test_color_SCHEDULED(self):
         """color.tag.SCHEDULED changes color of SCHEDULED tasks"""
@@ -89,7 +89,7 @@ class TestBug1379(TestCase):
         self.t("add scheduled:tomorrow Have fun")
 
         code, out, err = self.t("all +SCHEDULED")
-        self.assertRegexpMatches(out, self.RED + r".*Have fun.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Have fun.*" + self.CLEAR)
 
     def test_color_UNTIL(self):
         """color.tag.UNTIL changes color of UNTIL tasks"""
@@ -98,7 +98,7 @@ class TestBug1379(TestCase):
         self.t("add until:tomorrow Urgent")
 
         code, out, err = self.t("all +UNTIL")
-        self.assertRegexpMatches(out, self.RED + r".*Urgent.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Urgent.*" + self.CLEAR)
 
     def test_color_WAITING(self):
         """color.tag.WAITING changes color of WAITING tasks"""
@@ -107,7 +107,7 @@ class TestBug1379(TestCase):
         self.t("add wait:tomorrow Tomorrow")
 
         code, out, err = self.t("all +WAITING")
-        self.assertRegexpMatches(out, self.RED + r".*Tomorrow.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Tomorrow.*" + self.CLEAR)
 
     def test_color_PARENT(self):
         """color.tag.PARENT changes color of PARENT tasks"""
@@ -116,7 +116,7 @@ class TestBug1379(TestCase):
         self.t("add recur:daily due:tomorrow Email")
 
         code, out, err = self.t("all +PARENT")
-        self.assertRegexpMatches(out, self.RED + r".*Email.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Email.*" + self.CLEAR)
 
     def test_color_CHILD(self):
         """color.tag.CHILD changes color of CHILD tasks"""
@@ -125,7 +125,7 @@ class TestBug1379(TestCase):
         self.t("add recur:daily due:tomorrow Email")
 
         code, out, err = self.t("all +CHILD")
-        self.assertRegexpMatches(out, self.RED + r".*Email.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Email.*" + self.CLEAR)
 
     def test_color_PENDING(self):
         """color.tag.PENDING changes color of PENDING tasks"""
@@ -134,7 +134,7 @@ class TestBug1379(TestCase):
         self.t("add Pending")
 
         code, out, err = self.t("all +PENDING")
-        self.assertRegexpMatches(out, self.RED + r".*Pending.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Pending.*" + self.CLEAR)
 
     def test_color_COMPLETED(self):
         """color.tag.COMPLETED changes color of COMPLETED tasks"""
@@ -145,7 +145,7 @@ class TestBug1379(TestCase):
         self.t("1 done")
 
         code, out, err = self.t("all +COMPLETED")
-        self.assertRegexpMatches(out, self.RED + r".*Complete.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Complete.*" + self.CLEAR)
 
     def test_color_DELETED(self):
         """color.tag.DELETED changes color of DELETED tasks"""
@@ -156,7 +156,7 @@ class TestBug1379(TestCase):
         self.t("1 delete", input="y\n")
 
         code, out, err = self.t("all +DELETED")
-        self.assertRegexpMatches(out, self.RED + r".*Delete.*" + self.CLEAR)
+        self.assertRegex(out, self.RED + r".*Delete.*" + self.CLEAR)
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/tw-1837.t b/test/tw-1837.t
index a9ed05ad0..2b3391d3c 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -47,8 +47,8 @@ from basetest import Task, TestCase
 #     self.assertIsInstance(a, b)
 #     self.assertNotIsInstance(a, b)
 #     self.assertRaises(e)
-#     self.assertRegexpMatches(t, r)
-#     self.assertNotRegexpMatches(t, r)
+#     self.assertRegex(t, r)
+#     self.assertNotRegex(t, r)
 #     self.tap("")
 
 class TestBug1837(TestCase):
diff --git a/test/uda.t b/test/uda.t
index 512b68f60..b2757ee5c 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -103,8 +103,8 @@ class TestUdaDate(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+[\d\/]+\s+with")
-        self.assertRegexpMatches(out, "2\s+without")
+        self.assertRegex(out, "1\s+[\d\/]+\s+with")
+        self.assertRegex(out, "2\s+without")
 
     def test_uda_bad_date_task(self):
         """Add tasks with an invalid UDA date"""
@@ -134,7 +134,7 @@ class TestUdaDefault(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+strong\s+one")
+        self.assertRegex(out, "1\s+strong\s+one")
 
     def test_uda_default_task(self):
         """Add tasks with default UDA"""
@@ -143,7 +143,7 @@ class TestUdaDefault(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+weak\s+two")
+        self.assertRegex(out, "1\s+weak\s+two")
 
     def test_uda_without_default_task(self):
         """Add tasks without default UDA"""
@@ -152,7 +152,7 @@ class TestUdaDefault(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+weak\s+10\s+three")
+        self.assertRegex(out, "1\s+weak\s+10\s+three")
 
 
 class TestUdaDuration(TestBaseUda):
@@ -174,7 +174,7 @@ class TestUdaDuration(TestBaseUda):
 
         # Ensure 'extra' is stored in original form.
         code, out, err = self.t("1 export")
-        self.assertRegexpMatches(out, '"extra":"P1D"')
+        self.assertRegex(out, '"extra":"P1D"')
 
     def test_uda_bad_duration_task(self):
         """Add tasks with an invalid UDA duration"""
@@ -200,8 +200,8 @@ class TestUdaNumeric(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+\d+\s+with")
-        self.assertRegexpMatches(out, "2\s+without")
+        self.assertRegex(out, "1\s+\d+\s+with")
+        self.assertRegex(out, "2\s+without")
 
     def test_uda_bad_numeric_task(self):
         """Add tasks with an invalid UDA numeric"""
@@ -225,8 +225,8 @@ class TestUdaString(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+one two\s+with")
-        self.assertRegexpMatches(out, "2\s+without")
+        self.assertRegex(out, "1\s+one two\s+with")
+        self.assertRegex(out, "2\s+without")
 
 
 class TestUdaValue(TestBaseUda):
@@ -245,8 +245,8 @@ class TestUdaValue(TestBaseUda):
         self.assertIn("Created task", out)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+weak\s+one")
-        self.assertRegexpMatches(out, "2\s+strong\s+two")
+        self.assertRegex(out, "1\s+weak\s+one")
+        self.assertRegex(out, "2\s+strong\s+two")
 
     def test_uda_invalid_value_task(self):
         """Add tasks with invalid UDA value"""
@@ -259,8 +259,8 @@ class TestUdaValue(TestBaseUda):
                       "'toxic'", err)
 
         code, out, err = self.t("uda")
-        self.assertRegexpMatches(out, "1\s+strong\s+one")
-        self.assertNotRegexpMatches(out, "1\s+toxic\s+two")
+        self.assertRegex(out, "1\s+strong\s+one")
+        self.assertNotRegex(out, "1\s+toxic\s+two")
 
 
 class TestBug1063(TestCase):
@@ -287,11 +287,11 @@ class TestBug1063(TestCase):
 
         code, out, err = self.t("bar")
         expected = re.compile("4.+3.+2.+1", re.DOTALL)  # dot matches \n too
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
         code, out, err = self.t("bar rc.report.bar.sort=foo+")
         expected = re.compile("1.+2.+3.+4", re.DOTALL)  # dot matches \n too
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
 
 class TestBug21(TestCase):
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index e0b40cfbc..b334e10a2 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -56,12 +56,12 @@ class TestUDAOrphans(TestCase):
 
         # 'info' should show orphans.
         code, out, err = self.t("1 info")
-        self.assertRegexpMatches(out, "\[extra\s+foo\]")
+        self.assertRegex(out, "\[extra\s+foo\]")
 
         # 'modify' should not change the orphan
         self.t("1 modify /one/two/")
         code, out, err = self.t("1 info")
-        self.assertRegexpMatches(out, "\[extra\s+foo\]")
+        self.assertRegex(out, "\[extra\s+foo\]")
 
         # 'export' should include orphans.
         code, out, err = self.t("1 export")
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 200e5c8e0..496677b01 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -147,7 +147,7 @@ class TestBug1319(TestCase):
         self.t("add four when:morning")
 
         code, out, err = self.t("rc.verbose:nothing foo")
-        self.assertRegexpMatches(out, "4\s+morning\s+four\s+3\s+noon\s+three\s+2\s+evening\s+two\s+1\s+night\s+one")
+        self.assertRegex(out, "4\s+morning\s+four\s+3\s+noon\s+three\s+2\s+evening\s+two\s+1\s+night\s+one")
 
 
 if __name__ == "__main__":
diff --git a/test/undo.t b/test/undo.t
index d90e34c54..cc858c977 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -78,15 +78,15 @@ class TestUndoStyle(TestCase):
         """Test that 'rc.undo.style:side' generates the right output"""
         self.t.config("undo.style", "side")
         code, out, err = self.t("undo", input="n\n")
-        self.assertNotRegexpMatches(out, "-tags:\s*\n\+tags:\s+tag")
-        self.assertRegexpMatches(out, "tags\s+tag\s*")
+        self.assertNotRegex(out, "-tags:\s*\n\+tags:\s+tag")
+        self.assertRegex(out, "tags\s+tag\s*")
 
     def test_undo_diff_style(self):
         """Test that 'rc.undo.style:diff' generates the right output"""
         self.t.config("undo.style", "diff")
         code, out, err = self.t("undo", input="n\n")
-        self.assertRegexpMatches(out, "-tags:\s*\n\+tags:\s+tag")
-        self.assertNotRegexpMatches(out, "tags\s+tag\s*")
+        self.assertRegex(out, "-tags:\s*\n\+tags:\s+tag")
+        self.assertNotRegex(out, "tags\s+tag\s*")
 
 
 class TestBug634(TestCase):
diff --git a/test/upgrade.t b/test/upgrade.t
index cca512658..95fa43fbd 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -44,19 +44,19 @@ class TestUpgrade(TestCase):
         self.t("add one")
 
         code, out, err = self.t("1 info")
-        self.assertRegexpMatches(out, "Status\s+Pending")
+        self.assertRegex(out, "Status\s+Pending")
 
         self.t("1 modify due:tomorrow recur:weekly")
         self.t("list")
 
         code, out, err = self.t("1 info")
-        self.assertRegexpMatches(out, "Status\s+Recurring")
-        self.assertRegexpMatches(out, "Recurrence\s+weekly")
+        self.assertRegex(out, "Status\s+Recurring")
+        self.assertRegex(out, "Recurrence\s+weekly")
 
         # Also check for the presence of a children task with pending state
         code, out, err = self.t("2 info")
-        self.assertRegexpMatches(out, "Status\s+Pending")
-        self.assertRegexpMatches(out, "Recurrence\s+weekly")
+        self.assertRegex(out, "Status\s+Pending")
+        self.assertRegex(out, "Recurrence\s+weekly")
 
 
 if __name__ == "__main__":
diff --git a/test/verbose.t b/test/verbose.t
index 16dd76a54..6e7efcdf0 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -50,20 +50,20 @@ class TestVerbosity(TestCase):
     def test_verbosity_new_id(self):
         """Verbosity new-id"""
         code, out, err = self.t("rc.verbose:new-id add Sample1")
-        self.assertRegexpMatches(out, r"Created task \d")
+        self.assertRegex(out, r"Created task \d")
 
         code, out, err = self.t("rc.verbose:nothing add Sample2")
-        self.assertNotRegexpMatches(out, r"Created task \d")
+        self.assertNotRegex(out, r"Created task \d")
 
     def test_verbosity_new_uuid(self):
         """Verbosity new-uuid"""
         code, out, err = self.t(("rc.verbose:new-uuid", "add", "Sample1"))
-        self.assertRegexpMatches(out, r"Created task [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
+        self.assertRegex(out, r"Created task [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
 
     def test_verbosity_label(self):
         """Verbosity label"""
         code, out, err = self.t("rc.verbose:label ls")
-        self.assertRegexpMatches(
+        self.assertRegex(
             out,
             "ID.+A.+D.+Project.+Tags.+R.+Wait.+S.+Due.+Until.+Description"
         )
@@ -73,15 +73,15 @@ class TestVerbosity(TestCase):
         code, out, err = self.t("rc.verbose:affected ls")
 
         expected = re.compile(r"^\d+ tasks?$", re.MULTILINE)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def test_verbosity_off(self):
         """Verbosity off"""
         code, out, err = self.t("rc.verbose:nothing ls")
 
         expected = re.compile(r"^\d+ tasks?$", re.MULTILINE)
-        self.assertNotRegexpMatches(out, expected)
-        self.assertNotRegexpMatches(out, "ID.+Project.+Pri.+Description")
+        self.assertNotRegex(out, expected)
+        self.assertNotRegex(out, "ID.+Project.+Pri.+Description")
 
     def test_verbosity_special(self):
         """Verbosity special"""
diff --git a/test/version.t b/test/version.t
index 1b852d6a5..ea68342bc 100755
--- a/test/version.t
+++ b/test/version.t
@@ -55,7 +55,7 @@ class TestVersion(TestCase):
         code, out, err = self.t("version")
 
         expected = "Copyright \(C\) \d{4} - %d" % (datetime.now().year,)
-        self.assertRegexpMatches(out, expected)
+        self.assertRegex(out, expected)
 
     def slurp(self, file="../CMakeLists.txt"):
         number = "\.".join(["[0-9]+"] * 3)
@@ -85,7 +85,7 @@ class TestVersion(TestCase):
     def test_version_option(self):
         """Verify that  'task --version' returns something valid"""
         code, out, err = self.t("--version")
-        self.assertRegexpMatches(out, r'^\d\.\d+\.\d+(\.\w+)?$')
+        self.assertRegex(out, r'^\d\.\d+\.\d+(\.\w+)?$')
 
 
 if __name__ == "__main__":

From d1b867f7b55b9ab1221bd9dc3174dd045b08a29f Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 21 Nov 2020 12:41:18 -0500
Subject: [PATCH 865/879] tests: Do not require line buffering

Test runner complains about it not being supported with binary files and
it does not look like it affects any tests in the first place anyway.
---
 test/basetest/utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 12e5bd975..8537815a2 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -249,7 +249,6 @@ def run_cmd_wait(cmd, input=None, stdout=PIPE, stderr=PIPE,
             "stdin": stdin,
             "stdout": stdout,
             "stderr": stderr,
-            "bufsize": 1,
             "close_fds": ON_POSIX,
             "env": env,
         },

From 351965a87bda9cbe633b5904a6618aebd6382fb0 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 21 Nov 2020 12:43:40 -0500
Subject: [PATCH 866/879] Update copyright to 2020

---
 COPYING                            | 2 +-
 LICENSE                            | 2 +-
 doc/man/task-color.5.in            | 2 +-
 doc/man/task-sync.5.in             | 2 +-
 doc/man/task.1.in                  | 2 +-
 doc/man/taskrc.5.in                | 2 +-
 doc/rc/dark-16.theme               | 2 +-
 doc/rc/dark-256.theme              | 2 +-
 doc/rc/dark-blue-256.theme         | 2 +-
 doc/rc/dark-gray-256.theme         | 2 +-
 doc/rc/dark-gray-blue-256.theme    | 2 +-
 doc/rc/dark-green-256.theme        | 2 +-
 doc/rc/dark-red-256.theme          | 2 +-
 doc/rc/dark-violets-256.theme      | 2 +-
 doc/rc/dark-yellow-green.theme     | 2 +-
 doc/rc/light-16.theme              | 2 +-
 doc/rc/light-256.theme             | 2 +-
 doc/rc/no-color.theme              | 2 +-
 doc/rc/solarized-dark-256.theme    | 2 +-
 doc/rc/solarized-light-256.theme   | 2 +-
 scripts/add-ons/update-holidays.pl | 4 ++--
 scripts/bash/task.sh               | 2 +-
 scripts/fish/task.fish             | 2 +-
 scripts/vim/README                 | 2 +-
 scripts/vim/ftdetect/task.vim      | 2 +-
 scripts/vim/syntax/taskdata.vim    | 2 +-
 scripts/vim/syntax/taskedit.vim    | 2 +-
 scripts/vim/syntax/taskrc.vim      | 2 +-
 scripts/zsh/_task                  | 2 +-
 src/CLI2.cpp                       | 2 +-
 src/CLI2.h                         | 2 +-
 src/Context.cpp                    | 2 +-
 src/Context.h                      | 2 +-
 src/DOM.cpp                        | 2 +-
 src/DOM.h                          | 2 +-
 src/Eval.cpp                       | 2 +-
 src/Eval.h                         | 2 +-
 src/Filter.cpp                     | 2 +-
 src/Filter.h                       | 2 +-
 src/Hooks.cpp                      | 2 +-
 src/Hooks.h                        | 2 +-
 src/Lexer.cpp                      | 2 +-
 src/Lexer.h                        | 2 +-
 src/TDB2.cpp                       | 2 +-
 src/TDB2.h                         | 2 +-
 src/TLSClient.cpp                  | 2 +-
 src/TLSClient.h                    | 2 +-
 src/Task.cpp                       | 2 +-
 src/Task.h                         | 2 +-
 src/Variant.cpp                    | 2 +-
 src/Variant.h                      | 2 +-
 src/ViewTask.cpp                   | 2 +-
 src/ViewTask.h                     | 2 +-
 src/calc.cpp                       | 4 ++--
 src/columns/ColDepends.cpp         | 2 +-
 src/columns/ColDepends.h           | 2 +-
 src/columns/ColDescription.cpp     | 2 +-
 src/columns/ColDescription.h       | 2 +-
 src/columns/ColDue.cpp             | 2 +-
 src/columns/ColDue.h               | 2 +-
 src/columns/ColEnd.cpp             | 2 +-
 src/columns/ColEnd.h               | 2 +-
 src/columns/ColEntry.cpp           | 2 +-
 src/columns/ColEntry.h             | 2 +-
 src/columns/ColID.cpp              | 2 +-
 src/columns/ColID.h                | 2 +-
 src/columns/ColIMask.cpp           | 2 +-
 src/columns/ColIMask.h             | 2 +-
 src/columns/ColMask.cpp            | 2 +-
 src/columns/ColMask.h              | 2 +-
 src/columns/ColModified.cpp        | 2 +-
 src/columns/ColModified.h          | 2 +-
 src/columns/ColParent.cpp          | 2 +-
 src/columns/ColParent.h            | 2 +-
 src/columns/ColProject.cpp         | 2 +-
 src/columns/ColProject.h           | 2 +-
 src/columns/ColRecur.cpp           | 2 +-
 src/columns/ColRecur.h             | 2 +-
 src/columns/ColScheduled.cpp       | 2 +-
 src/columns/ColScheduled.h         | 2 +-
 src/columns/ColStart.cpp           | 2 +-
 src/columns/ColStart.h             | 2 +-
 src/columns/ColStatus.cpp          | 2 +-
 src/columns/ColStatus.h            | 2 +-
 src/columns/ColTags.cpp            | 2 +-
 src/columns/ColTags.h              | 2 +-
 src/columns/ColTypeDate.cpp        | 2 +-
 src/columns/ColTypeDate.h          | 2 +-
 src/columns/ColTypeDuration.cpp    | 2 +-
 src/columns/ColTypeDuration.h      | 2 +-
 src/columns/ColTypeNumeric.cpp     | 2 +-
 src/columns/ColTypeNumeric.h       | 2 +-
 src/columns/ColTypeString.cpp      | 2 +-
 src/columns/ColTypeString.h        | 2 +-
 src/columns/ColUDA.cpp             | 2 +-
 src/columns/ColUDA.h               | 2 +-
 src/columns/ColUUID.cpp            | 2 +-
 src/columns/ColUUID.h              | 2 +-
 src/columns/ColUntil.cpp           | 2 +-
 src/columns/ColUntil.h             | 2 +-
 src/columns/ColUrgency.cpp         | 2 +-
 src/columns/ColUrgency.h           | 2 +-
 src/columns/ColWait.cpp            | 2 +-
 src/columns/ColWait.h              | 2 +-
 src/columns/Column.cpp             | 2 +-
 src/columns/Column.h               | 2 +-
 src/commands/CmdAdd.cpp            | 2 +-
 src/commands/CmdAdd.h              | 2 +-
 src/commands/CmdAliases.cpp        | 2 +-
 src/commands/CmdAliases.h          | 2 +-
 src/commands/CmdAnnotate.cpp       | 2 +-
 src/commands/CmdAnnotate.h         | 2 +-
 src/commands/CmdAppend.cpp         | 2 +-
 src/commands/CmdAppend.h           | 2 +-
 src/commands/CmdAttributes.cpp     | 2 +-
 src/commands/CmdAttributes.h       | 2 +-
 src/commands/CmdBurndown.h         | 2 +-
 src/commands/CmdCalc.cpp           | 2 +-
 src/commands/CmdCalc.h             | 2 +-
 src/commands/CmdCalendar.cpp       | 2 +-
 src/commands/CmdCalendar.h         | 2 +-
 src/commands/CmdColor.cpp          | 2 +-
 src/commands/CmdColor.h            | 2 +-
 src/commands/CmdColumns.cpp        | 2 +-
 src/commands/CmdColumns.h          | 2 +-
 src/commands/CmdCommands.cpp       | 2 +-
 src/commands/CmdCommands.h         | 2 +-
 src/commands/CmdConfig.cpp         | 2 +-
 src/commands/CmdConfig.h           | 2 +-
 src/commands/CmdContext.cpp        | 2 +-
 src/commands/CmdContext.h          | 2 +-
 src/commands/CmdCount.cpp          | 2 +-
 src/commands/CmdCount.h            | 2 +-
 src/commands/CmdCustom.cpp         | 2 +-
 src/commands/CmdCustom.h           | 2 +-
 src/commands/CmdDelete.cpp         | 2 +-
 src/commands/CmdDelete.h           | 2 +-
 src/commands/CmdDenotate.cpp       | 2 +-
 src/commands/CmdDenotate.h         | 2 +-
 src/commands/CmdDiagnostics.cpp    | 2 +-
 src/commands/CmdDiagnostics.h      | 2 +-
 src/commands/CmdDone.cpp           | 2 +-
 src/commands/CmdDone.h             | 2 +-
 src/commands/CmdDuplicate.cpp      | 2 +-
 src/commands/CmdDuplicate.h        | 2 +-
 src/commands/CmdEdit.cpp           | 2 +-
 src/commands/CmdEdit.h             | 2 +-
 src/commands/CmdExec.cpp           | 2 +-
 src/commands/CmdExec.h             | 2 +-
 src/commands/CmdExport.cpp         | 2 +-
 src/commands/CmdExport.h           | 2 +-
 src/commands/CmdGet.cpp            | 2 +-
 src/commands/CmdGet.h              | 2 +-
 src/commands/CmdHelp.cpp           | 2 +-
 src/commands/CmdHelp.h             | 2 +-
 src/commands/CmdHistory.cpp        | 2 +-
 src/commands/CmdHistory.h          | 2 +-
 src/commands/CmdIDs.cpp            | 2 +-
 src/commands/CmdIDs.h              | 2 +-
 src/commands/CmdImport.cpp         | 2 +-
 src/commands/CmdImport.h           | 2 +-
 src/commands/CmdInfo.cpp           | 2 +-
 src/commands/CmdInfo.h             | 2 +-
 src/commands/CmdLog.cpp            | 2 +-
 src/commands/CmdLog.h              | 2 +-
 src/commands/CmdLogo.cpp           | 2 +-
 src/commands/CmdLogo.h             | 2 +-
 src/commands/CmdModify.cpp         | 2 +-
 src/commands/CmdModify.h           | 2 +-
 src/commands/CmdPrepend.cpp        | 2 +-
 src/commands/CmdPrepend.h          | 2 +-
 src/commands/CmdProjects.cpp       | 2 +-
 src/commands/CmdProjects.h         | 2 +-
 src/commands/CmdPurge.cpp          | 2 +-
 src/commands/CmdPurge.h            | 2 +-
 src/commands/CmdReports.cpp        | 2 +-
 src/commands/CmdReports.h          | 2 +-
 src/commands/CmdShow.cpp           | 2 +-
 src/commands/CmdShow.h             | 2 +-
 src/commands/CmdStart.cpp          | 2 +-
 src/commands/CmdStart.h            | 2 +-
 src/commands/CmdStats.cpp          | 2 +-
 src/commands/CmdStats.h            | 2 +-
 src/commands/CmdStop.cpp           | 2 +-
 src/commands/CmdStop.h             | 2 +-
 src/commands/CmdSummary.cpp        | 2 +-
 src/commands/CmdSummary.h          | 2 +-
 src/commands/CmdSync.cpp           | 2 +-
 src/commands/CmdSync.h             | 2 +-
 src/commands/CmdTags.cpp           | 2 +-
 src/commands/CmdTags.h             | 2 +-
 src/commands/CmdTimesheet.cpp      | 2 +-
 src/commands/CmdTimesheet.h        | 2 +-
 src/commands/CmdUDAs.cpp           | 2 +-
 src/commands/CmdUDAs.h             | 2 +-
 src/commands/CmdUndo.cpp           | 2 +-
 src/commands/CmdUndo.h             | 2 +-
 src/commands/CmdUnique.cpp         | 2 +-
 src/commands/CmdUnique.h           | 2 +-
 src/commands/CmdUrgency.cpp        | 2 +-
 src/commands/CmdUrgency.h          | 2 +-
 src/commands/CmdVersion.cpp        | 4 ++--
 src/commands/CmdVersion.h          | 2 +-
 src/commands/Command.cpp           | 2 +-
 src/commands/Command.h             | 2 +-
 src/dependency.cpp                 | 2 +-
 src/feedback.cpp                   | 2 +-
 src/legacy.cpp                     | 2 +-
 src/main.cpp                       | 2 +-
 src/main.h                         | 2 +-
 src/nag.cpp                        | 2 +-
 src/recur.cpp                      | 2 +-
 src/rules.cpp                      | 2 +-
 src/sort.cpp                       | 2 +-
 src/util.cpp                       | 2 +-
 src/util.h                         | 2 +-
 test/abbreviation.t                | 2 +-
 test/add.t                         | 2 +-
 test/alias.t                       | 2 +-
 test/annotate.t                    | 2 +-
 test/append.t                      | 2 +-
 test/args.t                        | 2 +-
 test/backlog.t                     | 2 +-
 test/bash_completion.t             | 2 +-
 test/bash_tap.sh                   | 2 +-
 test/bash_tap_tw.sh                | 2 +-
 test/blocked.t                     | 2 +-
 test/bulk.t                        | 2 +-
 test/burndown.t                    | 2 +-
 test/calc.t                        | 2 +-
 test/calendar.t                    | 2 +-
 test/caseless.t                    | 2 +-
 test/col.t.cpp                     | 2 +-
 test/color.cmd.t                   | 2 +-
 test/color.rules.t                 | 2 +-
 test/columns.t                     | 2 +-
 test/commands.t                    | 2 +-
 test/completed.t                   | 2 +-
 test/configuration.t               | 2 +-
 test/confirmation.t                | 2 +-
 test/context.t                     | 2 +-
 test/count.t                       | 2 +-
 test/custom.config.t               | 2 +-
 test/custom.recur_ind.t            | 2 +-
 test/custom.t                      | 2 +-
 test/custom.tag_ind.t              | 2 +-
 test/date.iso.t                    | 2 +-
 test/dateformat.t                  | 2 +-
 test/datesort.t                    | 2 +-
 test/datetime-negative.t           | 2 +-
 test/debug.t                       | 2 +-
 test/default.t                     | 2 +-
 test/delete.t                      | 2 +-
 test/denotate.t                    | 2 +-
 test/dependencies.t                | 2 +-
 test/diag.t                        | 2 +-
 test/diag_color.t                  | 2 +-
 test/dom.t.cpp                     | 2 +-
 test/dom2.t                        | 2 +-
 test/due.t                         | 2 +-
 test/duplicate.t                   | 2 +-
 test/edit.t                        | 2 +-
 test/encoding.t                    | 2 +-
 test/enpassant.t                   | 2 +-
 test/eval.t.cpp                    | 2 +-
 test/exec.t                        | 2 +-
 test/export.t                      | 2 +-
 test/feature.559.t                 | 2 +-
 test/feature.default.project.t     | 2 +-
 test/feature.print.empty.columns.t | 2 +-
 test/feature.recurrence.t          | 2 +-
 test/feedback.t                    | 2 +-
 test/filter.t                      | 2 +-
 test/fontunderline.t               | 2 +-
 test/format.t                      | 2 +-
 test/gc.t                          | 2 +-
 test/helpers.t                     | 2 +-
 test/history.t                     | 2 +-
 test/hooks.env.t                   | 2 +-
 test/hooks.on-add.t                | 2 +-
 test/hooks.on-exit.t               | 2 +-
 test/hooks.on-launch.t             | 2 +-
 test/hooks.on-modify.t             | 2 +-
 test/hyphenate.t                   | 2 +-
 test/ids.t                         | 2 +-
 test/import.t                      | 2 +-
 test/info.t                        | 2 +-
 test/lexer.t.cpp                   | 2 +-
 test/limit.t                       | 2 +-
 test/list.all.projects.t           | 2 +-
 test/log.t                         | 2 +-
 test/logo.t                        | 2 +-
 test/math.t                        | 2 +-
 test/modify.t                      | 2 +-
 test/nag.t                         | 2 +-
 test/obfuscate.t                   | 2 +-
 test/oldest.t                      | 2 +-
 test/operators.t                   | 2 +-
 test/overdue.t                     | 2 +-
 test/partial.t                     | 2 +-
 test/prepend.t                     | 2 +-
 test/pri_sort.t                    | 2 +-
 test/project.t                     | 2 +-
 test/purge.t                       | 2 +-
 test/quotes.t                      | 2 +-
 test/rc.override.t                 | 2 +-
 test/recurrence.t                  | 2 +-
 test/reports.t                     | 2 +-
 test/search.t                      | 2 +-
 test/sequence.t                    | 2 +-
 test/shell.t                       | 2 +-
 test/show.t                        | 2 +-
 test/simpletap/__init__.py         | 2 +-
 test/sorting.t                     | 2 +-
 test/special.t                     | 2 +-
 test/start.t                       | 2 +-
 test/stats.t                       | 2 +-
 test/substitute.t                  | 2 +-
 test/sugar.t                       | 2 +-
 test/summary.t                     | 2 +-
 test/t.t.cpp                       | 2 +-
 test/tag.t                         | 2 +-
 test/taskrc.t                      | 2 +-
 test/tdb2.t.cpp                    | 2 +-
 test/template.t                    | 2 +-
 test/test.cpp                      | 2 +-
 test/test.h                        | 2 +-
 test/timesheet.t                   | 2 +-
 test/tw-1379.t                     | 2 +-
 test/tw-1837.t                     | 2 +-
 test/tw-1999.t                     | 2 +-
 test/tw-20.t                       | 2 +-
 test/tw-262.t                      | 2 +-
 test/tw-295.t                      | 2 +-
 test/tw-46.t                       | 2 +-
 test/uda.t                         | 2 +-
 test/uda_orphan.t                  | 2 +-
 test/uda_report.t                  | 2 +-
 test/uda_sort.t                    | 2 +-
 test/undo.t                        | 2 +-
 test/unicode.t                     | 2 +-
 test/unique.t                      | 2 +-
 test/upgrade.t                     | 2 +-
 test/urgency.t                     | 2 +-
 test/urgency_inherit.t             | 2 +-
 test/util.t.cpp                    | 2 +-
 test/uuid.t                        | 2 +-
 test/variant_add.t.cpp             | 2 +-
 test/variant_and.t.cpp             | 2 +-
 test/variant_cast.t.cpp            | 2 +-
 test/variant_divide.t.cpp          | 2 +-
 test/variant_equal.t.cpp           | 2 +-
 test/variant_exp.t.cpp             | 2 +-
 test/variant_gt.t.cpp              | 2 +-
 test/variant_gte.t.cpp             | 2 +-
 test/variant_inequal.t.cpp         | 2 +-
 test/variant_lt.t.cpp              | 2 +-
 test/variant_lte.t.cpp             | 2 +-
 test/variant_match.t.cpp           | 2 +-
 test/variant_math.t.cpp            | 2 +-
 test/variant_modulo.t.cpp          | 2 +-
 test/variant_multiply.t.cpp        | 2 +-
 test/variant_nomatch.t.cpp         | 2 +-
 test/variant_not.t.cpp             | 2 +-
 test/variant_or.t.cpp              | 2 +-
 test/variant_partial.t.cpp         | 2 +-
 test/variant_subtract.t.cpp        | 2 +-
 test/variant_xor.t.cpp             | 2 +-
 test/verbose.t                     | 2 +-
 test/version.t                     | 2 +-
 test/view.t.cpp                    | 2 +-
 test/wait.t                        | 2 +-
 372 files changed, 375 insertions(+), 375 deletions(-)

diff --git a/COPYING b/COPYING
index ed86152e6..2f43e0f23 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2020, 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
diff --git a/LICENSE b/LICENSE
index ed86152e6..2f43e0f23 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
 
-Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2020, 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
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index b2c0336cf..2056d57d0 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -288,7 +288,7 @@ Better yet, create your own, and share it.  We will gladly host the theme file
 on <https://taskwarrior.org>.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index 6a13a0a76..c066178f1 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -147,7 +147,7 @@ Weaknesses:
   - You need to manage your own server, or gain access to a hosted server.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 49023a183..3cc9318ba 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1332,7 +1332,7 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" command.
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
 
 Taskwarrior is distributed under the MIT license. See
 https://www.opensource.org/licenses/mit-license.php for more information.
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 522fce5c4..f9990c149 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1512,7 +1512,7 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2019 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
 
 This man page was originally written by Federico Hernandez.
 
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index 40cff797f..540983863 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 26df05a06..2a83ecc76 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 9108153d3..2d494ec67 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index 0d065af0b..fd7f42efd 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme
index b0e4412bf..2acd71014 100644
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index 725801be7..643ba3a2d 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index 7ae5b0a4a..5c0853e41 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme
index 33fcef3e3..daecafcbd 100644
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index 513457ce8..9a76cf027 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index b93c43f8f..c582c4802 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index ceb463bad..7d2106e0f 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme
index c20e0b565..635e6e799 100644
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme
index 3a8bddb73..31f1d36f6 100644
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme
index 5128f2b4d..44575f49a 100644
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index b7f494728..035157e23 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2020, 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
@@ -189,7 +189,7 @@ if (open my $fh, '>:utf8', $file)
         "# ${url_current}\n",
         "# ${url_next}\n",
         "#\n",
-        "# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2020, 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",
diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
index 114013e52..ac07c096d 100644
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/scripts/fish/task.fish b/scripts/fish/task.fish
index 20569635b..da0e0b544 100644
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2019, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2020, Roman Inflianskas <infroma@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/vim/README b/scripts/vim/README
index 4efb8499c..91df60ee8 100644
--- 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 - 2019 John Florian
+Copyright 2009 - 2020 John Florian
 
 and are available under the MIT license.
 For the full text of this license, see COPYING.
diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim
index 9451e4b85..82dc22539 100644
--- 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 - 2019 John Florian
+" Copyright 2009 - 2020 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskdata.vim b/scripts/vim/syntax/taskdata.vim
index 89756b52b..739a86efa 100644
--- 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 - 2019 John Florian
+" Copyright 2009 - 2020 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskedit.vim b/scripts/vim/syntax/taskedit.vim
index 1cf6abaa3..240e4dc96 100644
--- 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 - 2019 John Florian
+" Copyright 2009 - 2020 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
diff --git a/scripts/vim/syntax/taskrc.vim b/scripts/vim/syntax/taskrc.vim
index 6c71a6289..1166a5ee0 100644
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 "
-" Copyright (c) 2014 - 2019 Taskwarrior Team
+" Copyright (c) 2014 - 2020 Taskwarrior Team
 " Copyright (c) 2009 - 2014 John Florian
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 3e60a7eff..2b244779c 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -1,6 +1,6 @@
 #compdef task
 #
-# Copyright 2010 - 2019 Johannes Schlatow
+# Copyright 2010 - 2020 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index f76978327..b641cafb4 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/CLI2.h b/src/CLI2.h
index 050aa723e..23ecf8f31 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Context.cpp b/src/Context.cpp
index 000b3e2c9..b3f179242 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Context.h b/src/Context.h
index 0a5a8b7c6..e863e6530 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 4af987639..d310f21f9 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/DOM.h b/src/DOM.h
index e6fbcbe32..c6b22cfc4 100644
--- a/src/DOM.h
+++ b/src/DOM.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 68b44c611..6afc1e31e 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/Eval.h b/src/Eval.h
index f3b3a0adb..c65c628f4 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/Filter.cpp b/src/Filter.cpp
index ec9620e07..321b57aee 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Filter.h b/src/Filter.h
index ce251b434..e6ee3a29f 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index e8de61ee9..d4f5a3897 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Hooks.h b/src/Hooks.h
index 19212820d..a4890d7c3 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index a95fb1171..703681e68 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/Lexer.h b/src/Lexer.h
index d556bbb9b..7c5cbfd02 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 137c68b28..e984a03c8 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/TDB2.h b/src/TDB2.h
index 46572ffc2..98288e500 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 0080079d6..990a7a9d5 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/TLSClient.h b/src/TLSClient.h
index 16f63d775..d7f093f78 100644
--- a/src/TLSClient.h
+++ b/src/TLSClient.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Task.cpp b/src/Task.cpp
index 84c6c41e1..e5e7c2a85 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Task.h b/src/Task.h
index cbc7fd807..6d8f244c1 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/Variant.cpp b/src/Variant.cpp
index c02c273a2..50397eb55 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/Variant.h b/src/Variant.h
index 6c94ce0dc..05f1f575b 100644
--- a/src/Variant.h
+++ b/src/Variant.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2013 - 2020, 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
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index 6b441f1a3..29ef5be75 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/ViewTask.h b/src/ViewTask.h
index 61be102db..c098d2c70 100644
--- a/src/ViewTask.h
+++ b/src/ViewTask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/calc.cpp b/src/calc.cpp
index 427f58ddc..27bc4dda6 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -93,7 +93,7 @@ int main (int argc, char** argv)
                   << format ("calc {1} built for ", VERSION)
                   << osName ()
                   << '\n'
-                  << "Copyright (C) 2006 - 2019 P. Beckingham, F. Hernandez."
+                  << "Copyright (C) 2006 - 2020 P. Beckingham, F. Hernandez."
                   << '\n'
                   << '\n'
                   << "Taskwarrior may be copied only under the terms of the MIT license, which may be found in the Taskwarrior source kit."
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index cac9b2205..dca785a00 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index 4ff8343b3..a35dba283 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 3619ce9db..669a789f5 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index 4aa5fa565..533e0f6a1 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index e6af6c0a0..4efbed99e 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 4b3f53346..7396ddd9c 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index 9ceb02f95..e3aead3a9 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index 68ae38e14..0f110dd8d 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index d7f94474e..8c077dd0c 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index 912be7048..c29fdfa32 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index 9e5ff4e00..755b567e9 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 38bd0f4e2..56c0a5e61 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index 1136875d5..24353ade1 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index e5549ac0c..754397254 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index 6744a15e8..e81322050 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index ad479c1f1..3e7e7d3d4 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index c4d0117b8..c0c1f08a1 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index 21f78adc8..e8d7a56e3 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index ae5afe03c..29786c75d 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index 082245137..ec5eb9c48 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index 6ecc2c770..f3626b9c5 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index 8412a9f63..5d82ea719 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 8ded6f4cd..4c71deaf0 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index a23824ed7..8c6792c3a 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index a498b70e4..8d5d51aff 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index 6cb808760..b7aee2291 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 9f9c0ddb3..1454d9bf9 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index 62a347ea9..9f725cece 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 89ee22efb..65562909f 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index ed7043c1a..a21fb3c26 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index d9dab5c62..f5d4e86bb 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index 36325e4c2..5ae0c0f64 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index ff7c23d94..0e0a5c542 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeDate.h b/src/columns/ColTypeDate.h
index 624406c99..ceca5e383 100644
--- a/src/columns/ColTypeDate.h
+++ b/src/columns/ColTypeDate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 77bd79e96..43c7e87c2 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeDuration.h b/src/columns/ColTypeDuration.h
index dd2e3e71f..d548f7081 100644
--- a/src/columns/ColTypeDuration.h
+++ b/src/columns/ColTypeDuration.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index d6f7d46b8..064892ad3 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeNumeric.h b/src/columns/ColTypeNumeric.h
index 1c1f050ba..5d3a1ac83 100644
--- a/src/columns/ColTypeNumeric.h
+++ b/src/columns/ColTypeNumeric.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 06852d347..cdbfe0298 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColTypeString.h b/src/columns/ColTypeString.h
index 4ec657b17..90050eda8 100644
--- a/src/columns/ColTypeString.h
+++ b/src/columns/ColTypeString.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 69619a99f..5a2fd1848 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 798f26c80..b540db0f9 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 4980fac1e..775a45cb4 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index 6056af789..592b44bc5 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index 0f5e028e5..8163ec13b 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index c2bd0488c..276949ad4 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index 0a726eff2..5dc1ee9b8 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 01b424c65..192b0fa3b 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index 4b8d50566..c42e54641 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index 7aabdf4bd..146db274f 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 21162db16..ca0fe736e 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/columns/Column.h b/src/columns/Column.h
index a196c8176..1bdf3979d 100644
--- a/src/columns/Column.h
+++ b/src/columns/Column.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index e76d68ac2..460478cfe 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAdd.h b/src/commands/CmdAdd.h
index 9ae953882..0057853b8 100644
--- a/src/commands/CmdAdd.h
+++ b/src/commands/CmdAdd.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 1a6701879..c1a45472f 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAliases.h b/src/commands/CmdAliases.h
index 2d790f6a5..f208db0c6 100644
--- a/src/commands/CmdAliases.h
+++ b/src/commands/CmdAliases.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index c1f6df586..10188f975 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAnnotate.h b/src/commands/CmdAnnotate.h
index 917f2718c..0dd0d3b80 100644
--- a/src/commands/CmdAnnotate.h
+++ b/src/commands/CmdAnnotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 30b440bd1..52edd4461 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAppend.h b/src/commands/CmdAppend.h
index bb8530547..c7f6dfd90 100644
--- a/src/commands/CmdAppend.h
+++ b/src/commands/CmdAppend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 3a1f73a54..69866a7d4 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdAttributes.h b/src/commands/CmdAttributes.h
index 5dedcc6c7..7d1ed863b 100644
--- a/src/commands/CmdAttributes.h
+++ b/src/commands/CmdAttributes.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdBurndown.h b/src/commands/CmdBurndown.h
index 63de42efd..23542c98b 100644
--- a/src/commands/CmdBurndown.h
+++ b/src/commands/CmdBurndown.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 977c3c12d..2bf449ae8 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCalc.h b/src/commands/CmdCalc.h
index 1aa7c6061..e35c294a9 100644
--- a/src/commands/CmdCalc.h
+++ b/src/commands/CmdCalc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 232ef0cd0..d9053a001 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCalendar.h b/src/commands/CmdCalendar.h
index 21f25e3ad..9bb6e797b 100644
--- a/src/commands/CmdCalendar.h
+++ b/src/commands/CmdCalendar.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 893772fb7..a12d90fe2 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdColor.h b/src/commands/CmdColor.h
index 49aba46c3..285a2d450 100644
--- a/src/commands/CmdColor.h
+++ b/src/commands/CmdColor.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index ac010e26c..e9267485a 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdColumns.h b/src/commands/CmdColumns.h
index 593aad980..edf7b587d 100644
--- a/src/commands/CmdColumns.h
+++ b/src/commands/CmdColumns.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index e8eeb3d67..1b60c7996 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCommands.h b/src/commands/CmdCommands.h
index fc6768a34..79cf5e7cd 100644
--- a/src/commands/CmdCommands.h
+++ b/src/commands/CmdCommands.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index a2222a5e5..a5c318496 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdConfig.h b/src/commands/CmdConfig.h
index 860794811..fca831946 100644
--- a/src/commands/CmdConfig.h
+++ b/src/commands/CmdConfig.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index bc36177b6..128c63af4 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdContext.h b/src/commands/CmdContext.h
index 2ff884ea3..bb19ad220 100644
--- a/src/commands/CmdContext.h
+++ b/src/commands/CmdContext.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index c941aa21e..2d3b62dac 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCount.h b/src/commands/CmdCount.h
index da7f2ea71..498434b81 100644
--- a/src/commands/CmdCount.h
+++ b/src/commands/CmdCount.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index a4c37d0f8..619e46293 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h
index 9ce9a5251..4a3e2769c 100644
--- a/src/commands/CmdCustom.h
+++ b/src/commands/CmdCustom.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 7f46be024..4f83119c5 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDelete.h b/src/commands/CmdDelete.h
index 5342d62d0..3381b3545 100644
--- a/src/commands/CmdDelete.h
+++ b/src/commands/CmdDelete.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index dee84cbef..b48da1edc 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDenotate.h b/src/commands/CmdDenotate.h
index 28461df98..fa8eaa643 100644
--- a/src/commands/CmdDenotate.h
+++ b/src/commands/CmdDenotate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 8040c6cb6..692b1057a 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDiagnostics.h b/src/commands/CmdDiagnostics.h
index 5a7ee6b8f..eb096c92a 100644
--- a/src/commands/CmdDiagnostics.h
+++ b/src/commands/CmdDiagnostics.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 8858b26d0..640b80c8c 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDone.h b/src/commands/CmdDone.h
index c3aed336a..ba0aa4745 100644
--- a/src/commands/CmdDone.h
+++ b/src/commands/CmdDone.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index ec43da7a1..fe492911e 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdDuplicate.h b/src/commands/CmdDuplicate.h
index 374432d00..d1eb45375 100644
--- a/src/commands/CmdDuplicate.h
+++ b/src/commands/CmdDuplicate.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index eda3e557c..a27fe2d4c 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdEdit.h b/src/commands/CmdEdit.h
index 0dcedc34b..3319e3ec4 100644
--- a/src/commands/CmdEdit.h
+++ b/src/commands/CmdEdit.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 502a57289..7cdd6bd41 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h
index 0eba03317..f545c1fd3 100644
--- a/src/commands/CmdExec.h
+++ b/src/commands/CmdExec.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 403909976..0f431b282 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdExport.h b/src/commands/CmdExport.h
index 6eae137c4..7c3248ccf 100644
--- a/src/commands/CmdExport.h
+++ b/src/commands/CmdExport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 595a966ea..d3d11bb9a 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdGet.h b/src/commands/CmdGet.h
index c85075ceb..2e7f04d61 100644
--- a/src/commands/CmdGet.h
+++ b/src/commands/CmdGet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 106f3a75b..38f3e4ed7 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h
index 9eaa1617c..1664ebd7f 100644
--- a/src/commands/CmdHelp.h
+++ b/src/commands/CmdHelp.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index a3fdfe8ac..3c41fa1fa 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdHistory.h b/src/commands/CmdHistory.h
index 7bc562efa..06283f28c 100644
--- a/src/commands/CmdHistory.h
+++ b/src/commands/CmdHistory.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index d3d70b3ac..bbfc9786d 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdIDs.h b/src/commands/CmdIDs.h
index 0b770d302..8ca97a256 100644
--- a/src/commands/CmdIDs.h
+++ b/src/commands/CmdIDs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 0be459c3f..0d756bdd6 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdImport.h b/src/commands/CmdImport.h
index 2f94731cb..b6180d8c8 100644
--- a/src/commands/CmdImport.h
+++ b/src/commands/CmdImport.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index d28c5395f..eb3587393 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdInfo.h b/src/commands/CmdInfo.h
index 03b9ae176..1285bb8bd 100644
--- a/src/commands/CmdInfo.h
+++ b/src/commands/CmdInfo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 40a97e1be..e158dff53 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdLog.h b/src/commands/CmdLog.h
index fc4cf8029..79c921b94 100644
--- a/src/commands/CmdLog.h
+++ b/src/commands/CmdLog.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index 4c83bf64b..b884bb528 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h
index 3e3571b7d..03ba6c672 100644
--- a/src/commands/CmdLogo.h
+++ b/src/commands/CmdLogo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index da38f312f..2682056c1 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdModify.h b/src/commands/CmdModify.h
index 22df52e0d..7ba4e8487 100644
--- a/src/commands/CmdModify.h
+++ b/src/commands/CmdModify.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 84873abd9..172c384c4 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdPrepend.h b/src/commands/CmdPrepend.h
index 3f9329411..0977bbeb6 100644
--- a/src/commands/CmdPrepend.h
+++ b/src/commands/CmdPrepend.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index c66138760..c0317d901 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdProjects.h b/src/commands/CmdProjects.h
index 14f91dead..e41450bb3 100644
--- a/src/commands/CmdProjects.h
+++ b/src/commands/CmdProjects.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index ccda7b025..f78ae39c6 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdPurge.h b/src/commands/CmdPurge.h
index 6e6452232..534fcf6cf 100644
--- a/src/commands/CmdPurge.h
+++ b/src/commands/CmdPurge.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 616c355fa..751adb635 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdReports.h b/src/commands/CmdReports.h
index 5409be3cf..e1ada5d02 100644
--- a/src/commands/CmdReports.h
+++ b/src/commands/CmdReports.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 18526f0c5..43389472d 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h
index 4489201e0..d4b42220b 100644
--- a/src/commands/CmdShow.h
+++ b/src/commands/CmdShow.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 03b20278e..d6a08d004 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStart.h b/src/commands/CmdStart.h
index 5d97c7a9f..785c113b4 100644
--- a/src/commands/CmdStart.h
+++ b/src/commands/CmdStart.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index ac724c908..0aff886cd 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStats.h b/src/commands/CmdStats.h
index c12b7e359..327e5ef7f 100644
--- a/src/commands/CmdStats.h
+++ b/src/commands/CmdStats.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index bb77ea108..7fc0d3c1e 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdStop.h b/src/commands/CmdStop.h
index 7d9fdb01b..f1e338824 100644
--- a/src/commands/CmdStop.h
+++ b/src/commands/CmdStop.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 51c04f151..c251bbbd0 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdSummary.h b/src/commands/CmdSummary.h
index d422855c1..31d329532 100644
--- a/src/commands/CmdSummary.h
+++ b/src/commands/CmdSummary.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 467dfcf0f..05539fee0 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdSync.h b/src/commands/CmdSync.h
index 8da9d206f..3a4c5ca4f 100644
--- a/src/commands/CmdSync.h
+++ b/src/commands/CmdSync.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index 110257194..ed28a9580 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h
index 510722482..a9a668989 100644
--- a/src/commands/CmdTags.h
+++ b/src/commands/CmdTags.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 7479165ca..b8762bd55 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdTimesheet.h b/src/commands/CmdTimesheet.h
index acec783ec..173d16472 100644
--- a/src/commands/CmdTimesheet.h
+++ b/src/commands/CmdTimesheet.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index be140005c..71f434e3c 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUDAs.h b/src/commands/CmdUDAs.h
index ec4a32f82..2fa5a2d5a 100644
--- a/src/commands/CmdUDAs.h
+++ b/src/commands/CmdUDAs.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 3d67a3462..2b3ae5e86 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUndo.h b/src/commands/CmdUndo.h
index ecf3d7317..236b7fde3 100644
--- a/src/commands/CmdUndo.h
+++ b/src/commands/CmdUndo.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 6248fb663..8d466534b 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUnique.h b/src/commands/CmdUnique.h
index f827efe1b..712107aac 100644
--- a/src/commands/CmdUnique.h
+++ b/src/commands/CmdUnique.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 5de8bb096..5dda53c07 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdUrgency.h b/src/commands/CmdUrgency.h
index 594636e82..bacbd534a 100644
--- a/src/commands/CmdUrgency.h
+++ b/src/commands/CmdUrgency.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index ede311c0d..2bae80c68 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
@@ -78,7 +78,7 @@ int CmdVersion::execute (std::string& output)
       << format ("{1} {2} built for ", bold.colorize (PACKAGE), bold.colorize (VERSION))
       << osName ()
       << '\n'
-      << "Copyright (C) 2006 - 2019 P. Beckingham, F. Hernandez."
+      << "Copyright (C) 2006 - 2020 P. Beckingham, F. Hernandez."
       << '\n'
       << '\n'
       << disclaimer.render ()
diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h
index b03e0046f..cdcb587ff 100644
--- a/src/commands/CmdVersion.h
+++ b/src/commands/CmdVersion.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 9b53c98dc..232692a1f 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/commands/Command.h b/src/commands/Command.h
index af2402985..4c80b66ae 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 58aab89da..80e1cb874 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 419dc72ce..58ab76984 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 19db61531..9ed440e78 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/main.cpp b/src/main.cpp
index 2fc858d54..9314c90bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/main.h b/src/main.h
index 9ef9f6689..6bb07c128 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/nag.cpp b/src/nag.cpp
index d5878e18a..cf69db8c6 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/recur.cpp b/src/recur.cpp
index 5217ae771..20b0371d9 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/rules.cpp b/src/rules.cpp
index 981aa38f9..1d67624cb 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/sort.cpp b/src/sort.cpp
index fab503293..9915ddeb7 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/util.cpp b/src/util.cpp
index 4aad80c47..e1e0b8158 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/src/util.h b/src/util.h
index 622aac47e..1ae977695 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/abbreviation.t b/test/abbreviation.t
index 44acccb3e..97ee3706b 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/add.t b/test/add.t
index 6e2c934db..28400dee4 100755
--- a/test/add.t
+++ b/test/add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/alias.t b/test/alias.t
index 4898e343d..5ce82bf45 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/annotate.t b/test/annotate.t
index a233bbe4b..99ada7c1f 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/append.t b/test/append.t
index 70e03aadf..0512eed11 100755
--- a/test/append.t
+++ b/test/append.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/args.t b/test/args.t
index 3480bdaae..a5c51d4d6 100755
--- a/test/args.t
+++ b/test/args.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/backlog.t b/test/backlog.t
index 516506d47..85681596a 100755
--- a/test/backlog.t
+++ b/test/backlog.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/bash_completion.t b/test/bash_completion.t
index ff58efaf2..d153ef89f 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/bash_tap.sh b/test/bash_tap.sh
index aa87ef35f..8c1e0a39f 100644
--- a/test/bash_tap.sh
+++ b/test/bash_tap.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # For more information, see https://github.com/wbsch/bash_tap
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015 - 2019 Wilhelm Schürmann
+# Copyright (c) 2015 - 2020 Wilhelm Schürmann
 
 function bashtap_on_error {
     # A command in the parent script failed, interpret this as a test failure.
diff --git a/test/bash_tap_tw.sh b/test/bash_tap_tw.sh
index c40309636..0a29948fe 100644
--- a/test/bash_tap_tw.sh
+++ b/test/bash_tap_tw.sh
@@ -9,7 +9,7 @@
 # appended to or changed as needed.
 #
 # Subject to the MIT License. See LICENSE file or http://opensource.org/licenses/MIT
-# Copyright (c) 2015 - 2019 Wilhelm Schürmann
+# Copyright (c) 2015 - 2020 Wilhelm Schürmann
 
 function setup_taskrc {
     # Configuration
diff --git a/test/blocked.t b/test/blocked.t
index b419e3143..c5ebdae95 100755
--- a/test/blocked.t
+++ b/test/blocked.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/bulk.t b/test/bulk.t
index 488427d55..610904975 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/burndown.t b/test/burndown.t
index 8f18d56d0..a9f34fed6 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/calc.t b/test/calc.t
index 816810845..1c1cbc005 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/calendar.t b/test/calendar.t
index e4a761d9f..916596628 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/caseless.t b/test/caseless.t
index 8e9a26874..f1e9308d6 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/col.t.cpp b/test/col.t.cpp
index e26765258..f63a5b44a 100644
--- a/test/col.t.cpp
+++ b/test/col.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 28764dd46..832165854 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/color.rules.t b/test/color.rules.t
index 163b488a2..868723163 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/columns.t b/test/columns.t
index 5456457f1..0e68a0328 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/commands.t b/test/commands.t
index 21f1c21a0..7dcd016a7 100755
--- a/test/commands.t
+++ b/test/commands.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/completed.t b/test/completed.t
index 2bcf80e13..eb14e47fd 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/configuration.t b/test/configuration.t
index 8182917e7..eb2f32d22 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/confirmation.t b/test/confirmation.t
index 323ba1cba..93d07d67b 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/context.t b/test/context.t
index 2da469d2f..5eecb85b8 100755
--- a/test/context.t
+++ b/test/context.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/count.t b/test/count.t
index 312ebd220..1c29f4552 100755
--- a/test/count.t
+++ b/test/count.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/custom.config.t b/test/custom.config.t
index b31d54d03..1ce802b71 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index 727bac4d8..c7692150e 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/custom.t b/test/custom.t
index 9fd0c876a..c29ebbc2c 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index bcc2fef0a..3cf5850e6 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/date.iso.t b/test/date.iso.t
index 802c7637b..7e92d0e23 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/dateformat.t b/test/dateformat.t
index e95a4bbfe..5b0e0e98c 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/datesort.t b/test/datesort.t
index 9bbf984ef..e00382c47 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index 86ee43a9b..c6999cf24 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/debug.t b/test/debug.t
index 3054c6935..c47660326 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/default.t b/test/default.t
index 1ed4e2679..630314aa7 100755
--- a/test/default.t
+++ b/test/default.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/delete.t b/test/delete.t
index 15cd8f66d..b80deb6e1 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/denotate.t b/test/denotate.t
index 4ea1503ca..8d58a2d7f 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/dependencies.t b/test/dependencies.t
index 26254515e..a68870fef 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/diag.t b/test/diag.t
index 803a54f54..67c6d3e76 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/diag_color.t b/test/diag_color.t
index 150e12d4d..a56550f2f 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 5b3f53b54..4a19bb646 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/dom2.t b/test/dom2.t
index 540b46ce0..7a4c3e358 100755
--- a/test/dom2.t
+++ b/test/dom2.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/due.t b/test/due.t
index 82788e4d7..4f2accd30 100755
--- a/test/due.t
+++ b/test/due.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/duplicate.t b/test/duplicate.t
index 9a339b228..d15bd2a8b 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/edit.t b/test/edit.t
index 8ac144776..c10675bae 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/encoding.t b/test/encoding.t
index 7f7d9b2aa..e517eeab2 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/enpassant.t b/test/enpassant.t
index 10713a2c2..1b54949d8 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/eval.t.cpp b/test/eval.t.cpp
index 0a568bc01..25b64bf48 100644
--- a/test/eval.t.cpp
+++ b/test/eval.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/exec.t b/test/exec.t
index 800c98cb0..21daa78a1 100755
--- a/test/exec.t
+++ b/test/exec.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/export.t b/test/export.t
index 1d9c8d046..3343b9178 100755
--- a/test/export.t
+++ b/test/export.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/feature.559.t b/test/feature.559.t
index 0dce9bcd3..9d3fc17ee 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index aeb126967..f2b152896 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 7ba146d0e..060599d3c 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index a0958bd3d..001a75920 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/feedback.t b/test/feedback.t
index 80e952c82..8f6a413f1 100755
--- a/test/feedback.t
+++ b/test/feedback.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/filter.t b/test/filter.t
index bc39fb0a4..49ae637c7 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/fontunderline.t b/test/fontunderline.t
index 9502a2112..53b06c123 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/format.t b/test/format.t
index 255098264..98f89e91a 100755
--- a/test/format.t
+++ b/test/format.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/gc.t b/test/gc.t
index 7b3367904..8d1937bd0 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/helpers.t b/test/helpers.t
index c573c4bb1..69388f6bf 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/history.t b/test/history.t
index 62cc388d4..128ef48b9 100755
--- a/test/history.t
+++ b/test/history.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hooks.env.t b/test/hooks.env.t
index d6c0dd3b9..a38f422ee 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index 50912e74c..a497eb56f 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index fd89da375..434619601 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 0c7ed22e5..a12263b68 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index 55f037169..94fb7d48d 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/hyphenate.t b/test/hyphenate.t
index b1643b6d8..7698adc6f 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/ids.t b/test/ids.t
index bff11424e..1f1a48a0c 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/import.t b/test/import.t
index 7676082ef..86a7c0201 100755
--- a/test/import.t
+++ b/test/import.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/info.t b/test/info.t
index aa6fcb209..a7ec0daf2 100755
--- a/test/info.t
+++ b/test/info.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index 8912de85a..24d804b01 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/limit.t b/test/limit.t
index 9e26d682a..e2b936d50 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index c1d2ca027..f163a13e4 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/log.t b/test/log.t
index ba9df31d7..0640bd51a 100755
--- a/test/log.t
+++ b/test/log.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/logo.t b/test/logo.t
index 175efb0c5..7a2f00084 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/math.t b/test/math.t
index e5fc8189f..4e88f6292 100755
--- a/test/math.t
+++ b/test/math.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/modify.t b/test/modify.t
index f32925445..53e9b211d 100755
--- a/test/modify.t
+++ b/test/modify.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/nag.t b/test/nag.t
index 380366e5a..ebc238cc8 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/obfuscate.t b/test/obfuscate.t
index 790fd47a1..e6f70d464 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/oldest.t b/test/oldest.t
index 68867fa0e..58e765ade 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/operators.t b/test/operators.t
index 985141dec..b62dc6526 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/overdue.t b/test/overdue.t
index 6d6f8fc4b..53eee830b 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/partial.t b/test/partial.t
index 968e72eb2..cd58d11f6 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/prepend.t b/test/prepend.t
index adafa52eb..19a2ba88e 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/pri_sort.t b/test/pri_sort.t
index df1757c92..f1c15da92 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/project.t b/test/project.t
index d0832506f..f29cad2c1 100755
--- a/test/project.t
+++ b/test/project.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/purge.t b/test/purge.t
index 29315c190..5891c7d0c 100755
--- a/test/purge.t
+++ b/test/purge.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/quotes.t b/test/quotes.t
index f30808114..72ac0e749 100755
--- a/test/quotes.t
+++ b/test/quotes.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/rc.override.t b/test/rc.override.t
index 1e25d3429..4709b4d8b 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/recurrence.t b/test/recurrence.t
index d94d85c12..ad08a650c 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/reports.t b/test/reports.t
index 8574eb7fc..390d6d163 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/search.t b/test/search.t
index 90de10439..ef8a8d638 100755
--- a/test/search.t
+++ b/test/search.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/sequence.t b/test/sequence.t
index 6f8a2bec4..e3fa07147 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/shell.t b/test/shell.t
index e224d11ed..4925390e0 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/show.t b/test/show.t
index 5f9d5a32e..83015e87c 100755
--- a/test/show.t
+++ b/test/show.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index 6352b74b9..f5d3a5cf9 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -1,7 +1,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/sorting.t b/test/sorting.t
index df408e8ba..b21ea6158 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/special.t b/test/special.t
index 5025e4f09..bfcb908ff 100755
--- a/test/special.t
+++ b/test/special.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/start.t b/test/start.t
index bf16d3258..5c528f08d 100755
--- a/test/start.t
+++ b/test/start.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/stats.t b/test/stats.t
index 5442643b4..5e9adbff8 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/substitute.t b/test/substitute.t
index 160a8feff..e053486a9 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/sugar.t b/test/sugar.t
index 3f132da48..407ad07e6 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/summary.t b/test/summary.t
index bfd2c8c88..3993cdfff 100755
--- a/test/summary.t
+++ b/test/summary.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/t.t.cpp b/test/t.t.cpp
index e75140828..1516c8f59 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/tag.t b/test/tag.t
index bcd003144..95f4f156e 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/taskrc.t b/test/taskrc.t
index 3e15fd84e..6145054d9 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index 34ca50254..11a7c70fc 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/template.t b/test/template.t
index f8937615f..a0f02e588 100644
--- a/test/template.t
+++ b/test/template.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/test.cpp b/test/test.cpp
index 49010350a..70491cf72 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/test.h b/test/test.h
index c5ffa1cb3..411d68534 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/timesheet.t b/test/timesheet.t
index 204dba010..08920f760 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-1379.t b/test/tw-1379.t
index 4f346c54d..652f0ea06 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-1837.t b/test/tw-1837.t
index 2b3391d3c..402697bc8 100644
--- a/test/tw-1837.t
+++ b/test/tw-1837.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-1999.t b/test/tw-1999.t
index c9c2e2abf..50444603e 100755
--- a/test/tw-1999.t
+++ b/test/tw-1999.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-20.t b/test/tw-20.t
index 9880ec226..2325d79e2 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-262.t b/test/tw-262.t
index da1ef881e..c3680210b 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-295.t b/test/tw-295.t
index 4908e451b..1e83604dd 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/tw-46.t b/test/tw-46.t
index df8f615c2..2f409e04a 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/uda.t b/test/uda.t
index b2757ee5c..45ed88b60 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index b334e10a2..bc7764cc1 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/uda_report.t b/test/uda_report.t
index c3fced113..c7d6d08ee 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/uda_sort.t b/test/uda_sort.t
index 496677b01..16115375f 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/undo.t b/test/undo.t
index cc858c977..3f5756148 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/unicode.t b/test/unicode.t
index 4e7c6c3df..41f62660e 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/unique.t b/test/unique.t
index cce4c13c5..42b6b3440 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/upgrade.t b/test/upgrade.t
index 95fa43fbd..29927233d 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/urgency.t b/test/urgency.t
index a07f61539..e5af4a963 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index 9b7f32451..16f5fef15 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/util.t.cpp b/test/util.t.cpp
index 0652161ec..43e460020 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/uuid.t b/test/uuid.t
index 9172dec8f..14d29ffe6 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/variant_add.t.cpp b/test/variant_add.t.cpp
index a915c5c08..d5bcb329a 100644
--- a/test/variant_add.t.cpp
+++ b/test/variant_add.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_and.t.cpp b/test/variant_and.t.cpp
index 191b9890c..d36284cd9 100644
--- a/test/variant_and.t.cpp
+++ b/test/variant_and.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_cast.t.cpp b/test/variant_cast.t.cpp
index 8a973d2bf..ad4c885af 100644
--- a/test/variant_cast.t.cpp
+++ b/test/variant_cast.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_divide.t.cpp b/test/variant_divide.t.cpp
index 8265aaaf9..a36da2c8a 100644
--- a/test/variant_divide.t.cpp
+++ b/test/variant_divide.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_equal.t.cpp b/test/variant_equal.t.cpp
index 7204b1430..c03571538 100644
--- a/test/variant_equal.t.cpp
+++ b/test/variant_equal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_exp.t.cpp b/test/variant_exp.t.cpp
index 316cf2637..3e5d57dd2 100644
--- a/test/variant_exp.t.cpp
+++ b/test/variant_exp.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gt.t.cpp b/test/variant_gt.t.cpp
index 57d78d311..2b115604e 100644
--- a/test/variant_gt.t.cpp
+++ b/test/variant_gt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_gte.t.cpp b/test/variant_gte.t.cpp
index 9d076d7af..1efa88fc6 100644
--- a/test/variant_gte.t.cpp
+++ b/test/variant_gte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_inequal.t.cpp b/test/variant_inequal.t.cpp
index 90d4374f7..ae0d61f55 100644
--- a/test/variant_inequal.t.cpp
+++ b/test/variant_inequal.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lt.t.cpp b/test/variant_lt.t.cpp
index 6c7d5bb0c..3defca8e9 100644
--- a/test/variant_lt.t.cpp
+++ b/test/variant_lt.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_lte.t.cpp b/test/variant_lte.t.cpp
index e73042ed5..14908069b 100644
--- a/test/variant_lte.t.cpp
+++ b/test/variant_lte.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_match.t.cpp b/test/variant_match.t.cpp
index 04786ad9c..5c24ec05a 100644
--- a/test/variant_match.t.cpp
+++ b/test/variant_match.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_math.t.cpp b/test/variant_math.t.cpp
index bf0bae6bf..1399f625f 100644
--- a/test/variant_math.t.cpp
+++ b/test/variant_math.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_modulo.t.cpp b/test/variant_modulo.t.cpp
index c941c0200..c622c5d19 100644
--- a/test/variant_modulo.t.cpp
+++ b/test/variant_modulo.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019 Göteborg Bit Factory.
+// Copyright 2013 - 2020 Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_multiply.t.cpp b/test/variant_multiply.t.cpp
index d6b8d9b3e..8fb29c1d5 100644
--- a/test/variant_multiply.t.cpp
+++ b/test/variant_multiply.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_nomatch.t.cpp b/test/variant_nomatch.t.cpp
index 7b33a800a..3735c45fc 100644
--- a/test/variant_nomatch.t.cpp
+++ b/test/variant_nomatch.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_not.t.cpp b/test/variant_not.t.cpp
index 4f8c5cd83..7e2e8e262 100644
--- a/test/variant_not.t.cpp
+++ b/test/variant_not.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_or.t.cpp b/test/variant_or.t.cpp
index 19b91844e..190e80579 100644
--- a/test/variant_or.t.cpp
+++ b/test/variant_or.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_partial.t.cpp b/test/variant_partial.t.cpp
index 1f1f631d7..6af70d398 100644
--- a/test/variant_partial.t.cpp
+++ b/test/variant_partial.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index 962023df7..2de383973 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/variant_xor.t.cpp b/test/variant_xor.t.cpp
index 154e76913..b80566c0c 100644
--- a/test/variant_xor.t.cpp
+++ b/test/variant_xor.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2013 - 2019, Göteborg Bit Factory.
+// Copyright 2013 - 2020, Göteborg Bit Factory.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/verbose.t b/test/verbose.t
index 6e7efcdf0..4edb1b087 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/version.t b/test/version.t
index ea68342bc..a689ea378 100755
--- a/test/version.t
+++ b/test/version.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 79982ccab..3b541fb8e 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2020, 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
diff --git a/test/wait.t b/test/wait.t
index 952778ddf..277ec95d0 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #
-# Copyright 2006 - 2019, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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

From 7d567c3ac948a59d6ef4c01e5fea64d4a781f67b Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Wed, 2 Jan 2019 16:36:45 +0100
Subject: [PATCH 867/879] Fix wait.t to correct expected output

---
 test/wait.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/wait.t b/test/wait.t
index 277ec95d0..f0c477464 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -62,7 +62,7 @@ class TestWait(TestCase):
         self.assertIn("visible", out)
         self.assertIn("hidden", out)
 
-        self.assertIn("Un-waiting task 'hidden'", err)
+        self.assertIn("Un-waiting task 2 'hidden'", err)
 
 
 class TestBug434(TestCase):

From 79e076c3c0dc5fb294a56950a497ea5adb055605 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Fri, 20 Nov 2020 23:59:56 -0500
Subject: [PATCH 868/879] tests: Use updated unittest method

---
 test/project.t | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/project.t b/test/project.t
index f29cad2c1..a0ed27c95 100755
--- a/test/project.t
+++ b/test/project.t
@@ -251,6 +251,22 @@ class TestBug299(TestCase):
         self.assertRegex(out, "three.*baz")
 
 
+class TestBug555(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_log_with_project_segfault(self):
+        """555: log with a project causes a segfault
+
+        Reported in bug 555
+        """
+        code, out, err = self.t("rc.verbose:new-uuid log description project:p")
+
+        self.assertNotIn("Segmentation fault", out)
+        self.assertNotIn("Segmentation fault", err)
+        self.assertIn("Logged task", out)
+
+
 class TestBug605(TestCase):
     def setUp(self):
         self.t = Task()

From ca1e2a5a6b5522a56bc7d3cdb4b2cefff2a464e8 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Wed, 2 Jan 2019 17:32:03 +0100
Subject: [PATCH 869/879] Mark project.t 1455 as expected failure

---
 test/project.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/project.t b/test/project.t
index a0ed27c95..c1f25e0e3 100755
--- a/test/project.t
+++ b/test/project.t
@@ -381,6 +381,7 @@ class TestBug1455(TestCase):
     def setUp(self):
         self.t = Task()
 
+    @unittest.expectedFailure
     def test_project_hierarchy_filter(self):
         """1455: Test project:school)
 

From cad9a4f8349bb0f9ac6057cef6067341e52b6b69 Mon Sep 17 00:00:00 2001
From: Max Rossmannek <max.rossmannek@uzh.ch>
Date: Sun, 22 Nov 2020 13:04:39 +0100
Subject: [PATCH 870/879] Update diag.t to correct C++ version

The default C++ version was updated in 4729876 and this commit reflects
this change in the test.
---
 test/diag.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/diag.t b/test/diag.t
index 67c6d3e76..f6d0ed27a 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -48,7 +48,7 @@ class TestDiagnostics(TestCase):
         self.t.activate_hooks()
         code, out, err = self.t.diag()
         self.tap(out)
-        self.assertRegex(out, "Compliance:\s+C\+\+14")
+        self.assertRegex(out, "Compliance:\s+C\+\+17")
         self.assertRegex(out, "libgnutls:\s+\d+\.\d+\.\d+")
         self.assertIn("edlin", out)
         self.assertIn("strict", out)

From 1417be626ff6865d0930b204d17cb30cd1c33da7 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Tue, 1 Jan 2019 21:54:38 -0500
Subject: [PATCH 871/879] TW-1511: Interpret string subtraction as
 concanetation with a dash

Fixes #1537 (previously known as TW-1511).
---
 src/Variant.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index 50397eb55..c9cb54020 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1278,7 +1278,18 @@ Variant& Variant::operator-= (const Variant& other)
     break;
 
   case type_string:
-    throw std::string (STRING_VARIANT_SUB_STRING);
+    switch (right._type)
+    {
+    case type_string:
+      cast (type_string);   _string   += '-' + right._string;   break;
+    case type_boolean:
+    case type_integer:
+    case type_real:
+    case type_date:
+    case type_duration:
+      throw std::string (STRING_VARIANT_SUB_STRING);
+      break;
+    }
     break;
 
   case type_date:

From 4f14b8923f8a60b1143fc91babfb696d18088865 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Wed, 2 Jan 2019 16:32:16 +0100
Subject: [PATCH 872/879] Fix variant_subtract test case after PR #2095

---
 test/variant_subtract.t.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp
index 2de383973..59b94a43b 100644
--- a/test/variant_subtract.t.cpp
+++ b/test/variant_subtract.t.cpp
@@ -139,9 +139,10 @@ int main (int, char**)
   try {Variant v32 = v3 - v2; t.fail ("foo - 3.14 --> error");}
   catch (...)                {t.pass ("foo - 3.14 --> error");}
 
-  // string - string   -> ERROR
-  try {Variant v33 = v3 - v3; t.fail ("foo - foo --> error");}
-  catch (...)                {t.pass ("foo - foo --> error");}
+  // string - string   -> concatenated string
+  Variant v33 = v3 - v3;
+  t.is (v33.type (), Variant::type_string, "foo - foo --> string");
+  t.is (v33.get_string (), "foo-foo",      "foo - foo --> foo-foo");
 
   // string - date     -> ERROR
   try {Variant v34 = v3 - v4; t.fail ("foo - 1234567890 --> error");}

From b6910b9428723058ed2abfdc1a388e12a8e1d0b9 Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Tue, 24 Nov 2020 23:27:22 +0000
Subject: [PATCH 873/879] Add missing "QUARTER" to feedback_reserved_tags

A while ago I noticed that 630a1530e0e0495f602ec5b687630b54945b2882 only
added the QUARTER virtual tag to src/Task.cpp, and when I checked that
again today, it was still missing from src/feedback.cpp, so I'm fixing
that.
---
 src/feedback.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/feedback.cpp b/src/feedback.cpp
index 58ab76984..2d03516ab 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -325,6 +325,7 @@ void feedback_reserved_tags (const std::string& tag)
       tag == "PENDING"   ||
       tag == "PRIORITY"  ||
       tag == "PROJECT"   ||
+      tag == "QUARTER"   ||
       tag == "READY"     ||
       tag == "SCHEDULED" ||
       tag == "TAGGED"    ||

From 4c714e10a3de5a105c70708f0c5e5603c375c8b6 Mon Sep 17 00:00:00 2001
From: John Nguyen <ipwnponies@gmail.com>
Date: Sat, 16 May 2020 11:06:57 -0700
Subject: [PATCH 874/879] Fix typo in man page

The example for _unique has typo, should be using attribute for project.
Fixes #2277

(cherry picked from commit cf45f28cc0c7259eab8ae8dbb979b9d543abea6a)
---
 doc/man/task.1.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 3cc9318ba..47fbe5a47 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -604,7 +604,7 @@ by third-party applications.
 Reports a unique set of attribute values. For example, to see all the active
 projects:
 
-  task +PENDING _unique projects
+  task +PENDING _unique project
 
 .TP
 .B task <filter> _uuids

From 643166a3378d49a69a7a527df4443ea35dda2291 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Tue, 1 Sep 2020 11:46:17 -0300
Subject: [PATCH 875/879] Uncoditionally include errno.h instead of guessing

POSIX tells us that it is errno.h, musl fails to build with -Werror
because it redirects sys/errno.h->errno.h and uses #warning

(cherry picked from commit 041248e7ccf85f0ff0feb9e3289ee8aafdd5c2be)
---
 src/TLSClient.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 990a7a9d5..97c266006 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -37,11 +37,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#if (defined OPENBSD || defined SOLARIS || defined NETBSD)
 #include <errno.h>
-#else
-#include <sys/errno.h>
-#endif
 #include <sys/types.h>
 #include <netdb.h>
 #include <gnutls/x509.h>

From cd1d42bc9d7dca299b08015efbfa78da2228fa32 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 5 Dec 2020 16:40:28 -0500
Subject: [PATCH 876/879] tests: Mark failing corner case tests as expected for
 2.5.2

---
 test/filter.t  | 4 ++++
 test/project.t | 1 +
 test/search.t  | 1 +
 3 files changed, 6 insertions(+)

diff --git a/test/filter.t b/test/filter.t
index 49ae637c7..cd72e31cc 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -659,6 +659,7 @@ class TestBug1600(TestCase):
     def setUp(self):
         self.t = Task()
 
+    @unittest.expectedFailure
     def test_filter_plus_in_descriptions(self):
         """filter - description contains +"""
         self.t("add foobar1")
@@ -966,6 +967,7 @@ class TestBug1609(TestCase):
         self.assertIn("two", out)
 
 
+@unittest.expectedFailure
 class TestBug1630(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
@@ -1057,6 +1059,7 @@ class TestBug1915(TestCase):
         self.assertIn("thingB", out)
         self.assertNotIn("thingC", out)
 
+    @unittest.expectedFailure
     def test_complex_and_or_query_variant_three(self):
         """1915: Make sure parser handles complex and-or queries correctly (3)"""
         code, out, err = self.t("rc.verbose:nothing 'status:pending and (project:A or project:B)' all")
@@ -1064,6 +1067,7 @@ class TestBug1915(TestCase):
         self.assertIn("thingB", out)
         self.assertNotIn("thingC", out)
 
+    @unittest.expectedFailure
     def test_complex_and_or_query_variant_four(self):
         """1915: Make sure parser handles complex and-or queries correctly (4)"""
         code, out, err = self.t("rc.verbose:nothing 'status:pending and ( project:A or project:B )' all")
diff --git a/test/project.t b/test/project.t
index c1f25e0e3..c1d1fbaea 100755
--- a/test/project.t
+++ b/test/project.t
@@ -454,6 +454,7 @@ class TestBug1430(TestCase):
         self.assertEqual("home/garden\n", out)
 
 
+@unittest.expectedFailure
 class TestBug1617(TestCase):
     def setUp(self):
         """Executed before each test in the class"""
diff --git a/test/search.t b/test/search.t
index ef8a8d638..fab215020 100755
--- a/test/search.t
+++ b/test/search.t
@@ -244,6 +244,7 @@ class Test1469(TestCase):
         self.assertNotIn('foo', out)
 
 
+@unittest.expectedFailure
 class TestBug1479(TestCase):
     def setUp(self):
         """Executed before each test in the class"""

From fdc290c54639a400568b57ce957762add152b3c7 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 5 Dec 2020 16:51:54 -0500
Subject: [PATCH 877/879] CMake: Exclude .github directory

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1873e42f..06efe0539 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,5 +161,5 @@ set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSo
                                 "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
                                 "test" "package-config" "misc/*" "src/task$" "src/calc$" "performance"
                                 "src/libtask.a" "src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
+                                ".github/" "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
 include (CPack)

From 36d13508d42466d501da3e26a4720e58eb9da043 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 5 Dec 2020 16:57:49 -0500
Subject: [PATCH 878/879] CMake: Also ignore .travis for the tarball build

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06efe0539..08a30d95f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,5 +161,5 @@ set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSo
                                 "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
                                 "test" "package-config" "misc/*" "src/task$" "src/calc$" "performance"
                                 "src/libtask.a" "src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                ".github/" "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
+                                ".github/" ".travis.yml" "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
 include (CPack)

From b0c17d11639dc6e783befd89c8508f2abb9b4287 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sat, 5 Dec 2020 17:11:32 -0500
Subject: [PATCH 879/879] holidays: Update holidays using newest holidata.net
 data

Remove outdated holiday files that could not be updated.
---
 doc/rc/holidays.be-BY.rc |  69 -----------------
 doc/rc/holidays.cs-CZ.rc | 112 ++++++++++++++-------------
 doc/rc/holidays.da-DK.rc |  88 +++++++++++----------
 doc/rc/holidays.de-AT.rc | 130 +++++++++++++++----------------
 doc/rc/holidays.de-BE.rc |  54 ++++++-------
 doc/rc/holidays.de-CH.rc |  78 +++++++++----------
 doc/rc/holidays.de-DE.rc | 160 ++++++++++++++++++++-------------------
 doc/rc/holidays.el-GR.rc |  78 +++++++++----------
 doc/rc/holidays.en-AU.rc | 119 -----------------------------
 doc/rc/holidays.en-CA.rc | 126 ++++++++++++++++++------------
 doc/rc/holidays.en-GB.rc |  60 ++++++++-------
 doc/rc/holidays.en-GL.rc |  81 --------------------
 doc/rc/holidays.en-HK.rc |  95 -----------------------
 doc/rc/holidays.en-IN.rc | 103 -------------------------
 doc/rc/holidays.en-NZ.rc |  88 +++++++++++----------
 doc/rc/holidays.en-US.rc |  78 ++++++++++---------
 doc/rc/holidays.en-ZA.rc |  77 -------------------
 doc/rc/holidays.es-CO.rc |  82 ++++++++++----------
 doc/rc/holidays.es-EC.rc |  75 ------------------
 doc/rc/holidays.es-ES.rc |  58 +++++++-------
 doc/rc/holidays.es-MX.rc |  69 -----------------
 doc/rc/holidays.es-US.rc |  78 ++++++++++---------
 doc/rc/holidays.et-EE.rc |  77 -------------------
 doc/rc/holidays.fi-FI.rc | 102 ++++++++++++-------------
 doc/rc/holidays.fr-BE.rc |  54 ++++++-------
 doc/rc/holidays.fr-FR.rc |  86 +++++++++++----------
 doc/rc/holidays.ga-IE.rc |  65 ----------------
 doc/rc/holidays.hr-HR.rc | 104 +++++++++++++------------
 doc/rc/holidays.is-IS.rc | 118 +++++++++++++++--------------
 doc/rc/holidays.it-IT.rc |  62 +++++++--------
 doc/rc/holidays.jp-JP.rc |  91 ----------------------
 doc/rc/holidays.lt-LT.rc |  81 --------------------
 doc/rc/holidays.lv-LV.rc |  77 -------------------
 doc/rc/holidays.nb-NO.rc |  78 +++++++++----------
 doc/rc/holidays.nb-SJ.rc |  97 ------------------------
 doc/rc/holidays.nl-BE.rc |  54 ++++++-------
 doc/rc/holidays.nl-NL.rc | 102 +++++++++++++------------
 doc/rc/holidays.pl-PL.rc |  98 ++++++++++++------------
 doc/rc/holidays.pt-BR.rc |  81 --------------------
 doc/rc/holidays.pt-PT.rc |  70 ++++++++---------
 doc/rc/holidays.ru-RU.rc |  46 +++++------
 doc/rc/holidays.sv-SE.rc | 128 +++++++++++++++----------------
 doc/rc/holidays.tr-TR.rc | 108 +++++++++++++-------------
 43 files changed, 1276 insertions(+), 2461 deletions(-)
 delete mode 100644 doc/rc/holidays.be-BY.rc
 delete mode 100644 doc/rc/holidays.en-AU.rc
 delete mode 100644 doc/rc/holidays.en-GL.rc
 delete mode 100644 doc/rc/holidays.en-HK.rc
 delete mode 100644 doc/rc/holidays.en-IN.rc
 delete mode 100644 doc/rc/holidays.en-ZA.rc
 delete mode 100644 doc/rc/holidays.es-EC.rc
 delete mode 100644 doc/rc/holidays.es-MX.rc
 delete mode 100644 doc/rc/holidays.et-EE.rc
 delete mode 100644 doc/rc/holidays.ga-IE.rc
 delete mode 100644 doc/rc/holidays.jp-JP.rc
 delete mode 100644 doc/rc/holidays.lt-LT.rc
 delete mode 100644 doc/rc/holidays.lv-LV.rc
 delete mode 100644 doc/rc/holidays.nb-SJ.rc
 delete mode 100644 doc/rc/holidays.pt-BR.rc

diff --git a/doc/rc/holidays.be-BY.rc b/doc/rc/holidays.be-BY.rc
deleted file mode 100644
index 2c0117b09..000000000
--- a/doc/rc/holidays.be-BY.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/be-BY/2015.json
-# http://holidata.net/be-BY/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.be-BY1.name=Новы Год
-holiday.be-BY1.date=20150101
-holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20150107
-holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20150803
-holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20150420
-holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20150421
-holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20150501
-holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20150509
-holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20150703
-holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20151107
-holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20151225
-holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20160101
-holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20160107
-holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20160803
-holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20160327
-holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20160510
-holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20160501
-holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20160509
-holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20160703
-holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20161107
-holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20161225
diff --git a/doc/rc/holidays.cs-CZ.rc b/doc/rc/holidays.cs-CZ.rc
index df2268ba4..f898c5961 100644
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/cs-CZ/2015.json
-# http://holidata.net/cs-CZ/2016.json
+# https://holidata.net/cs-CZ/2020.json
+# https://holidata.net/cs-CZ/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,58 @@
 ###############################################################################
 
 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20150101
-holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20150101
-holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20150406
-holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20150501
-holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20150508
-holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20150705
-holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20150706
-holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20150928
-holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20151028
-holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20151117
-holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20151224
-holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20151225
-holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20151226
-holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20160101
-holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20160101
-holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20160328
-holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20160501
-holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20160508
-holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20160705
-holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20160706
-holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20160928
-holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20161028
-holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20161117
-holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20161224
-holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20161225
-holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20161226
+holiday.cs-CZ1.date=20200101
+holiday.cs-CZ2.name=Den obnovy samostatného českého státu
+holiday.cs-CZ2.date=20200101
+holiday.cs-CZ3.name=Velký pátek
+holiday.cs-CZ3.date=20200410
+holiday.cs-CZ4.name=Velikonoční pondělí
+holiday.cs-CZ4.date=20200413
+holiday.cs-CZ5.name=Svátek práce
+holiday.cs-CZ5.date=20200501
+holiday.cs-CZ6.name=Den vítězství
+holiday.cs-CZ6.date=20200508
+holiday.cs-CZ7.name=Den slovanských věrozvěstů Cyrila a Metoděje
+holiday.cs-CZ7.date=20200705
+holiday.cs-CZ8.name=Den upálení mistra Jana Husa
+holiday.cs-CZ8.date=20200706
+holiday.cs-CZ9.name=Den české státnosti
+holiday.cs-CZ9.date=20200928
+holiday.cs-CZ10.name=Den vzniku samostatného československého státu
+holiday.cs-CZ10.date=20201028
+holiday.cs-CZ11.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
+holiday.cs-CZ11.date=20201117
+holiday.cs-CZ12.name=Štědrý den
+holiday.cs-CZ12.date=20201224
+holiday.cs-CZ13.name=1. svátek vánoční
+holiday.cs-CZ13.date=20201225
+holiday.cs-CZ14.name=2. svátek vánoční
+holiday.cs-CZ14.date=20201226
+holiday.cs-CZ15.name=Nový rok
+holiday.cs-CZ15.date=20210101
+holiday.cs-CZ16.name=Den obnovy samostatného českého státu
+holiday.cs-CZ16.date=20210101
+holiday.cs-CZ17.name=Velký pátek
+holiday.cs-CZ17.date=20210402
+holiday.cs-CZ18.name=Velikonoční pondělí
+holiday.cs-CZ18.date=20210405
+holiday.cs-CZ19.name=Svátek práce
+holiday.cs-CZ19.date=20210501
+holiday.cs-CZ20.name=Den vítězství
+holiday.cs-CZ20.date=20210508
+holiday.cs-CZ21.name=Den slovanských věrozvěstů Cyrila a Metoděje
+holiday.cs-CZ21.date=20210705
+holiday.cs-CZ22.name=Den upálení mistra Jana Husa
+holiday.cs-CZ22.date=20210706
+holiday.cs-CZ23.name=Den české státnosti
+holiday.cs-CZ23.date=20210928
+holiday.cs-CZ24.name=Den vzniku samostatného československého státu
+holiday.cs-CZ24.date=20211028
+holiday.cs-CZ25.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
+holiday.cs-CZ25.date=20211117
+holiday.cs-CZ26.name=Štědrý den
+holiday.cs-CZ26.date=20211224
+holiday.cs-CZ27.name=1. svátek vánoční
+holiday.cs-CZ27.date=20211225
+holiday.cs-CZ28.name=2. svátek vánoční
+holiday.cs-CZ28.date=20211226
diff --git a/doc/rc/holidays.da-DK.rc b/doc/rc/holidays.da-DK.rc
index e1bdbe1e1..4d2a7cab8 100644
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/da-DK/2015.json
-# http://holidata.net/da-DK/2016.json
+# https://holidata.net/da-DK/2020.json
+# https://holidata.net/da-DK/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20150101
+holiday.da-DK1.date=20200101
 holiday.da-DK2.name=Skærtorsdag
-holiday.da-DK2.date=20150402
+holiday.da-DK2.date=20200409
 holiday.da-DK3.name=Langfredag
-holiday.da-DK3.date=20150403
+holiday.da-DK3.date=20200410
 holiday.da-DK4.name=Påskedag
-holiday.da-DK4.date=20150405
+holiday.da-DK4.date=20200412
 holiday.da-DK5.name=Anden påskedag
-holiday.da-DK5.date=20150406
-holiday.da-DK6.name=Kristi himmelfartsdag
-holiday.da-DK6.date=20150514
-holiday.da-DK7.name=Pinsedag
-holiday.da-DK7.date=20150524
-holiday.da-DK8.name=Anden pinsedag
-holiday.da-DK8.date=20150525
-holiday.da-DK9.name=Grundlovsdag
-holiday.da-DK9.date=20150605
-holiday.da-DK10.name=Juledag
-holiday.da-DK10.date=20151225
-holiday.da-DK11.name=Anden juledag
-holiday.da-DK11.date=20151226
-holiday.da-DK12.name=Nytårsdag
-holiday.da-DK12.date=20160101
-holiday.da-DK13.name=Skærtorsdag
-holiday.da-DK13.date=20160324
-holiday.da-DK14.name=Langfredag
-holiday.da-DK14.date=20160325
-holiday.da-DK15.name=Påskedag
-holiday.da-DK15.date=20160327
-holiday.da-DK16.name=Anden påskedag
-holiday.da-DK16.date=20160328
-holiday.da-DK17.name=Kristi himmelfartsdag
-holiday.da-DK17.date=20160505
-holiday.da-DK18.name=Pinsedag
-holiday.da-DK18.date=20160515
-holiday.da-DK19.name=Anden pinsedag
-holiday.da-DK19.date=20160516
-holiday.da-DK20.name=Grundlovsdag
-holiday.da-DK20.date=20160605
-holiday.da-DK21.name=Juledag
-holiday.da-DK21.date=20161225
-holiday.da-DK22.name=Anden juledag
-holiday.da-DK22.date=20161226
+holiday.da-DK5.date=20200413
+holiday.da-DK6.name=Store bededag
+holiday.da-DK6.date=20200508
+holiday.da-DK7.name=Kristi himmelfartsdag
+holiday.da-DK7.date=20200521
+holiday.da-DK8.name=Pinsedag
+holiday.da-DK8.date=20200531
+holiday.da-DK9.name=Anden pinsedag
+holiday.da-DK9.date=20200601
+holiday.da-DK10.name=Grundlovsdag
+holiday.da-DK10.date=20200605
+holiday.da-DK11.name=Juledag
+holiday.da-DK11.date=20201225
+holiday.da-DK12.name=Anden juledag
+holiday.da-DK12.date=20201226
+holiday.da-DK13.name=Nytårsdag
+holiday.da-DK13.date=20210101
+holiday.da-DK14.name=Skærtorsdag
+holiday.da-DK14.date=20210401
+holiday.da-DK15.name=Langfredag
+holiday.da-DK15.date=20210402
+holiday.da-DK16.name=Påskedag
+holiday.da-DK16.date=20210404
+holiday.da-DK17.name=Anden påskedag
+holiday.da-DK17.date=20210405
+holiday.da-DK18.name=Store bededag
+holiday.da-DK18.date=20210430
+holiday.da-DK19.name=Kristi himmelfartsdag
+holiday.da-DK19.date=20210513
+holiday.da-DK20.name=Pinsedag
+holiday.da-DK20.date=20210523
+holiday.da-DK21.name=Anden pinsedag
+holiday.da-DK21.date=20210524
+holiday.da-DK22.name=Grundlovsdag
+holiday.da-DK22.date=20210605
+holiday.da-DK23.name=Juledag
+holiday.da-DK23.date=20211225
+holiday.da-DK24.name=Anden juledag
+holiday.da-DK24.date=20211226
diff --git a/doc/rc/holidays.de-AT.rc b/doc/rc/holidays.de-AT.rc
index 3e9ecc120..9266bc2a7 100644
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-AT/2015.json
-# http://holidata.net/de-AT/2016.json
+# https://holidata.net/de-AT/2020.json
+# https://holidata.net/de-AT/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,98 +28,98 @@
 ###############################################################################
 
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20150101
-holiday.de-AT2.name=Heilige drei Könige
-holiday.de-AT2.date=20150106
-holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20150319
+holiday.de-AT1.date=20200101
+holiday.de-AT2.name=Heilige drei Könige
+holiday.de-AT2.date=20200106
+holiday.de-AT3.name=Josef
+holiday.de-AT3.date=20200319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20150403
+holiday.de-AT4.date=20200410
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20150405
+holiday.de-AT5.date=20200412
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20150406
+holiday.de-AT6.date=20200413
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20150501
-holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20150504
+holiday.de-AT7.date=20200501
+holiday.de-AT8.name=Florian
+holiday.de-AT8.date=20200504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20150514
+holiday.de-AT9.date=20200521
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20150524
+holiday.de-AT10.date=20200531
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20150525
+holiday.de-AT11.date=20200601
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20150604
+holiday.de-AT12.date=20200611
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20150815
-holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20150924
-holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20151010
+holiday.de-AT13.date=20200815
+holiday.de-AT14.name=Rupert
+holiday.de-AT14.date=20200924
+holiday.de-AT15.name=Tag der Volksabstimmung
+holiday.de-AT15.date=20201010
 holiday.de-AT16.name=Nationalfeiertag
-holiday.de-AT16.date=20151026
+holiday.de-AT16.date=20201026
 holiday.de-AT17.name=Allerheiligen
-holiday.de-AT17.date=20151101
-holiday.de-AT18.name=Martin (B)
-holiday.de-AT18.date=20151111
-holiday.de-AT19.name=Leopold (W, N)
-holiday.de-AT19.date=20151115
+holiday.de-AT17.date=20201101
+holiday.de-AT18.name=Martin
+holiday.de-AT18.date=20201111
+holiday.de-AT19.name=Leopold
+holiday.de-AT19.date=20201115
 holiday.de-AT20.name=Mariä Empfängnis
-holiday.de-AT20.date=20151208
+holiday.de-AT20.date=20201208
 holiday.de-AT21.name=Heiliger Abend
-holiday.de-AT21.date=20151224
+holiday.de-AT21.date=20201224
 holiday.de-AT22.name=Christtag
-holiday.de-AT22.date=20151225
+holiday.de-AT22.date=20201225
 holiday.de-AT23.name=Stefanitag
-holiday.de-AT23.date=20151226
+holiday.de-AT23.date=20201226
 holiday.de-AT24.name=Silvester
-holiday.de-AT24.date=20151231
+holiday.de-AT24.date=20201231
 holiday.de-AT25.name=Neujahr
-holiday.de-AT25.date=20160101
-holiday.de-AT26.name=Heilige drei Könige
-holiday.de-AT26.date=20160106
-holiday.de-AT27.name=Josef (K, St, T, V)
-holiday.de-AT27.date=20160319
+holiday.de-AT25.date=20210101
+holiday.de-AT26.name=Heilige drei Könige
+holiday.de-AT26.date=20210106
+holiday.de-AT27.name=Josef
+holiday.de-AT27.date=20210319
 holiday.de-AT28.name=Karfreitag
-holiday.de-AT28.date=20160325
+holiday.de-AT28.date=20210402
 holiday.de-AT29.name=Ostersonntag
-holiday.de-AT29.date=20160327
+holiday.de-AT29.date=20210404
 holiday.de-AT30.name=Ostermontag
-holiday.de-AT30.date=20160328
+holiday.de-AT30.date=20210405
 holiday.de-AT31.name=Staatsfeiertag
-holiday.de-AT31.date=20160501
-holiday.de-AT32.name=Florian (O)
-holiday.de-AT32.date=20160504
+holiday.de-AT31.date=20210501
+holiday.de-AT32.name=Florian
+holiday.de-AT32.date=20210504
 holiday.de-AT33.name=Christi Himmelfahrt
-holiday.de-AT33.date=20160505
+holiday.de-AT33.date=20210513
 holiday.de-AT34.name=Pfingstsonntag
-holiday.de-AT34.date=20160515
+holiday.de-AT34.date=20210523
 holiday.de-AT35.name=Pfingstmontag
-holiday.de-AT35.date=20160516
+holiday.de-AT35.date=20210524
 holiday.de-AT36.name=Fronleichnam
-holiday.de-AT36.date=20160526
+holiday.de-AT36.date=20210603
 holiday.de-AT37.name=Mariä Himmelfahrt
-holiday.de-AT37.date=20160815
-holiday.de-AT38.name=Rupert (S)
-holiday.de-AT38.date=20160924
-holiday.de-AT39.name=Tag der Volksabstimmung (K)
-holiday.de-AT39.date=20161010
+holiday.de-AT37.date=20210815
+holiday.de-AT38.name=Rupert
+holiday.de-AT38.date=20210924
+holiday.de-AT39.name=Tag der Volksabstimmung
+holiday.de-AT39.date=20211010
 holiday.de-AT40.name=Nationalfeiertag
-holiday.de-AT40.date=20161026
+holiday.de-AT40.date=20211026
 holiday.de-AT41.name=Allerheiligen
-holiday.de-AT41.date=20161101
-holiday.de-AT42.name=Martin (B)
-holiday.de-AT42.date=20161111
-holiday.de-AT43.name=Leopold (W, N)
-holiday.de-AT43.date=20161115
+holiday.de-AT41.date=20211101
+holiday.de-AT42.name=Martin
+holiday.de-AT42.date=20211111
+holiday.de-AT43.name=Leopold
+holiday.de-AT43.date=20211115
 holiday.de-AT44.name=Mariä Empfängnis
-holiday.de-AT44.date=20161208
+holiday.de-AT44.date=20211208
 holiday.de-AT45.name=Heiliger Abend
-holiday.de-AT45.date=20161224
+holiday.de-AT45.date=20211224
 holiday.de-AT46.name=Christtag
-holiday.de-AT46.date=20161225
+holiday.de-AT46.date=20211225
 holiday.de-AT47.name=Stefanitag
-holiday.de-AT47.date=20161226
+holiday.de-AT47.date=20211226
 holiday.de-AT48.name=Silvester
-holiday.de-AT48.date=20161231
+holiday.de-AT48.date=20211231
diff --git a/doc/rc/holidays.de-BE.rc b/doc/rc/holidays.de-BE.rc
index a26cbacdd..d1c8440f5 100644
--- a/doc/rc/holidays.de-BE.rc
+++ b/doc/rc/holidays.de-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-BE/2015.json
-# http://holidata.net/de-BE/2016.json
+# https://holidata.net/de-BE/2020.json
+# https://holidata.net/de-BE/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.de-BE1.name=Neujahr
-holiday.de-BE1.date=20150101
+holiday.de-BE1.date=20200101
 holiday.de-BE2.name=Ostern
-holiday.de-BE2.date=20150405
+holiday.de-BE2.date=20200412
 holiday.de-BE3.name=Ostermontag
-holiday.de-BE3.date=20150406
+holiday.de-BE3.date=20200413
 holiday.de-BE4.name=Tag der Arbeit
-holiday.de-BE4.date=20150501
+holiday.de-BE4.date=20200501
 holiday.de-BE5.name=Christi Himmelfahrt
-holiday.de-BE5.date=20150514
+holiday.de-BE5.date=20200521
 holiday.de-BE6.name=Pfingsten
-holiday.de-BE6.date=20150524
+holiday.de-BE6.date=20200531
 holiday.de-BE7.name=Pfingstmontag
-holiday.de-BE7.date=20150525
+holiday.de-BE7.date=20200601
 holiday.de-BE8.name=Nationalfeiertag
-holiday.de-BE8.date=20150721
+holiday.de-BE8.date=20200721
 holiday.de-BE9.name=Mariä Himmelfahrt
-holiday.de-BE9.date=20150815
+holiday.de-BE9.date=20200815
 holiday.de-BE10.name=Allerheiligen
-holiday.de-BE10.date=20151101
+holiday.de-BE10.date=20201101
 holiday.de-BE11.name=Waffenstillstand
-holiday.de-BE11.date=20151111
+holiday.de-BE11.date=20201111
 holiday.de-BE12.name=Weihnacht
-holiday.de-BE12.date=20151225
+holiday.de-BE12.date=20201225
 holiday.de-BE13.name=Neujahr
-holiday.de-BE13.date=20160101
+holiday.de-BE13.date=20210101
 holiday.de-BE14.name=Ostern
-holiday.de-BE14.date=20160527
+holiday.de-BE14.date=20210404
 holiday.de-BE15.name=Ostermontag
-holiday.de-BE15.date=20160528
+holiday.de-BE15.date=20210405
 holiday.de-BE16.name=Tag der Arbeit
-holiday.de-BE16.date=20160501
+holiday.de-BE16.date=20210501
 holiday.de-BE17.name=Christi Himmelfahrt
-holiday.de-BE17.date=20160505
+holiday.de-BE17.date=20210513
 holiday.de-BE18.name=Pfingsten
-holiday.de-BE18.date=20160515
+holiday.de-BE18.date=20210523
 holiday.de-BE19.name=Pfingstmontag
-holiday.de-BE19.date=20160516
+holiday.de-BE19.date=20210524
 holiday.de-BE20.name=Nationalfeiertag
-holiday.de-BE20.date=20160721
+holiday.de-BE20.date=20210721
 holiday.de-BE21.name=Mariä Himmelfahrt
-holiday.de-BE21.date=20160815
+holiday.de-BE21.date=20210815
 holiday.de-BE22.name=Allerheiligen
-holiday.de-BE22.date=20161101
+holiday.de-BE22.date=20211101
 holiday.de-BE23.name=Waffenstillstand
-holiday.de-BE23.date=20161111
+holiday.de-BE23.date=20211111
 holiday.de-BE24.name=Weihnacht
-holiday.de-BE24.date=20161225
+holiday.de-BE24.date=20211225
diff --git a/doc/rc/holidays.de-CH.rc b/doc/rc/holidays.de-CH.rc
index cff04043b..22cabddc5 100644
--- a/doc/rc/holidays.de-CH.rc
+++ b/doc/rc/holidays.de-CH.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-CH/2015.json
-# http://holidata.net/de-CH/2016.json
+# https://holidata.net/de-CH/2020.json
+# https://holidata.net/de-CH/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,74 +28,74 @@
 ###############################################################################
 
 holiday.de-CH1.name=Neujahrstag
-holiday.de-CH1.date=20150101
+holiday.de-CH1.date=20200101
 holiday.de-CH2.name=Berchtoldstag
-holiday.de-CH2.date=20150102
+holiday.de-CH2.date=20200102
 holiday.de-CH3.name=Heilige Drei Könige
-holiday.de-CH3.date=20150106
+holiday.de-CH3.date=20200106
 holiday.de-CH4.name=Josefstag
-holiday.de-CH4.date=20150319
+holiday.de-CH4.date=20200319
 holiday.de-CH5.name=Karfreitag
-holiday.de-CH5.date=20150403
+holiday.de-CH5.date=20200410
 holiday.de-CH6.name=Ostersonntag
-holiday.de-CH6.date=20150405
+holiday.de-CH6.date=20200412
 holiday.de-CH7.name=Ostermontag
-holiday.de-CH7.date=20150406
+holiday.de-CH7.date=20200413
 holiday.de-CH8.name=Tag der Arbeit
-holiday.de-CH8.date=20150501
+holiday.de-CH8.date=20200501
 holiday.de-CH9.name=Auffahrt
-holiday.de-CH9.date=20150514
+holiday.de-CH9.date=20200521
 holiday.de-CH10.name=Pfingstsonntag
-holiday.de-CH10.date=20150524
+holiday.de-CH10.date=20200531
 holiday.de-CH11.name=Pfingstmontag
-holiday.de-CH11.date=20150525
+holiday.de-CH11.date=20200601
 holiday.de-CH12.name=Fronleichnam
-holiday.de-CH12.date=20150604
+holiday.de-CH12.date=20200611
 holiday.de-CH13.name=Bundesfeier
-holiday.de-CH13.date=20150801
+holiday.de-CH13.date=20200801
 holiday.de-CH14.name=Mariä Himmelfahrt
-holiday.de-CH14.date=20150815
+holiday.de-CH14.date=20200815
 holiday.de-CH15.name=Allerheiligen
-holiday.de-CH15.date=20151101
+holiday.de-CH15.date=20201101
 holiday.de-CH16.name=Mariä Empfängnis
-holiday.de-CH16.date=20151208
+holiday.de-CH16.date=20201208
 holiday.de-CH17.name=Weihnachtstag
-holiday.de-CH17.date=20151225
+holiday.de-CH17.date=20201225
 holiday.de-CH18.name=Stephanstag
-holiday.de-CH18.date=20151226
+holiday.de-CH18.date=20201226
 holiday.de-CH19.name=Neujahrstag
-holiday.de-CH19.date=20160101
+holiday.de-CH19.date=20210101
 holiday.de-CH20.name=Berchtoldstag
-holiday.de-CH20.date=20160102
+holiday.de-CH20.date=20210102
 holiday.de-CH21.name=Heilige Drei Könige
-holiday.de-CH21.date=20160106
+holiday.de-CH21.date=20210106
 holiday.de-CH22.name=Josefstag
-holiday.de-CH22.date=20160319
+holiday.de-CH22.date=20210319
 holiday.de-CH23.name=Karfreitag
-holiday.de-CH23.date=20160325
+holiday.de-CH23.date=20210402
 holiday.de-CH24.name=Ostersonntag
-holiday.de-CH24.date=20160327
+holiday.de-CH24.date=20210404
 holiday.de-CH25.name=Ostermontag
-holiday.de-CH25.date=20160328
+holiday.de-CH25.date=20210405
 holiday.de-CH26.name=Tag der Arbeit
-holiday.de-CH26.date=20160501
+holiday.de-CH26.date=20210501
 holiday.de-CH27.name=Auffahrt
-holiday.de-CH27.date=20160505
+holiday.de-CH27.date=20210513
 holiday.de-CH28.name=Pfingstsonntag
-holiday.de-CH28.date=20160515
+holiday.de-CH28.date=20210523
 holiday.de-CH29.name=Pfingstmontag
-holiday.de-CH29.date=20160516
+holiday.de-CH29.date=20210524
 holiday.de-CH30.name=Fronleichnam
-holiday.de-CH30.date=20160526
+holiday.de-CH30.date=20210603
 holiday.de-CH31.name=Bundesfeier
-holiday.de-CH31.date=20160801
+holiday.de-CH31.date=20210801
 holiday.de-CH32.name=Mariä Himmelfahrt
-holiday.de-CH32.date=20160815
+holiday.de-CH32.date=20210815
 holiday.de-CH33.name=Allerheiligen
-holiday.de-CH33.date=20161101
+holiday.de-CH33.date=20211101
 holiday.de-CH34.name=Mariä Empfängnis
-holiday.de-CH34.date=20161208
+holiday.de-CH34.date=20211208
 holiday.de-CH35.name=Weihnachtstag
-holiday.de-CH35.date=20161225
+holiday.de-CH35.date=20211225
 holiday.de-CH36.name=Stephanstag
-holiday.de-CH36.date=20161226
+holiday.de-CH36.date=20211226
diff --git a/doc/rc/holidays.de-DE.rc b/doc/rc/holidays.de-DE.rc
index 22481b000..bc5a3f1c4 100644
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-DE/2015.json
-# http://holidata.net/de-DE/2016.json
+# https://holidata.net/de-DE/2020.json
+# https://holidata.net/de-DE/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,78 +28,84 @@
 ###############################################################################
 
 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20150101
+holiday.de-DE1.date=20200101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20150106
-holiday.de-DE3.name=Karfreitag
-holiday.de-DE3.date=20150403
-holiday.de-DE4.name=Ostern
-holiday.de-DE4.date=20150405
-holiday.de-DE5.name=Ostermontag
-holiday.de-DE5.date=20150406
-holiday.de-DE6.name=Erster Maifeiertag
-holiday.de-DE6.date=20150501
-holiday.de-DE7.name=Christi Himmelfahrt
-holiday.de-DE7.date=20150514
-holiday.de-DE8.name=Pfingstsonntag
-holiday.de-DE8.date=20150524
-holiday.de-DE9.name=Pfingstmontag
-holiday.de-DE9.date=20150525
-holiday.de-DE10.name=Fronleichnam
-holiday.de-DE10.date=20150604
-holiday.de-DE11.name=Mariä Himmelfahrt
-holiday.de-DE11.date=20150815
-holiday.de-DE12.name=Tag der Deutschen Einheit
-holiday.de-DE12.date=20151003
-holiday.de-DE13.name=Reformationstag
-holiday.de-DE13.date=20151031
-holiday.de-DE14.name=Allerheiligen
-holiday.de-DE14.date=20151101
-holiday.de-DE15.name=Buß- und Bettag
-holiday.de-DE15.date=20151118
-holiday.de-DE16.name=Heilig Abend
-holiday.de-DE16.date=20151224
-holiday.de-DE17.name=Weihnachtstag
-holiday.de-DE17.date=20151225
-holiday.de-DE18.name=Zweiter Weihnachtstag
-holiday.de-DE18.date=20151226
-holiday.de-DE19.name=Silvester
-holiday.de-DE19.date=20151231
-holiday.de-DE20.name=Neujahr
-holiday.de-DE20.date=20160101
-holiday.de-DE21.name=Heilige drei Könige
-holiday.de-DE21.date=20160106
-holiday.de-DE22.name=Karfreitag
-holiday.de-DE22.date=20160325
-holiday.de-DE23.name=Ostern
-holiday.de-DE23.date=20160327
-holiday.de-DE24.name=Ostermontag
-holiday.de-DE24.date=20160328
-holiday.de-DE25.name=Erster Maifeiertag
-holiday.de-DE25.date=20160501
-holiday.de-DE26.name=Christi Himmelfahrt
-holiday.de-DE26.date=20160505
-holiday.de-DE27.name=Pfingstsonntag
-holiday.de-DE27.date=20160515
-holiday.de-DE28.name=Pfingstmontag
-holiday.de-DE28.date=20160516
-holiday.de-DE29.name=Fronleichnam
-holiday.de-DE29.date=20160526
-holiday.de-DE30.name=Mariä Himmelfahrt
-holiday.de-DE30.date=20160815
-holiday.de-DE31.name=Tag der Deutschen Einheit
-holiday.de-DE31.date=20161003
-holiday.de-DE32.name=Reformationstag
-holiday.de-DE32.date=20161031
-holiday.de-DE33.name=Allerheiligen
-holiday.de-DE33.date=20161101
-holiday.de-DE34.name=Buß- und Bettag
-holiday.de-DE34.date=20161116
-holiday.de-DE35.name=Heilig Abend
-holiday.de-DE35.date=20161224
-holiday.de-DE36.name=Weihnachtstag
-holiday.de-DE36.date=20161225
-holiday.de-DE37.name=Zweiter Weihnachtstag
-holiday.de-DE37.date=20161226
-holiday.de-DE38.name=Silvester
-holiday.de-DE38.date=20161231
+holiday.de-DE2.date=20200106
+holiday.de-DE3.name=Internationaler Frauentag
+holiday.de-DE3.date=20200308
+holiday.de-DE4.name=Karfreitag
+holiday.de-DE4.date=20200410
+holiday.de-DE5.name=Ostern
+holiday.de-DE5.date=20200412
+holiday.de-DE6.name=Ostermontag
+holiday.de-DE6.date=20200413
+holiday.de-DE7.name=Erster Maifeiertag
+holiday.de-DE7.date=20200501
+holiday.de-DE8.name=75. Jahrestag der Befreiung vom Nationalsozialismus und der Beendigung des Zweiten Weltkrieges in Europa
+holiday.de-DE8.date=20200508
+holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.date=20200521
+holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.date=20200531
+holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.date=20200601
+holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.date=20200611
+holiday.de-DE13.name=Mariä Himmelfahrt
+holiday.de-DE13.date=20200815
+holiday.de-DE14.name=Tag der Deutschen Einheit
+holiday.de-DE14.date=20201003
+holiday.de-DE15.name=Reformationstag
+holiday.de-DE15.date=20201031
+holiday.de-DE16.name=Allerheiligen
+holiday.de-DE16.date=20201101
+holiday.de-DE17.name=Buß- und Bettag
+holiday.de-DE17.date=20201118
+holiday.de-DE18.name=Heilig Abend
+holiday.de-DE18.date=20201224
+holiday.de-DE19.name=Weihnachtstag
+holiday.de-DE19.date=20201225
+holiday.de-DE20.name=Zweiter Weihnachtstag
+holiday.de-DE20.date=20201226
+holiday.de-DE21.name=Silvester
+holiday.de-DE21.date=20201231
+holiday.de-DE22.name=Neujahr
+holiday.de-DE22.date=20210101
+holiday.de-DE23.name=Heilige drei Könige
+holiday.de-DE23.date=20210106
+holiday.de-DE24.name=Internationaler Frauentag
+holiday.de-DE24.date=20210308
+holiday.de-DE25.name=Karfreitag
+holiday.de-DE25.date=20210402
+holiday.de-DE26.name=Ostern
+holiday.de-DE26.date=20210404
+holiday.de-DE27.name=Ostermontag
+holiday.de-DE27.date=20210405
+holiday.de-DE28.name=Erster Maifeiertag
+holiday.de-DE28.date=20210501
+holiday.de-DE29.name=Christi Himmelfahrt
+holiday.de-DE29.date=20210513
+holiday.de-DE30.name=Pfingstsonntag
+holiday.de-DE30.date=20210523
+holiday.de-DE31.name=Pfingstmontag
+holiday.de-DE31.date=20210524
+holiday.de-DE32.name=Fronleichnam
+holiday.de-DE32.date=20210603
+holiday.de-DE33.name=Mariä Himmelfahrt
+holiday.de-DE33.date=20210815
+holiday.de-DE34.name=Tag der Deutschen Einheit
+holiday.de-DE34.date=20211003
+holiday.de-DE35.name=Reformationstag
+holiday.de-DE35.date=20211031
+holiday.de-DE36.name=Allerheiligen
+holiday.de-DE36.date=20211101
+holiday.de-DE37.name=Buß- und Bettag
+holiday.de-DE37.date=20211117
+holiday.de-DE38.name=Heilig Abend
+holiday.de-DE38.date=20211224
+holiday.de-DE39.name=Weihnachtstag
+holiday.de-DE39.date=20211225
+holiday.de-DE40.name=Zweiter Weihnachtstag
+holiday.de-DE40.date=20211226
+holiday.de-DE41.name=Silvester
+holiday.de-DE41.date=20211231
diff --git a/doc/rc/holidays.el-GR.rc b/doc/rc/holidays.el-GR.rc
index 5e711a274..e5ccbee73 100644
--- a/doc/rc/holidays.el-GR.rc
+++ b/doc/rc/holidays.el-GR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/el-GR/2015.json
-# http://holidata.net/el-GR/2016.json
+# https://holidata.net/el-GR/2020.json
+# https://holidata.net/el-GR/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,58 @@
 ###############################################################################
 
 holiday.el-GR1.name=Πρωτοχρονιά
-holiday.el-GR1.date=20150101
+holiday.el-GR1.date=20200101
 holiday.el-GR2.name=Θεοφάνεια
-holiday.el-GR2.date=20150106
+holiday.el-GR2.date=20200106
 holiday.el-GR3.name=Καθαρά Δευτέρα
-holiday.el-GR3.date=20150223
+holiday.el-GR3.date=20200302
 holiday.el-GR4.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR4.date=20150325
-holiday.el-GR5.name=Πρωτομαγιά
-holiday.el-GR5.date=20150418
-holiday.el-GR6.name=Μεγάλη Παρασκευή
-holiday.el-GR6.date=20150410
-holiday.el-GR7.name=Μεγάλο Σάββατο
-holiday.el-GR7.date=20150411
-holiday.el-GR8.name=Πάσχα
-holiday.el-GR8.date=20150412
-holiday.el-GR9.name=Δευτέρα του Πάσχα
-holiday.el-GR9.date=20150413
+holiday.el-GR4.date=20200325
+holiday.el-GR5.name=Μεγάλη Παρασκευή
+holiday.el-GR5.date=20200417
+holiday.el-GR6.name=Μεγάλο Σάββατο
+holiday.el-GR6.date=20200418
+holiday.el-GR7.name=Πάσχα
+holiday.el-GR7.date=20200419
+holiday.el-GR8.name=Δευτέρα του Πάσχα
+holiday.el-GR8.date=20200420
+holiday.el-GR9.name=Πρωτομαγιά
+holiday.el-GR9.date=20200501
 holiday.el-GR10.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR10.date=20150601
+holiday.el-GR10.date=20200608
 holiday.el-GR11.name=Κοίμηση της Θεοτόκου
-holiday.el-GR11.date=20150815
+holiday.el-GR11.date=20200815
 holiday.el-GR12.name=Ημέρα του ΌΧΙ
-holiday.el-GR12.date=20151028
+holiday.el-GR12.date=20201028
 holiday.el-GR13.name=Χριστούγεννα
-holiday.el-GR13.date=20151225
+holiday.el-GR13.date=20201225
 holiday.el-GR14.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR14.date=20151226
+holiday.el-GR14.date=20201226
 holiday.el-GR15.name=Πρωτοχρονιά
-holiday.el-GR15.date=20160101
+holiday.el-GR15.date=20210101
 holiday.el-GR16.name=Θεοφάνεια
-holiday.el-GR16.date=20160106
+holiday.el-GR16.date=20210106
 holiday.el-GR17.name=Καθαρά Δευτέρα
-holiday.el-GR17.date=20160314
+holiday.el-GR17.date=20210315
 holiday.el-GR18.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR18.date=20160325
-holiday.el-GR19.name=Πρωτομαγιά
-holiday.el-GR19.date=20160418
-holiday.el-GR20.name=Μεγάλη Παρασκευή
-holiday.el-GR20.date=20160429
-holiday.el-GR21.name=Μεγάλο Σάββατο
-holiday.el-GR21.date=20160430
+holiday.el-GR18.date=20210325
+holiday.el-GR19.name=Μεγάλη Παρασκευή
+holiday.el-GR19.date=20210430
+holiday.el-GR20.name=Μεγάλο Σάββατο
+holiday.el-GR20.date=20210501
+holiday.el-GR21.name=Πρωτομαγιά
+holiday.el-GR21.date=20210501
 holiday.el-GR22.name=Πάσχα
-holiday.el-GR22.date=20160501
+holiday.el-GR22.date=20210502
 holiday.el-GR23.name=Δευτέρα του Πάσχα
-holiday.el-GR23.date=20160502
+holiday.el-GR23.date=20210503
 holiday.el-GR24.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR24.date=20160620
+holiday.el-GR24.date=20210621
 holiday.el-GR25.name=Κοίμηση της Θεοτόκου
-holiday.el-GR25.date=20160815
+holiday.el-GR25.date=20210815
 holiday.el-GR26.name=Ημέρα του ΌΧΙ
-holiday.el-GR26.date=20161028
+holiday.el-GR26.date=20211028
 holiday.el-GR27.name=Χριστούγεννα
-holiday.el-GR27.date=20161225
+holiday.el-GR27.date=20211225
 holiday.el-GR28.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR28.date=20161226
+holiday.el-GR28.date=20211226
diff --git a/doc/rc/holidays.en-AU.rc b/doc/rc/holidays.en-AU.rc
deleted file mode 100644
index a6ddca83b..000000000
--- a/doc/rc/holidays.en-AU.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/en-AU/2015.json
-# http://holidata.net/en-AU/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.en-AU1.name=New Year's Day
-holiday.en-AU1.date=20150101
-holiday.en-AU2.name=Australia Day
-holiday.en-AU2.date=20150126
-holiday.en-AU3.name=Royal Hobart Regatta
-holiday.en-AU3.date=20150209
-holiday.en-AU4.name=Labour Day
-holiday.en-AU4.date=20150302
-holiday.en-AU5.name=Labour Day
-holiday.en-AU5.date=20150309
-holiday.en-AU6.name=Canberra Day
-holiday.en-AU6.date=20150309
-holiday.en-AU7.name=Eight Hours Day
-holiday.en-AU7.date=20150309
-holiday.en-AU8.name=Good Friday
-holiday.en-AU8.date=20150403
-holiday.en-AU9.name=Easter Saturday
-holiday.en-AU9.date=20150404
-holiday.en-AU10.name=Easter Sunday
-holiday.en-AU10.date=20150405
-holiday.en-AU11.name=Easter Monday
-holiday.en-AU11.date=20150406
-holiday.en-AU12.name=Anzac Day
-holiday.en-AU12.date=20150425
-holiday.en-AU13.name=May Day
-holiday.en-AU13.date=20150504
-holiday.en-AU14.name=Foundation Day
-holiday.en-AU14.date=20150601
-holiday.en-AU15.name=Queen's Birthday
-holiday.en-AU15.date=20150608
-holiday.en-AU16.name=Picnic Day
-holiday.en-AU16.date=20150803
-holiday.en-AU17.name=Bank Holiday
-holiday.en-AU17.date=20150803
-holiday.en-AU18.name=Queen's Birthday
-holiday.en-AU18.date=20150928
-holiday.en-AU19.name=Labour Day
-holiday.en-AU19.date=20151005
-holiday.en-AU20.name=Recreation Day
-holiday.en-AU20.date=20151102
-holiday.en-AU21.name=Christmas Day
-holiday.en-AU21.date=20151225
-holiday.en-AU22.name=Boxing Day
-holiday.en-AU22.date=20151226
-holiday.en-AU23.name=Proclamation Day
-holiday.en-AU23.date=20151226
-holiday.en-AU24.name=New Year's Day
-holiday.en-AU24.date=20160101
-holiday.en-AU25.name=Australia Day
-holiday.en-AU25.date=20160126
-holiday.en-AU26.name=Royal Hobart Regatta
-holiday.en-AU26.date=20160208
-holiday.en-AU27.name=Labour Day
-holiday.en-AU27.date=20160307
-holiday.en-AU28.name=Labour Day
-holiday.en-AU28.date=20160314
-holiday.en-AU29.name=Canberra Day
-holiday.en-AU29.date=20160314
-holiday.en-AU30.name=Eight Hours Day
-holiday.en-AU30.date=20160314
-holiday.en-AU31.name=Good Friday
-holiday.en-AU31.date=20160325
-holiday.en-AU32.name=Easter Saturday
-holiday.en-AU32.date=20160326
-holiday.en-AU33.name=Easter Monday
-holiday.en-AU33.date=20160327
-holiday.en-AU34.name=Anzac Day
-holiday.en-AU34.date=20160425
-holiday.en-AU35.name=May Day
-holiday.en-AU35.date=20160502
-holiday.en-AU36.name=Foundation Day
-holiday.en-AU36.date=20160603
-holiday.en-AU37.name=Queen's Birthday
-holiday.en-AU37.date=20160613
-holiday.en-AU38.name=Picnic Day
-holiday.en-AU38.date=20160801
-holiday.en-AU39.name=Bank Holiday
-holiday.en-AU39.date=20160801
-holiday.en-AU40.name=Queen's Birthday
-holiday.en-AU40.date=20160926
-holiday.en-AU41.name=Labour Day
-holiday.en-AU41.date=20161003
-holiday.en-AU42.name=Recreation Day
-holiday.en-AU42.date=20161107
-holiday.en-AU43.name=Christmas Day
-holiday.en-AU43.date=20161225
-holiday.en-AU44.name=Boxing Day
-holiday.en-AU44.date=20161226
-holiday.en-AU45.name=Proclamation Day
-holiday.en-AU45.date=20161226
diff --git a/doc/rc/holidays.en-CA.rc b/doc/rc/holidays.en-CA.rc
index 57b2a0141..cb8784a81 100644
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-CA/2015.json
-# http://holidata.net/en-CA/2016.json
+# https://holidata.net/en-CA/2020.json
+# https://holidata.net/en-CA/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,78 @@
 ###############################################################################
 
 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20150101
+holiday.en-CA1.date=20200101
 holiday.en-CA2.name=Family Day
-holiday.en-CA2.date=20150209
-holiday.en-CA3.name=Good Friday
-holiday.en-CA3.date=20150403
-holiday.en-CA4.name=Easter Monday
-holiday.en-CA4.date=20150406
-holiday.en-CA5.name=Victoria Day
-holiday.en-CA5.date=20150518
-holiday.en-CA6.name=Canada Day
-holiday.en-CA6.date=20150701
-holiday.en-CA7.name=First Monday of August
-holiday.en-CA7.date=20150803
-holiday.en-CA8.name=Labour Day
-holiday.en-CA8.date=20150907
-holiday.en-CA9.name=Thanksgiving Day
-holiday.en-CA9.date=20151012
-holiday.en-CA10.name=Remembrance Day
-holiday.en-CA10.date=20151111
-holiday.en-CA11.name=Christmas Day
-holiday.en-CA11.date=20151225
-holiday.en-CA12.name=Boxing Day
-holiday.en-CA12.date=20151226
-holiday.en-CA13.name=New Year's Day
-holiday.en-CA13.date=20160101
-holiday.en-CA14.name=Family Day
-holiday.en-CA14.date=20160208
-holiday.en-CA15.name=Good Friday
-holiday.en-CA15.date=20160325
-holiday.en-CA16.name=Easter Monday
-holiday.en-CA16.date=20160328
-holiday.en-CA17.name=Victoria Day
-holiday.en-CA17.date=20160523
-holiday.en-CA18.name=Canada Day
-holiday.en-CA18.date=20160701
-holiday.en-CA19.name=First Monday of August
-holiday.en-CA19.date=20160801
-holiday.en-CA20.name=Labour Day
-holiday.en-CA20.date=20160905
-holiday.en-CA21.name=Thanksgiving Day
-holiday.en-CA21.date=20161010
-holiday.en-CA22.name=Remembrance Day
-holiday.en-CA22.date=20161111
-holiday.en-CA23.name=Christmas Day
-holiday.en-CA23.date=20161225
-holiday.en-CA24.name=Boxing Day
-holiday.en-CA24.date=20161226
+holiday.en-CA2.date=20200217
+holiday.en-CA3.name=Louis Riel Day
+holiday.en-CA3.date=20200217
+holiday.en-CA4.name=Islander Day
+holiday.en-CA4.date=20200217
+holiday.en-CA5.name=Good Friday
+holiday.en-CA5.date=20200410
+holiday.en-CA6.name=Easter Monday
+holiday.en-CA6.date=20200413
+holiday.en-CA7.name=National Patriots' Day
+holiday.en-CA7.date=20200518
+holiday.en-CA8.name=Victoria Day
+holiday.en-CA8.date=20200518
+holiday.en-CA9.name=National Holiday
+holiday.en-CA9.date=20200624
+holiday.en-CA10.name=Canada Day
+holiday.en-CA10.date=20200701
+holiday.en-CA11.name=August Civic Holiday
+holiday.en-CA11.date=20200803
+holiday.en-CA12.name=Saskatchewan Day
+holiday.en-CA12.date=20200803
+holiday.en-CA13.name=Heritage Day
+holiday.en-CA13.date=20200803
+holiday.en-CA14.name=New Brunswick Day
+holiday.en-CA14.date=20200803
+holiday.en-CA15.name=Labour Day
+holiday.en-CA15.date=20200907
+holiday.en-CA16.name=Thanksgiving Day
+holiday.en-CA16.date=20201012
+holiday.en-CA17.name=Remembrance Day
+holiday.en-CA17.date=20201111
+holiday.en-CA18.name=Christmas Day
+holiday.en-CA18.date=20201225
+holiday.en-CA19.name=Boxing Day
+holiday.en-CA19.date=20201226
+holiday.en-CA20.name=New Year's Day
+holiday.en-CA20.date=20210101
+holiday.en-CA21.name=Family Day
+holiday.en-CA21.date=20210215
+holiday.en-CA22.name=Louis Riel Day
+holiday.en-CA22.date=20210215
+holiday.en-CA23.name=Islander Day
+holiday.en-CA23.date=20210215
+holiday.en-CA24.name=Good Friday
+holiday.en-CA24.date=20210402
+holiday.en-CA25.name=Easter Monday
+holiday.en-CA25.date=20210405
+holiday.en-CA26.name=National Patriots' Day
+holiday.en-CA26.date=20210524
+holiday.en-CA27.name=Victoria Day
+holiday.en-CA27.date=20210524
+holiday.en-CA28.name=National Holiday
+holiday.en-CA28.date=20210624
+holiday.en-CA29.name=Canada Day
+holiday.en-CA29.date=20210701
+holiday.en-CA30.name=August Civic Holiday
+holiday.en-CA30.date=20210802
+holiday.en-CA31.name=Saskatchewan Day
+holiday.en-CA31.date=20210802
+holiday.en-CA32.name=Heritage Day
+holiday.en-CA32.date=20210802
+holiday.en-CA33.name=New Brunswick Day
+holiday.en-CA33.date=20210802
+holiday.en-CA34.name=Labour Day
+holiday.en-CA34.date=20210906
+holiday.en-CA35.name=Thanksgiving Day
+holiday.en-CA35.date=20211011
+holiday.en-CA36.name=Remembrance Day
+holiday.en-CA36.date=20211111
+holiday.en-CA37.name=Christmas Day
+holiday.en-CA37.date=20211225
+holiday.en-CA38.name=Boxing Day
+holiday.en-CA38.date=20211226
diff --git a/doc/rc/holidays.en-GB.rc b/doc/rc/holidays.en-GB.rc
index ed7c218f7..b6e30ea99 100644
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-GB/2015.json
-# http://holidata.net/en-GB/2016.json
+# https://holidata.net/en-GB/2020.json
+# https://holidata.net/en-GB/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,34 +28,40 @@
 ###############################################################################
 
 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20150101
+holiday.en-GB1.date=20200101
 holiday.en-GB2.name=Good Friday
-holiday.en-GB2.date=20150403
+holiday.en-GB2.date=20200410
 holiday.en-GB3.name=Easter Monday
-holiday.en-GB3.date=20150406
+holiday.en-GB3.date=20200413
 holiday.en-GB4.name=Early May Bank Holiday
-holiday.en-GB4.date=20150504
+holiday.en-GB4.date=20200504
 holiday.en-GB5.name=Spring Bank Holiday
-holiday.en-GB5.date=20150525
+holiday.en-GB5.date=20200525
 holiday.en-GB6.name=August Bank Holiday
-holiday.en-GB6.date=20150831
+holiday.en-GB6.date=20200831
 holiday.en-GB7.name=Christmas Day
-holiday.en-GB7.date=20151225
+holiday.en-GB7.date=20201225
 holiday.en-GB8.name=Boxing Day
-holiday.en-GB8.date=20151226
-holiday.en-GB9.name=New Year's Day
-holiday.en-GB9.date=20160101
-holiday.en-GB10.name=Good Friday
-holiday.en-GB10.date=20160325
-holiday.en-GB11.name=Easter Monday
-holiday.en-GB11.date=20160328
-holiday.en-GB12.name=Early May Bank Holiday
-holiday.en-GB12.date=20160502
-holiday.en-GB13.name=Spring Bank Holiday
-holiday.en-GB13.date=20160530
-holiday.en-GB14.name=August Bank Holiday
-holiday.en-GB14.date=20160829
-holiday.en-GB15.name=Christmas Day
-holiday.en-GB15.date=20161225
-holiday.en-GB16.name=Boxing Day
-holiday.en-GB16.date=20161226
+holiday.en-GB8.date=20201226
+holiday.en-GB9.name=Boxing Day (observed)
+holiday.en-GB9.date=20201228
+holiday.en-GB10.name=New Year's Day
+holiday.en-GB10.date=20210101
+holiday.en-GB11.name=Good Friday
+holiday.en-GB11.date=20210402
+holiday.en-GB12.name=Easter Monday
+holiday.en-GB12.date=20210405
+holiday.en-GB13.name=Early May Bank Holiday
+holiday.en-GB13.date=20210503
+holiday.en-GB14.name=Spring Bank Holiday
+holiday.en-GB14.date=20210531
+holiday.en-GB15.name=August Bank Holiday
+holiday.en-GB15.date=20210830
+holiday.en-GB16.name=Christmas Day
+holiday.en-GB16.date=20211225
+holiday.en-GB17.name=Boxing Day
+holiday.en-GB17.date=20211226
+holiday.en-GB18.name=Christmas Day (observed)
+holiday.en-GB18.date=20211227
+holiday.en-GB19.name=Boxing Day (observed)
+holiday.en-GB19.date=20211228
diff --git a/doc/rc/holidays.en-GL.rc b/doc/rc/holidays.en-GL.rc
deleted file mode 100644
index edc936127..000000000
--- a/doc/rc/holidays.en-GL.rc
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/en-GL/2015.json
-# http://holidata.net/en-GL/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.en-GL1.name=New Year's Day
-holiday.en-GL1.date=20150101
-holiday.en-GL2.name=Epiphany
-holiday.en-GL2.date=20150106
-holiday.en-GL3.name=Maundy Thursday
-holiday.en-GL3.date=20150402
-holiday.en-GL4.name=Good Friday
-holiday.en-GL4.date=20150303
-holiday.en-GL5.name=Easter Monday
-holiday.en-GL5.date=20150406
-holiday.en-GL6.name=General Prayer Day
-holiday.en-GL6.date=20150501
-holiday.en-GL7.name=Ascension
-holiday.en-GL7.date=20150514
-holiday.en-GL8.name=Whit Monday
-holiday.en-GL8.date=20150525
-holiday.en-GL9.name=Ullortuneq
-holiday.en-GL9.date=20150621
-holiday.en-GL10.name=Christmas Eve
-holiday.en-GL10.date=20151224
-holiday.en-GL11.name=Christmas Day
-holiday.en-GL11.date=20151225
-holiday.en-GL12.name=St Stephen's Day
-holiday.en-GL12.date=20151226
-holiday.en-GL13.name=New Year's Eve
-holiday.en-GL13.date=20151231
-holiday.en-GL14.name=New Year's Day
-holiday.en-GL14.date=20160101
-holiday.en-GL15.name=Epiphany
-holiday.en-GL15.date=20160106
-holiday.en-GL16.name=Maundy Thursday
-holiday.en-GL16.date=20160324
-holiday.en-GL17.name=Good Friday
-holiday.en-GL17.date=20160325
-holiday.en-GL18.name=Easter Monday
-holiday.en-GL18.date=20160428
-holiday.en-GL19.name=General Prayer Day
-holiday.en-GL19.date=20160422
-holiday.en-GL20.name=Ascension
-holiday.en-GL20.date=20160505
-holiday.en-GL21.name=Whit Monday
-holiday.en-GL21.date=20160516
-holiday.en-GL22.name=Ullortuneq
-holiday.en-GL22.date=20160621
-holiday.en-GL23.name=Christmas Eve
-holiday.en-GL23.date=20161224
-holiday.en-GL24.name=Christmas Day
-holiday.en-GL24.date=20161225
-holiday.en-GL25.name=St Stephen's Day
-holiday.en-GL25.date=20161226
-holiday.en-GL26.name=New Year's Eve
-holiday.en-GL26.date=20161231
diff --git a/doc/rc/holidays.en-HK.rc b/doc/rc/holidays.en-HK.rc
deleted file mode 100644
index 62c54c745..000000000
--- a/doc/rc/holidays.en-HK.rc
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/en-HK/2015.json
-# http://holidata.net/en-HK/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.en-HK1.name=The first day of January
-holiday.en-HK1.date=20150101
-holiday.en-HK2.name=Lunar New Year’s Day
-holiday.en-HK2.date=20150219
-holiday.en-HK3.name=The second day of Lunar New Year
-holiday.en-HK3.date=20150220
-holiday.en-HK4.name=The third day of Lunar New Year
-holiday.en-HK4.date=20150221
-holiday.en-HK5.name=Good Friday
-holiday.en-HK5.date=20150403
-holiday.en-HK6.name=The day following Good Friday
-holiday.en-HK6.date=20150404
-holiday.en-HK7.name=The day following Ching Ming Festival
-holiday.en-HK7.date=20150406
-holiday.en-HK8.name=The day following Easter Monday
-holiday.en-HK8.date=20150407
-holiday.en-HK9.name=Labour Day
-holiday.en-HK9.date=20150501
-holiday.en-HK10.name=The Birthday of the Buddha
-holiday.en-HK10.date=20150525
-holiday.en-HK11.name=Tuen Ng Festival
-holiday.en-HK11.date=20150620
-holiday.en-HK12.name=Hong Kong Special Administrative Region Establishment Day
-holiday.en-HK12.date=20150701
-holiday.en-HK13.name=The day following the Chinese Mid-Autumn Festival
-holiday.en-HK13.date=20150928
-holiday.en-HK14.name=National Day
-holiday.en-HK14.date=20151001
-holiday.en-HK15.name=Chung Yeung Festival
-holiday.en-HK15.date=20151021
-holiday.en-HK16.name=Christmas Day
-holiday.en-HK16.date=20151225
-holiday.en-HK17.name=The first weekday after Christmas Day
-holiday.en-HK17.date=20151226
-holiday.en-HK18.name=The first day of January
-holiday.en-HK18.date=20160101
-holiday.en-HK19.name=Lunar New Year’s Day
-holiday.en-HK19.date=20160208
-holiday.en-HK20.name=The second day of Lunar New Year
-holiday.en-HK20.date=20160209
-holiday.en-HK21.name=The third day of Lunar New Year
-holiday.en-HK21.date=20160210
-holiday.en-HK22.name=Good Friday
-holiday.en-HK22.date=20160325
-holiday.en-HK23.name=The day following Good Friday
-holiday.en-HK23.date=20160326
-holiday.en-HK24.name=Ching Ming Festival
-holiday.en-HK24.date=20160404
-holiday.en-HK25.name=Labour Day
-holiday.en-HK25.date=20160501
-holiday.en-HK26.name=The Birthday of the Buddha
-holiday.en-HK26.date=20160514
-holiday.en-HK27.name=Tuen Ng Festival
-holiday.en-HK27.date=20160609
-holiday.en-HK28.name=Hong Kong Special Administrative Region Establishment Day
-holiday.en-HK28.date=20160701
-holiday.en-HK29.name=The day following the Chinese Mid-Autumn Festival
-holiday.en-HK29.date=20160916
-holiday.en-HK30.name=National Day
-holiday.en-HK30.date=20161001
-holiday.en-HK31.name=Chung Yeung Festival
-holiday.en-HK31.date=20161010
-holiday.en-HK32.name=Christmas Day
-holiday.en-HK32.date=20161225
-holiday.en-HK33.name=The first weekday after Christmas Day
-holiday.en-HK33.date=20161226
diff --git a/doc/rc/holidays.en-IN.rc b/doc/rc/holidays.en-IN.rc
deleted file mode 100644
index 87d27bc02..000000000
--- a/doc/rc/holidays.en-IN.rc
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/en-IN/2015.json
-# http://holidata.net/en-IN/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.en-IN1.name=New Year's Day
-holiday.en-IN1.date=20160101
-holiday.en-IN2.name=Lohri
-holiday.en-IN2.date=20160114
-holiday.en-IN3.name=Pongal, Makar Sankranti
-holiday.en-IN3.date=20160115
-holiday.en-IN4.name=Guru Gobind Singh Jayanti
-holiday.en-IN4.date=20160116
-holiday.en-IN5.name=Republic Day
-holiday.en-IN5.date=20160126
-holiday.en-IN6.name=Vasant Panchami
-holiday.en-IN6.date=20160212
-holiday.en-IN7.name=Guru Ravidas Jayanti
-holiday.en-IN7.date=20160222
-holiday.en-IN8.name=Maha Shivaratri
-holiday.en-IN8.date=20160307
-holiday.en-IN9.name=Chhoti Holi, Holika Dahan
-holiday.en-IN9.date=20160323
-holiday.en-IN10.name=Holi
-holiday.en-IN10.date=20160324
-holiday.en-IN11.name=Good Friday
-holiday.en-IN11.date=20160325
-holiday.en-IN12.name=Easter
-holiday.en-IN12.date=20160327
-holiday.en-IN13.name=Gudi Padwa, Ugadi
-holiday.en-IN13.date=20160408
-holiday.en-IN14.name=Solar New Year, Baisakhi
-holiday.en-IN14.date=20160413
-holiday.en-IN15.name=Rama Navami
-holiday.en-IN15.date=20160415
-holiday.en-IN16.name=Hazarat Ali's Birthday
-holiday.en-IN16.date=20160421
-holiday.en-IN17.name=Buddha Purnima
-holiday.en-IN17.date=20160521
-holiday.en-IN18.name=Eid al-Fitr , Ramadan
-holiday.en-IN18.date=20160707
-holiday.en-IN19.name=Independence Day
-holiday.en-IN19.date=20160815
-holiday.en-IN20.name=Rakhi, Raksha Bandhan
-holiday.en-IN20.date=20160818
-holiday.en-IN21.name=Krishna Janmashtami
-holiday.en-IN21.date=20160825
-holiday.en-IN22.name=Ganesh Chaturthi
-holiday.en-IN22.date=20160905
-holiday.en-IN23.name=Onam, Eid al-Adha, Bakrid
-holiday.en-IN23.date=20160913
-holiday.en-IN24.name=Gandhi Jayanti
-holiday.en-IN24.date=20161002
-holiday.en-IN25.name=Durga Ashtami
-holiday.en-IN25.date=20161009
-holiday.en-IN26.name=Maha Navami
-holiday.en-IN26.date=20161010
-holiday.en-IN27.name=Dussehra, Madhvacharya Jayanti
-holiday.en-IN27.date=20161011
-holiday.en-IN28.name=Muharram
-holiday.en-IN28.date=20161012
-holiday.en-IN29.name=Valmiki Jayanti
-holiday.en-IN29.date=20161016
-holiday.en-IN30.name=Karwa Chauth
-holiday.en-IN30.date=20161019
-holiday.en-IN31.name=Diwali, Lakshmi Puja
-holiday.en-IN31.date=20161030
-holiday.en-IN32.name=Gowardhan Puja
-holiday.en-IN32.date=20161031
-holiday.en-IN33.name=Bhaiya Dooj
-holiday.en-IN33.date=20161101
-holiday.en-IN34.name=Chhath Puja
-holiday.en-IN34.date=20161106
-holiday.en-IN35.name=Guru Nanak Jayanti, Nehru Jayanti
-holiday.en-IN35.date=20161114
-holiday.en-IN36.name=Milad an-Nabi, Id-e-Milad
-holiday.en-IN36.date=20161212
-holiday.en-IN37.name=Christmas
-holiday.en-IN37.date=20161225
diff --git a/doc/rc/holidays.en-NZ.rc b/doc/rc/holidays.en-NZ.rc
index 39af7d61f..622908af1 100644
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-NZ/2015.json
-# http://holidata.net/en-NZ/2016.json
+# https://holidata.net/en-NZ/2020.json
+# https://holidata.net/en-NZ/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,54 @@
 ###############################################################################
 
 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20150101
-holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20150102
+holiday.en-NZ1.date=20200101
+holiday.en-NZ2.name=Day after New Year's Day
+holiday.en-NZ2.date=20200102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20150206
+holiday.en-NZ3.date=20200206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20150403
+holiday.en-NZ4.date=20200410
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20150406
+holiday.en-NZ5.date=20200413
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20150425
-holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20150601
-holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20151026
-holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20151225
-holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20151226
-holiday.en-NZ11.name=New Year's Day
-holiday.en-NZ11.date=20160101
-holiday.en-NZ12.name=Day after New Years Day
-holiday.en-NZ12.date=20160104
-holiday.en-NZ13.name=Waitangi Day
-holiday.en-NZ13.date=20160206
-holiday.en-NZ14.name=Good Friday
-holiday.en-NZ14.date=20160325
-holiday.en-NZ15.name=Easter Monday
-holiday.en-NZ15.date=20160328
-holiday.en-NZ16.name=ANZAC Day
-holiday.en-NZ16.date=20160425
-holiday.en-NZ17.name=Queen's Birthday
-holiday.en-NZ17.date=20160606
-holiday.en-NZ18.name=Labour Day
-holiday.en-NZ18.date=20161024
-holiday.en-NZ19.name=Christmas Day
-holiday.en-NZ19.date=20161225
-holiday.en-NZ20.name=Boxing Day
-holiday.en-NZ20.date=20161226
+holiday.en-NZ6.date=20200425
+holiday.en-NZ7.name=ANZAC Day (observed)
+holiday.en-NZ7.date=20200427
+holiday.en-NZ8.name=Queen's Birthday
+holiday.en-NZ8.date=20200601
+holiday.en-NZ9.name=Labour Day
+holiday.en-NZ9.date=20201026
+holiday.en-NZ10.name=Christmas Day
+holiday.en-NZ10.date=20201225
+holiday.en-NZ11.name=Boxing Day
+holiday.en-NZ11.date=20201226
+holiday.en-NZ12.name=Boxing Day (observed)
+holiday.en-NZ12.date=20201228
+holiday.en-NZ13.name=New Year's Day
+holiday.en-NZ13.date=20210101
+holiday.en-NZ14.name=Day after New Year's Day
+holiday.en-NZ14.date=20210104
+holiday.en-NZ15.name=Waitangi Day
+holiday.en-NZ15.date=20210206
+holiday.en-NZ16.name=Waitangi Day (observed)
+holiday.en-NZ16.date=20210208
+holiday.en-NZ17.name=Good Friday
+holiday.en-NZ17.date=20210402
+holiday.en-NZ18.name=Easter Monday
+holiday.en-NZ18.date=20210405
+holiday.en-NZ19.name=ANZAC Day
+holiday.en-NZ19.date=20210425
+holiday.en-NZ20.name=ANZAC Day (observed)
+holiday.en-NZ20.date=20210426
+holiday.en-NZ21.name=Queen's Birthday
+holiday.en-NZ21.date=20210607
+holiday.en-NZ22.name=Labour Day
+holiday.en-NZ22.date=20211025
+holiday.en-NZ23.name=Christmas Day
+holiday.en-NZ23.date=20211225
+holiday.en-NZ24.name=Boxing Day
+holiday.en-NZ24.date=20211226
+holiday.en-NZ25.name=Christmas Day (observed)
+holiday.en-NZ25.date=20211227
+holiday.en-NZ26.name=Boxing Day (observed)
+holiday.en-NZ26.date=20211228
diff --git a/doc/rc/holidays.en-US.rc b/doc/rc/holidays.en-US.rc
index 03ca9c499..8a07c0341 100644
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/en-US/2015.json
-# http://holidata.net/en-US/2016.json
+# https://holidata.net/en-US/2020.json
+# https://holidata.net/en-US/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20150101
+holiday.en-US1.date=20200101
 holiday.en-US2.name=Birthday of Martin Luther King, Jr.
-holiday.en-US2.date=20150119
+holiday.en-US2.date=20200120
 holiday.en-US3.name=Washington's Birthday
-holiday.en-US3.date=20150216
+holiday.en-US3.date=20200217
 holiday.en-US4.name=Patriots' Day
-holiday.en-US4.date=20150420
+holiday.en-US4.date=20200420
 holiday.en-US5.name=Memorial Day
-holiday.en-US5.date=20150525
+holiday.en-US5.date=20200525
 holiday.en-US6.name=Independence Day
-holiday.en-US6.date=20150704
+holiday.en-US6.date=20200704
 holiday.en-US7.name=Labor Day
-holiday.en-US7.date=20150907
+holiday.en-US7.date=20200907
 holiday.en-US8.name=Columbus Day
-holiday.en-US8.date=20151012
+holiday.en-US8.date=20201012
 holiday.en-US9.name=Veterans Day
-holiday.en-US9.date=20151111
+holiday.en-US9.date=20201111
 holiday.en-US10.name=Thanksgiving Day
-holiday.en-US10.date=20151126
-holiday.en-US11.name=Christmas Day
-holiday.en-US11.date=20151225
-holiday.en-US12.name=New Year's Day
-holiday.en-US12.date=20160101
-holiday.en-US13.name=Birthday of Martin Luther King, Jr.
-holiday.en-US13.date=20160118
-holiday.en-US14.name=Washington's Birthday
-holiday.en-US14.date=20160215
-holiday.en-US15.name=Patriots' Day
-holiday.en-US15.date=20160418
-holiday.en-US16.name=Memorial Day
-holiday.en-US16.date=20160530
-holiday.en-US17.name=Independence Day
-holiday.en-US17.date=20160704
-holiday.en-US18.name=Labor Day
-holiday.en-US18.date=20160905
-holiday.en-US19.name=Columbus Day
-holiday.en-US19.date=20161010
-holiday.en-US20.name=Veterans Day
-holiday.en-US20.date=20161111
-holiday.en-US21.name=Thanksgiving Day
-holiday.en-US21.date=20161124
-holiday.en-US22.name=Christmas Day
-holiday.en-US22.date=20161225
+holiday.en-US10.date=20201126
+holiday.en-US11.name=Day after Thanksgiving
+holiday.en-US11.date=20201127
+holiday.en-US12.name=Christmas Eve
+holiday.en-US12.date=20201224
+holiday.en-US13.name=Christmas Day
+holiday.en-US13.date=20201225
+holiday.en-US14.name=New Year's Day
+holiday.en-US14.date=20210101
+holiday.en-US15.name=Birthday of Martin Luther King, Jr.
+holiday.en-US15.date=20210118
+holiday.en-US16.name=Washington's Birthday
+holiday.en-US16.date=20210215
+holiday.en-US17.name=Patriots' Day
+holiday.en-US17.date=20210419
+holiday.en-US18.name=Memorial Day
+holiday.en-US18.date=20210531
+holiday.en-US19.name=Independence Day
+holiday.en-US19.date=20210704
+holiday.en-US20.name=Labor Day
+holiday.en-US20.date=20210906
+holiday.en-US21.name=Columbus Day
+holiday.en-US21.date=20211011
+holiday.en-US22.name=Veterans Day
+holiday.en-US22.date=20211111
+holiday.en-US23.name=Thanksgiving Day
+holiday.en-US23.date=20211125
+holiday.en-US24.name=Christmas Day
+holiday.en-US24.date=20211225
diff --git a/doc/rc/holidays.en-ZA.rc b/doc/rc/holidays.en-ZA.rc
deleted file mode 100644
index 2078c40dd..000000000
--- a/doc/rc/holidays.en-ZA.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/en-ZA/2015.json
-# http://holidata.net/en-ZA/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.en-ZA1.name=New Year's Day
-holiday.en-ZA1.date=20150101
-holiday.en-ZA2.name=Human Rights Day
-holiday.en-ZA2.date=20150321
-holiday.en-ZA3.name=Good Friday
-holiday.en-ZA3.date=20150403
-holiday.en-ZA4.name=Family Day
-holiday.en-ZA4.date=20150406
-holiday.en-ZA5.name=Freedom Day
-holiday.en-ZA5.date=20150427
-holiday.en-ZA6.name=Workers' Day
-holiday.en-ZA6.date=20150501
-holiday.en-ZA7.name=Youth Day
-holiday.en-ZA7.date=20150616
-holiday.en-ZA8.name=National Women's Day
-holiday.en-ZA8.date=20150809
-holiday.en-ZA9.name=Heritage Day
-holiday.en-ZA9.date=20150924
-holiday.en-ZA10.name=Day of Reconciliation
-holiday.en-ZA10.date=20151217
-holiday.en-ZA11.name=Christmas Day
-holiday.en-ZA11.date=20151225
-holiday.en-ZA12.name=Day of Goodwill
-holiday.en-ZA12.date=20151226
-holiday.en-ZA13.name=New Year's Day
-holiday.en-ZA13.date=20160101
-holiday.en-ZA14.name=Human Rights Day
-holiday.en-ZA14.date=20160321
-holiday.en-ZA15.name=Good Friday
-holiday.en-ZA15.date=20160325
-holiday.en-ZA16.name=Family Day
-holiday.en-ZA16.date=20160328
-holiday.en-ZA17.name=Freedom Day
-holiday.en-ZA17.date=20160427
-holiday.en-ZA18.name=Workers' Day
-holiday.en-ZA18.date=20160501
-holiday.en-ZA19.name=Youth Day
-holiday.en-ZA19.date=20160616
-holiday.en-ZA20.name=National Women's Day
-holiday.en-ZA20.date=20160809
-holiday.en-ZA21.name=Heritage Day
-holiday.en-ZA21.date=20160924
-holiday.en-ZA22.name=Day of Reconciliation
-holiday.en-ZA22.date=20161217
-holiday.en-ZA23.name=Christmas Day
-holiday.en-ZA23.date=20161225
-holiday.en-ZA24.name=Day of Goodwill
-holiday.en-ZA24.date=20161226
diff --git a/doc/rc/holidays.es-CO.rc b/doc/rc/holidays.es-CO.rc
index dd606af78..4e9f4ae87 100644
--- a/doc/rc/holidays.es-CO.rc
+++ b/doc/rc/holidays.es-CO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/es-CO/2015.json
-# http://holidata.net/es-CO/2016.json
+# https://holidata.net/es-CO/2020.json
+# https://holidata.net/es-CO/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,78 +28,78 @@
 ###############################################################################
 
 holiday.es-CO1.name=Año Nuevo
-holiday.es-CO1.date=20150101
+holiday.es-CO1.date=20200101
 holiday.es-CO2.name=Día de los Reyes Magos
-holiday.es-CO2.date=20150112
+holiday.es-CO2.date=20200106
 holiday.es-CO3.name=Día de San José
-holiday.es-CO3.date=20150323
+holiday.es-CO3.date=20200323
 holiday.es-CO4.name=Jueves Santo
-holiday.es-CO4.date=20150402
+holiday.es-CO4.date=20200409
 holiday.es-CO5.name=Viernes Santo
-holiday.es-CO5.date=20150403
+holiday.es-CO5.date=20200410
 holiday.es-CO6.name=Domingo de Pascua
-holiday.es-CO6.date=20150405
+holiday.es-CO6.date=20200412
 holiday.es-CO7.name=Día del Trabajo
-holiday.es-CO7.date=20150501
+holiday.es-CO7.date=20200501
 holiday.es-CO8.name=La Ascensión del Señor
-holiday.es-CO8.date=20150518
+holiday.es-CO8.date=20200525
 holiday.es-CO9.name=Corpus Christi
-holiday.es-CO9.date=20150608
+holiday.es-CO9.date=20200615
 holiday.es-CO10.name=El Sagrado Corazón de Jesús
-holiday.es-CO10.date=20150615
+holiday.es-CO10.date=20200622
 holiday.es-CO11.name=San Pedro y San Pablo
-holiday.es-CO11.date=20150629
+holiday.es-CO11.date=20200629
 holiday.es-CO12.name=Grito de Independencia
-holiday.es-CO12.date=20150720
+holiday.es-CO12.date=20200720
 holiday.es-CO13.name=Batalla de Boyacá
-holiday.es-CO13.date=20150807
+holiday.es-CO13.date=20200807
 holiday.es-CO14.name=Asunción de la Virgen
-holiday.es-CO14.date=20150817
+holiday.es-CO14.date=20200817
 holiday.es-CO15.name=Día de la Raza
-holiday.es-CO15.date=20151012
+holiday.es-CO15.date=20201012
 holiday.es-CO16.name=Todos los Santos
-holiday.es-CO16.date=20151102
+holiday.es-CO16.date=20201102
 holiday.es-CO17.name=Independencia de Cartagena
-holiday.es-CO17.date=20151116
+holiday.es-CO17.date=20201116
 holiday.es-CO18.name=Inmaculada Concepción
-holiday.es-CO18.date=20151208
+holiday.es-CO18.date=20201208
 holiday.es-CO19.name=Navidad
-holiday.es-CO19.date=20151225
+holiday.es-CO19.date=20201225
 holiday.es-CO20.name=Año Nuevo
-holiday.es-CO20.date=20160101
+holiday.es-CO20.date=20210101
 holiday.es-CO21.name=Día de los Reyes Magos
-holiday.es-CO21.date=20160111
+holiday.es-CO21.date=20210111
 holiday.es-CO22.name=Día de San José
-holiday.es-CO22.date=20160321
+holiday.es-CO22.date=20210322
 holiday.es-CO23.name=Jueves Santo
-holiday.es-CO23.date=20160324
+holiday.es-CO23.date=20210401
 holiday.es-CO24.name=Viernes Santo
-holiday.es-CO24.date=20160325
+holiday.es-CO24.date=20210402
 holiday.es-CO25.name=Domingo de Pascua
-holiday.es-CO25.date=20160326
+holiday.es-CO25.date=20210404
 holiday.es-CO26.name=Día del Trabajo
-holiday.es-CO26.date=20160501
+holiday.es-CO26.date=20210501
 holiday.es-CO27.name=La Ascensión del Señor
-holiday.es-CO27.date=20160509
+holiday.es-CO27.date=20210517
 holiday.es-CO28.name=Corpus Christi
-holiday.es-CO28.date=20160530
+holiday.es-CO28.date=20210607
 holiday.es-CO29.name=El Sagrado Corazón de Jesús
-holiday.es-CO29.date=20160606
+holiday.es-CO29.date=20210614
 holiday.es-CO30.name=San Pedro y San Pablo
-holiday.es-CO30.date=20160704
+holiday.es-CO30.date=20210705
 holiday.es-CO31.name=Grito de Independencia
-holiday.es-CO31.date=20160720
+holiday.es-CO31.date=20210720
 holiday.es-CO32.name=Batalla de Boyacá
-holiday.es-CO32.date=20160807
+holiday.es-CO32.date=20210807
 holiday.es-CO33.name=Asunción de la Virgen
-holiday.es-CO33.date=20160815
+holiday.es-CO33.date=20210816
 holiday.es-CO34.name=Día de la Raza
-holiday.es-CO34.date=20161017
+holiday.es-CO34.date=20211018
 holiday.es-CO35.name=Todos los Santos
-holiday.es-CO35.date=20161107
+holiday.es-CO35.date=20211101
 holiday.es-CO36.name=Independencia de Cartagena
-holiday.es-CO36.date=20161114
+holiday.es-CO36.date=20211115
 holiday.es-CO37.name=Inmaculada Concepción
-holiday.es-CO37.date=20161208
+holiday.es-CO37.date=20211208
 holiday.es-CO38.name=Navidad
-holiday.es-CO38.date=20161225
+holiday.es-CO38.date=20211225
diff --git a/doc/rc/holidays.es-EC.rc b/doc/rc/holidays.es-EC.rc
deleted file mode 100644
index 98cd9ecef..000000000
--- a/doc/rc/holidays.es-EC.rc
+++ /dev/null
@@ -1,75 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/es-EC/2015.json
-# http://holidata.net/es-EC/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.es-EC1.name=Año Nuevo
-holiday.es-EC1.date=20150101
-holiday.es-EC2.name=Año Nuevo
-holiday.es-EC2.date=20150102
-holiday.es-EC3.name=Carnaval
-holiday.es-EC3.date=20150216
-holiday.es-EC4.name=Carnaval
-holiday.es-EC4.date=20150217
-holiday.es-EC5.name=Viernes Santo
-holiday.es-EC5.date=20150403
-holiday.es-EC6.name=Día del Trabajo
-holiday.es-EC6.date=20150501
-holiday.es-EC7.name=Batalla del Pichincha
-holiday.es-EC7.date=20150524
-holiday.es-EC8.name=Primer Grito de Independencia
-holiday.es-EC8.date=20150810
-holiday.es-EC9.name=Independencia de Guayaquil
-holiday.es-EC9.date=20151009
-holiday.es-EC10.name=Día de Difuntos
-holiday.es-EC10.date=20151102
-holiday.es-EC11.name=Independencia de Cuenca
-holiday.es-EC11.date=20151103
-holiday.es-EC12.name=Navidad
-holiday.es-EC12.date=20151225
-holiday.es-EC13.name=Año Nuevo
-holiday.es-EC13.date=20160101
-holiday.es-EC14.name=Carnaval
-holiday.es-EC14.date=20160208
-holiday.es-EC15.name=Carnaval
-holiday.es-EC15.date=20160209
-holiday.es-EC16.name=Viernes Santo
-holiday.es-EC16.date=20160325
-holiday.es-EC17.name=Día del Trabajo
-holiday.es-EC17.date=20160501
-holiday.es-EC18.name=Batalla del Pichincha
-holiday.es-EC18.date=20160524
-holiday.es-EC19.name=Primer Grito de Independencia
-holiday.es-EC19.date=20160810
-holiday.es-EC20.name=Independencia de Guayaquil
-holiday.es-EC20.date=20161009
-holiday.es-EC21.name=Día de Difuntos
-holiday.es-EC21.date=20161102
-holiday.es-EC22.name=Independencia de Cuenca
-holiday.es-EC22.date=20161103
-holiday.es-EC23.name=Navidad
-holiday.es-EC23.date=20161225
diff --git a/doc/rc/holidays.es-ES.rc b/doc/rc/holidays.es-ES.rc
index ed701c1a5..ede40d114 100644
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/es-ES/2015.json
-# http://holidata.net/es-ES/2016.json
+# https://holidata.net/es-ES/2020.json
+# https://holidata.net/es-ES/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20150101
+holiday.es-ES1.date=20200101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20150106
+holiday.es-ES2.date=20200106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20150403
+holiday.es-ES3.date=20200410
 holiday.es-ES4.name=Pascua
-holiday.es-ES4.date=20150405
+holiday.es-ES4.date=20200412
 holiday.es-ES5.name=Fiesta del Trabajo
-holiday.es-ES5.date=20150501
+holiday.es-ES5.date=20200501
 holiday.es-ES6.name=Asunción de la Virgen
-holiday.es-ES6.date=20150815
+holiday.es-ES6.date=20200815
 holiday.es-ES7.name=Fiesta Nacional de España
-holiday.es-ES7.date=20151012
+holiday.es-ES7.date=20201012
 holiday.es-ES8.name=Dia de todos los Santos
-holiday.es-ES8.date=20151101
+holiday.es-ES8.date=20201101
 holiday.es-ES9.name=Dia de la Constitución
-holiday.es-ES9.date=20151206
+holiday.es-ES9.date=20201206
 holiday.es-ES10.name=Inmaculada Concepción
-holiday.es-ES10.date=20151208
+holiday.es-ES10.date=20201208
 holiday.es-ES11.name=Noche Buena
-holiday.es-ES11.date=20151224
+holiday.es-ES11.date=20201224
 holiday.es-ES12.name=Navidad
-holiday.es-ES12.date=20151225
+holiday.es-ES12.date=20201225
 holiday.es-ES13.name=Noche Vieja
-holiday.es-ES13.date=20151231
+holiday.es-ES13.date=20201231
 holiday.es-ES14.name=Año Nuevo
-holiday.es-ES14.date=20160101
+holiday.es-ES14.date=20210101
 holiday.es-ES15.name=Día de los Reyes
-holiday.es-ES15.date=20160106
+holiday.es-ES15.date=20210106
 holiday.es-ES16.name=Viernes Santo
-holiday.es-ES16.date=20160325
+holiday.es-ES16.date=20210402
 holiday.es-ES17.name=Pascua
-holiday.es-ES17.date=20160327
+holiday.es-ES17.date=20210404
 holiday.es-ES18.name=Fiesta del Trabajo
-holiday.es-ES18.date=20160501
+holiday.es-ES18.date=20210501
 holiday.es-ES19.name=Asunción de la Virgen
-holiday.es-ES19.date=20160815
+holiday.es-ES19.date=20210815
 holiday.es-ES20.name=Fiesta Nacional de España
-holiday.es-ES20.date=20161012
+holiday.es-ES20.date=20211012
 holiday.es-ES21.name=Dia de todos los Santos
-holiday.es-ES21.date=20161101
+holiday.es-ES21.date=20211101
 holiday.es-ES22.name=Dia de la Constitución
-holiday.es-ES22.date=20161206
+holiday.es-ES22.date=20211206
 holiday.es-ES23.name=Inmaculada Concepción
-holiday.es-ES23.date=20161208
+holiday.es-ES23.date=20211208
 holiday.es-ES24.name=Noche Buena
-holiday.es-ES24.date=20161224
+holiday.es-ES24.date=20211224
 holiday.es-ES25.name=Navidad
-holiday.es-ES25.date=20161225
+holiday.es-ES25.date=20211225
 holiday.es-ES26.name=Noche Vieja
-holiday.es-ES26.date=20161231
+holiday.es-ES26.date=20211231
diff --git a/doc/rc/holidays.es-MX.rc b/doc/rc/holidays.es-MX.rc
deleted file mode 100644
index 1e5b23257..000000000
--- a/doc/rc/holidays.es-MX.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/es-MX/2015.json
-# http://holidata.net/es-MX/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.es-MX1.name=Año Nuevo
-holiday.es-MX1.date=20150101
-holiday.es-MX2.name=Día de la Constitución
-holiday.es-MX2.date=20150202
-holiday.es-MX3.name=Natalicio de Benito Juárez
-holiday.es-MX3.date=20150316
-holiday.es-MX4.name=Jueves Santo
-holiday.es-MX4.date=20150402
-holiday.es-MX5.name=Viernes Santo
-holiday.es-MX5.date=20150403
-holiday.es-MX6.name=Día del Trabajo
-holiday.es-MX6.date=20150501
-holiday.es-MX7.name=Día de la Independencia
-holiday.es-MX7.date=20150916
-holiday.es-MX8.name=Día de la Revolución
-holiday.es-MX8.date=20151116
-holiday.es-MX9.name=Nuestra Señora de Guadalupe
-holiday.es-MX9.date=20151212
-holiday.es-MX10.name=Navidad
-holiday.es-MX10.date=20151225
-holiday.es-MX11.name=Año Nuevo
-holiday.es-MX11.date=20160101
-holiday.es-MX12.name=Día de la Constitución
-holiday.es-MX12.date=20160201
-holiday.es-MX13.name=Natalicio de Benito Juárez
-holiday.es-MX13.date=20160314
-holiday.es-MX14.name=Jueves Santo
-holiday.es-MX14.date=20160324
-holiday.es-MX15.name=Viernes Santo
-holiday.es-MX15.date=20160325
-holiday.es-MX16.name=Día del Trabajo
-holiday.es-MX16.date=20160501
-holiday.es-MX17.name=Día de la Independencia
-holiday.es-MX17.date=20160916
-holiday.es-MX18.name=Día de la Revolución
-holiday.es-MX18.date=20161121
-holiday.es-MX19.name=Nuestra Señora de Guadalupe
-holiday.es-MX19.date=20161212
-holiday.es-MX20.name=Navidad
-holiday.es-MX20.date=20161225
diff --git a/doc/rc/holidays.es-US.rc b/doc/rc/holidays.es-US.rc
index b96596d6b..34aa2e28e 100644
--- a/doc/rc/holidays.es-US.rc
+++ b/doc/rc/holidays.es-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/es-US/2015.json
-# http://holidata.net/es-US/2016.json
+# https://holidata.net/es-US/2020.json
+# https://holidata.net/es-US/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.es-US1.name=Año Neuvo
-holiday.es-US1.date=20150101
+holiday.es-US1.date=20200101
 holiday.es-US2.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US2.date=20150119
+holiday.es-US2.date=20200120
 holiday.es-US3.name=Día del Presidente
-holiday.es-US3.date=20150216
+holiday.es-US3.date=20200217
 holiday.es-US4.name=Día del Patriota
-holiday.es-US4.date=20150420
+holiday.es-US4.date=20200420
 holiday.es-US5.name=Día de los Caídos
-holiday.es-US5.date=20150525
+holiday.es-US5.date=20200525
 holiday.es-US6.name=Día de la Independiencia
-holiday.es-US6.date=20150704
+holiday.es-US6.date=20200704
 holiday.es-US7.name=Día del Trabajo
-holiday.es-US7.date=20150907
+holiday.es-US7.date=20200907
 holiday.es-US8.name=Día de Columbus
-holiday.es-US8.date=20151012
+holiday.es-US8.date=20201012
 holiday.es-US9.name=Día de los Veteranos
-holiday.es-US9.date=20151111
+holiday.es-US9.date=20201111
 holiday.es-US10.name=Día de Acción de Gracias
-holiday.es-US10.date=20151126
-holiday.es-US11.name=Navidad
-holiday.es-US11.date=20151225
-holiday.es-US12.name=Año Neuvo
-holiday.es-US12.date=20160101
-holiday.es-US13.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US13.date=20160118
-holiday.es-US14.name=Día del Presidente
-holiday.es-US14.date=20160215
-holiday.es-US15.name=Día del Patriota
-holiday.es-US15.date=20160418
-holiday.es-US16.name=Día de los Caídos
-holiday.es-US16.date=20160530
-holiday.es-US17.name=Día de la Independiencia
-holiday.es-US17.date=20160704
-holiday.es-US18.name=Día del Trabajo
-holiday.es-US18.date=20160905
-holiday.es-US19.name=Día de Columbus
-holiday.es-US19.date=20161010
-holiday.es-US20.name=Día de los Veteranos
-holiday.es-US20.date=20161111
-holiday.es-US21.name=Día de Acción de Gracias
-holiday.es-US21.date=20161124
-holiday.es-US22.name=Navidad
-holiday.es-US22.date=20161225
+holiday.es-US10.date=20201126
+holiday.es-US11.name=Día después de Acción de Gracias
+holiday.es-US11.date=20201127
+holiday.es-US12.name=Nochebuena
+holiday.es-US12.date=20201224
+holiday.es-US13.name=Navidad
+holiday.es-US13.date=20201225
+holiday.es-US14.name=Año Neuvo
+holiday.es-US14.date=20210101
+holiday.es-US15.name=Cumpleaños de Martin Luther King, Jr.
+holiday.es-US15.date=20210118
+holiday.es-US16.name=Día del Presidente
+holiday.es-US16.date=20210215
+holiday.es-US17.name=Día del Patriota
+holiday.es-US17.date=20210419
+holiday.es-US18.name=Día de los Caídos
+holiday.es-US18.date=20210531
+holiday.es-US19.name=Día de la Independiencia
+holiday.es-US19.date=20210704
+holiday.es-US20.name=Día del Trabajo
+holiday.es-US20.date=20210906
+holiday.es-US21.name=Día de Columbus
+holiday.es-US21.date=20211011
+holiday.es-US22.name=Día de los Veteranos
+holiday.es-US22.date=20211111
+holiday.es-US23.name=Día de Acción de Gracias
+holiday.es-US23.date=20211125
+holiday.es-US24.name=Navidad
+holiday.es-US24.date=20211225
diff --git a/doc/rc/holidays.et-EE.rc b/doc/rc/holidays.et-EE.rc
deleted file mode 100644
index 60620b2f5..000000000
--- a/doc/rc/holidays.et-EE.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/et-EE/2015.json
-# http://holidata.net/et-EE/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.et-EE1.name=uusaasta
-holiday.et-EE1.date=20150101
-holiday.et-EE2.name=iseseisvuspäev
-holiday.et-EE2.date=20150224
-holiday.et-EE3.name=suur reede
-holiday.et-EE3.date=20150403
-holiday.et-EE4.name=ülestõusmispühade 1. püha
-holiday.et-EE4.date=20150405
-holiday.et-EE5.name=kevadpüha
-holiday.et-EE5.date=20150501
-holiday.et-EE6.name=nelipühade 1. püha
-holiday.et-EE6.date=20150524
-holiday.et-EE7.name=võidupüha
-holiday.et-EE7.date=20150623
-holiday.et-EE8.name=jaanipäev
-holiday.et-EE8.date=20150624
-holiday.et-EE9.name=taasiseseisvumispäev
-holiday.et-EE9.date=20150820
-holiday.et-EE10.name=jõululaupäev
-holiday.et-EE10.date=20151224
-holiday.et-EE11.name=esimene jõulupüha
-holiday.et-EE11.date=20151225
-holiday.et-EE12.name=teine jõulupüha
-holiday.et-EE12.date=20151226
-holiday.et-EE13.name=uusaasta
-holiday.et-EE13.date=20160101
-holiday.et-EE14.name=iseseisvuspäev
-holiday.et-EE14.date=20160224
-holiday.et-EE15.name=suur reede
-holiday.et-EE15.date=20160325
-holiday.et-EE16.name=ülestõusmispühade 1. püha
-holiday.et-EE16.date=20160327
-holiday.et-EE17.name=kevadpüha
-holiday.et-EE17.date=20160501
-holiday.et-EE18.name=nelipühade 1. püha
-holiday.et-EE18.date=20160515
-holiday.et-EE19.name=võidupüha
-holiday.et-EE19.date=20160623
-holiday.et-EE20.name=jaanipäev
-holiday.et-EE20.date=20160624
-holiday.et-EE21.name=taasiseseisvumispäev
-holiday.et-EE21.date=20160820
-holiday.et-EE22.name=jõululaupäev
-holiday.et-EE22.date=20161224
-holiday.et-EE23.name=esimene jõulupüha
-holiday.et-EE23.date=20161225
-holiday.et-EE24.name=teine jõulupüha
-holiday.et-EE24.date=20161226
diff --git a/doc/rc/holidays.fi-FI.rc b/doc/rc/holidays.fi-FI.rc
index 95a11c120..c2c1e9efb 100644
--- a/doc/rc/holidays.fi-FI.rc
+++ b/doc/rc/holidays.fi-FI.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/fi-FI/2015.json
-# http://holidata.net/fi-FI/2016.json
+# https://holidata.net/fi-FI/2020.json
+# https://holidata.net/fi-FI/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,62 +28,54 @@
 ###############################################################################
 
 holiday.fi-FI1.name=Uudenvuodenpäivä
-holiday.fi-FI1.date=20150101
+holiday.fi-FI1.date=20200101
 holiday.fi-FI2.name=Loppiainen
-holiday.fi-FI2.date=20150106
+holiday.fi-FI2.date=20200106
 holiday.fi-FI3.name=Pitkäperjantai
-holiday.fi-FI3.date=20150403
+holiday.fi-FI3.date=20200410
 holiday.fi-FI4.name=Pääsiäispäivä
-holiday.fi-FI4.date=20150405
+holiday.fi-FI4.date=20200412
 holiday.fi-FI5.name=2. pääsiäispäivä
-holiday.fi-FI5.date=20150406
+holiday.fi-FI5.date=20200413
 holiday.fi-FI6.name=Vappu
-holiday.fi-FI6.date=20150501
+holiday.fi-FI6.date=20200501
 holiday.fi-FI7.name=Helatorstai
-holiday.fi-FI7.date=20150514
+holiday.fi-FI7.date=20200521
 holiday.fi-FI8.name=Helluntaipäivä
-holiday.fi-FI8.date=20150524
-holiday.fi-FI9.name=Juhannusaatto
-holiday.fi-FI9.date=20150619
-holiday.fi-FI10.name=Juhannuspäivä
-holiday.fi-FI10.date=20150620
-holiday.fi-FI11.name=Pyhäinpäivä
-holiday.fi-FI11.date=20151031
-holiday.fi-FI12.name=Itsenäisyyspäivä
-holiday.fi-FI12.date=20151206
-holiday.fi-FI13.name=Jouluaatto
-holiday.fi-FI13.date=20151224
-holiday.fi-FI14.name=Joulupäivä
-holiday.fi-FI14.date=20151225
-holiday.fi-FI15.name=2. joulupäivä
-holiday.fi-FI15.date=20151226
-holiday.fi-FI16.name=Uudenvuodenpäivä
-holiday.fi-FI16.date=20160101
-holiday.fi-FI17.name=Loppiainen
-holiday.fi-FI17.date=20160106
-holiday.fi-FI18.name=Pitkäperjantai
-holiday.fi-FI18.date=20160325
-holiday.fi-FI19.name=Pääsiäispäivä
-holiday.fi-FI19.date=20160327
-holiday.fi-FI20.name=2. pääsiäispäivä
-holiday.fi-FI20.date=20160328
-holiday.fi-FI21.name=Vappu
-holiday.fi-FI21.date=20160501
-holiday.fi-FI22.name=Helatorstai
-holiday.fi-FI22.date=20160505
-holiday.fi-FI23.name=Helluntaipäivä
-holiday.fi-FI23.date=20160515
-holiday.fi-FI24.name=Juhannusaatto
-holiday.fi-FI24.date=20160624
-holiday.fi-FI25.name=Juhannuspäivä
-holiday.fi-FI25.date=20160625
-holiday.fi-FI26.name=Pyhäinpäivä
-holiday.fi-FI26.date=20161105
-holiday.fi-FI27.name=Itsenäisyyspäivä
-holiday.fi-FI27.date=20161206
-holiday.fi-FI28.name=Jouluaatto
-holiday.fi-FI28.date=20161224
-holiday.fi-FI29.name=Joulupäivä
-holiday.fi-FI29.date=20161225
-holiday.fi-FI30.name=2. joulupäivä
-holiday.fi-FI30.date=20161226
+holiday.fi-FI8.date=20200531
+holiday.fi-FI9.name=Juhannuspäivä
+holiday.fi-FI9.date=20200620
+holiday.fi-FI10.name=Pyhäinpäivä
+holiday.fi-FI10.date=20201031
+holiday.fi-FI11.name=Itsenäisyyspäivä
+holiday.fi-FI11.date=20201206
+holiday.fi-FI12.name=Joulupäivä
+holiday.fi-FI12.date=20201225
+holiday.fi-FI13.name=Tapaninpäivä
+holiday.fi-FI13.date=20201226
+holiday.fi-FI14.name=Uudenvuodenpäivä
+holiday.fi-FI14.date=20210101
+holiday.fi-FI15.name=Loppiainen
+holiday.fi-FI15.date=20210106
+holiday.fi-FI16.name=Pitkäperjantai
+holiday.fi-FI16.date=20210402
+holiday.fi-FI17.name=Pääsiäispäivä
+holiday.fi-FI17.date=20210404
+holiday.fi-FI18.name=2. pääsiäispäivä
+holiday.fi-FI18.date=20210405
+holiday.fi-FI19.name=Vappu
+holiday.fi-FI19.date=20210501
+holiday.fi-FI20.name=Helatorstai
+holiday.fi-FI20.date=20210513
+holiday.fi-FI21.name=Helluntaipäivä
+holiday.fi-FI21.date=20210523
+holiday.fi-FI22.name=Juhannuspäivä
+holiday.fi-FI22.date=20210626
+holiday.fi-FI23.name=Pyhäinpäivä
+holiday.fi-FI23.date=20211106
+holiday.fi-FI24.name=Itsenäisyyspäivä
+holiday.fi-FI24.date=20211206
+holiday.fi-FI25.name=Joulupäivä
+holiday.fi-FI25.date=20211225
+holiday.fi-FI26.name=Tapaninpäivä
+holiday.fi-FI26.date=20211226
diff --git a/doc/rc/holidays.fr-BE.rc b/doc/rc/holidays.fr-BE.rc
index 090d265fb..89462636b 100644
--- a/doc/rc/holidays.fr-BE.rc
+++ b/doc/rc/holidays.fr-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/fr-BE/2015.json
-# http://holidata.net/fr-BE/2016.json
+# https://holidata.net/fr-BE/2020.json
+# https://holidata.net/fr-BE/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.fr-BE1.name=Nouvel An
-holiday.fr-BE1.date=20150101
+holiday.fr-BE1.date=20200101
 holiday.fr-BE2.name=Pâques
-holiday.fr-BE2.date=20150405
+holiday.fr-BE2.date=20200412
 holiday.fr-BE3.name=Lundi de Pâques
-holiday.fr-BE3.date=20150406
+holiday.fr-BE3.date=20200413
 holiday.fr-BE4.name=Fête du Travail
-holiday.fr-BE4.date=20150501
+holiday.fr-BE4.date=20200501
 holiday.fr-BE5.name=Ascension
-holiday.fr-BE5.date=20150514
+holiday.fr-BE5.date=20200521
 holiday.fr-BE6.name=Pentecôte
-holiday.fr-BE6.date=20150524
+holiday.fr-BE6.date=20200531
 holiday.fr-BE7.name=Lundi de Pentecôte
-holiday.fr-BE7.date=20150525
+holiday.fr-BE7.date=20200601
 holiday.fr-BE8.name=Fête nationale
-holiday.fr-BE8.date=20150721
+holiday.fr-BE8.date=20200721
 holiday.fr-BE9.name=Assomption
-holiday.fr-BE9.date=20150815
+holiday.fr-BE9.date=20200815
 holiday.fr-BE10.name=Toussaint
-holiday.fr-BE10.date=20151101
+holiday.fr-BE10.date=20201101
 holiday.fr-BE11.name=Jour de l'armistice
-holiday.fr-BE11.date=20151111
+holiday.fr-BE11.date=20201111
 holiday.fr-BE12.name=Noël
-holiday.fr-BE12.date=20151225
+holiday.fr-BE12.date=20201225
 holiday.fr-BE13.name=Nouvel An
-holiday.fr-BE13.date=20160101
+holiday.fr-BE13.date=20210101
 holiday.fr-BE14.name=Pâques
-holiday.fr-BE14.date=20160527
+holiday.fr-BE14.date=20210404
 holiday.fr-BE15.name=Lundi de Pâques
-holiday.fr-BE15.date=20160528
+holiday.fr-BE15.date=20210405
 holiday.fr-BE16.name=Fête du Travail
-holiday.fr-BE16.date=20160501
+holiday.fr-BE16.date=20210501
 holiday.fr-BE17.name=Ascension
-holiday.fr-BE17.date=20160505
+holiday.fr-BE17.date=20210513
 holiday.fr-BE18.name=Pentecôte
-holiday.fr-BE18.date=20160515
+holiday.fr-BE18.date=20210523
 holiday.fr-BE19.name=Lundi de Pentecôte
-holiday.fr-BE19.date=20160516
+holiday.fr-BE19.date=20210524
 holiday.fr-BE20.name=Fête nationale
-holiday.fr-BE20.date=20160721
+holiday.fr-BE20.date=20210721
 holiday.fr-BE21.name=Assomption
-holiday.fr-BE21.date=20160815
+holiday.fr-BE21.date=20210815
 holiday.fr-BE22.name=Toussaint
-holiday.fr-BE22.date=20161101
+holiday.fr-BE22.date=20211101
 holiday.fr-BE23.name=Jour de l'armistice
-holiday.fr-BE23.date=20161111
+holiday.fr-BE23.date=20211111
 holiday.fr-BE24.name=Noël
-holiday.fr-BE24.date=20161225
+holiday.fr-BE24.date=20211225
diff --git a/doc/rc/holidays.fr-FR.rc b/doc/rc/holidays.fr-FR.rc
index 9b5d961ff..39053f60a 100644
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/fr-FR/2015.json
-# http://holidata.net/fr-FR/2016.json
+# https://holidata.net/fr-FR/2020.json
+# https://holidata.net/fr-FR/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20150101
+holiday.fr-FR1.date=20200101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20150406
+holiday.fr-FR2.date=20200413
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20150501
+holiday.fr-FR3.date=20200501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20150508
+holiday.fr-FR4.date=20200508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20150514
+holiday.fr-FR5.date=20200521
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20150524
-holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20150714
-holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20150815
-holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20151101
-holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20151111
-holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20151225
-holiday.fr-FR12.name=Jour de l'an
-holiday.fr-FR12.date=20160101
-holiday.fr-FR13.name=Lundi de Pâques
-holiday.fr-FR13.date=20160328
-holiday.fr-FR14.name=Fête du premier mai
-holiday.fr-FR14.date=20160501
-holiday.fr-FR15.name=Armistice 1945
-holiday.fr-FR15.date=20160508
-holiday.fr-FR16.name=Ascencion
-holiday.fr-FR16.date=20160505
-holiday.fr-FR17.name=Pentecôte
-holiday.fr-FR17.date=20160515
-holiday.fr-FR18.name=Fête nationale
-holiday.fr-FR18.date=20160714
-holiday.fr-FR19.name=Assomption
-holiday.fr-FR19.date=20160815
-holiday.fr-FR20.name=Toussaint
-holiday.fr-FR20.date=20161101
-holiday.fr-FR21.name=Armistice 1918
-holiday.fr-FR21.date=20161111
-holiday.fr-FR22.name=Noël
-holiday.fr-FR22.date=20161225
+holiday.fr-FR6.date=20200531
+holiday.fr-FR7.name=Lundi de Pentecôte
+holiday.fr-FR7.date=20200601
+holiday.fr-FR8.name=Fête nationale
+holiday.fr-FR8.date=20200714
+holiday.fr-FR9.name=Assomption
+holiday.fr-FR9.date=20200815
+holiday.fr-FR10.name=Toussaint
+holiday.fr-FR10.date=20201101
+holiday.fr-FR11.name=Armistice 1918
+holiday.fr-FR11.date=20201111
+holiday.fr-FR12.name=Noël
+holiday.fr-FR12.date=20201225
+holiday.fr-FR13.name=Jour de l'an
+holiday.fr-FR13.date=20210101
+holiday.fr-FR14.name=Lundi de Pâques
+holiday.fr-FR14.date=20210405
+holiday.fr-FR15.name=Fête du premier mai
+holiday.fr-FR15.date=20210501
+holiday.fr-FR16.name=Armistice 1945
+holiday.fr-FR16.date=20210508
+holiday.fr-FR17.name=Ascencion
+holiday.fr-FR17.date=20210513
+holiday.fr-FR18.name=Pentecôte
+holiday.fr-FR18.date=20210523
+holiday.fr-FR19.name=Lundi de Pentecôte
+holiday.fr-FR19.date=20210524
+holiday.fr-FR20.name=Fête nationale
+holiday.fr-FR20.date=20210714
+holiday.fr-FR21.name=Assomption
+holiday.fr-FR21.date=20210815
+holiday.fr-FR22.name=Toussaint
+holiday.fr-FR22.date=20211101
+holiday.fr-FR23.name=Armistice 1918
+holiday.fr-FR23.date=20211111
+holiday.fr-FR24.name=Noël
+holiday.fr-FR24.date=20211225
diff --git a/doc/rc/holidays.ga-IE.rc b/doc/rc/holidays.ga-IE.rc
deleted file mode 100644
index 3bb328bf9..000000000
--- a/doc/rc/holidays.ga-IE.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/ga-IE/2015.json
-# http://holidata.net/ga-IE/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.ga-IE1.name=Lá Caille or Lá Bliana Nua
-holiday.ga-IE1.date=20150101
-holiday.ga-IE2.name=Lá Fhéile Pádraig
-holiday.ga-IE2.date=20150317
-holiday.ga-IE3.name=Luan Cásca
-holiday.ga-IE3.date=20150406
-holiday.ga-IE4.name=Lá an Lucht Oibre
-holiday.ga-IE4.date=20150504
-holiday.ga-IE5.name=Lá Saoire i mí Mheitheamh
-holiday.ga-IE5.date=20150601
-holiday.ga-IE6.name=Lá Saoire i mí Lúnasa
-holiday.ga-IE6.date=20150803
-holiday.ga-IE7.name=Lá Saoire i mí Dheireadh Fómhair
-holiday.ga-IE7.date=20151026
-holiday.ga-IE8.name=Lá Nollag
-holiday.ga-IE8.date=20151225
-holiday.ga-IE9.name=Lá Fhéile Stiofáin or Lá an Dreoilín
-holiday.ga-IE9.date=20151226
-holiday.ga-IE10.name=Lá Caille or Lá Bliana Nua
-holiday.ga-IE10.date=20160101
-holiday.ga-IE11.name=Lá Fhéile Pádraig
-holiday.ga-IE11.date=20160317
-holiday.ga-IE12.name=Luan Cásca
-holiday.ga-IE12.date=20160328
-holiday.ga-IE13.name=Lá an Lucht Oibre
-holiday.ga-IE13.date=20160502
-holiday.ga-IE14.name=Lá Saoire i mí Mheitheamh
-holiday.ga-IE14.date=20160606
-holiday.ga-IE15.name=Lá Saoire i mí Lúnasa
-holiday.ga-IE15.date=20160801
-holiday.ga-IE16.name=Lá Saoire i mí Dheireadh Fómhair
-holiday.ga-IE16.date=20161031
-holiday.ga-IE17.name=Lá Nollag
-holiday.ga-IE17.date=20161225
-holiday.ga-IE18.name=Lá Fhéile Stiofáin or Lá an Dreoilín
-holiday.ga-IE18.date=20161226
diff --git a/doc/rc/holidays.hr-HR.rc b/doc/rc/holidays.hr-HR.rc
index 9195b7ba6..cd2158325 100644
--- a/doc/rc/holidays.hr-HR.rc
+++ b/doc/rc/holidays.hr-HR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/hr-HR/2015.json
-# http://holidata.net/hr-HR/2016.json
+# https://holidata.net/hr-HR/2020.json
+# https://holidata.net/hr-HR/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,62 @@
 ###############################################################################
 
 holiday.hr-HR1.name=Nova Godina
-holiday.hr-HR1.date=20150101
+holiday.hr-HR1.date=20200101
 holiday.hr-HR2.name=Bogojavljenje
-holiday.hr-HR2.date=20150106
+holiday.hr-HR2.date=20200106
 holiday.hr-HR3.name=Uskrs
-holiday.hr-HR3.date=20150405
+holiday.hr-HR3.date=20200412
 holiday.hr-HR4.name=Uskrsni ponedjeljak
-holiday.hr-HR4.date=20150406
-holiday.hr-HR5.name=Međunarodni praznik rada
-holiday.hr-HR5.date=20150501
+holiday.hr-HR4.date=20200413
+holiday.hr-HR5.name=Praznik rada
+holiday.hr-HR5.date=20200501
 holiday.hr-HR6.name=Tijelovo
-holiday.hr-HR6.date=20150604
+holiday.hr-HR6.date=20200611
 holiday.hr-HR7.name=Dan antifašističke borbe
-holiday.hr-HR7.date=20150622
+holiday.hr-HR7.date=20200622
 holiday.hr-HR8.name=Dan državnosti
-holiday.hr-HR8.date=20150625
-holiday.hr-HR9.name=Dan pobjede
-holiday.hr-HR9.date=20150805
+holiday.hr-HR8.date=20200625
+holiday.hr-HR9.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
+holiday.hr-HR9.date=20200805
 holiday.hr-HR10.name=Velika Gospa
-holiday.hr-HR10.date=20150815
+holiday.hr-HR10.date=20200815
 holiday.hr-HR11.name=Dan neovisnosti
-holiday.hr-HR11.date=20151008
-holiday.hr-HR12.name=Dan svih svetih
-holiday.hr-HR12.date=20151101
-holiday.hr-HR13.name=Božić
-holiday.hr-HR13.date=20151225
-holiday.hr-HR14.name=Prvi dan po Božiću
-holiday.hr-HR14.date=20151226
-holiday.hr-HR15.name=Nova Godina
-holiday.hr-HR15.date=20160101
-holiday.hr-HR16.name=Bogojavljenje
-holiday.hr-HR16.date=20160106
-holiday.hr-HR17.name=Uskrs
-holiday.hr-HR17.date=20160327
-holiday.hr-HR18.name=Uskrsni ponedjeljak
-holiday.hr-HR18.date=20160328
-holiday.hr-HR19.name=Međunarodni praznik rada
-holiday.hr-HR19.date=20160501
-holiday.hr-HR20.name=Tijelovo
-holiday.hr-HR20.date=20160526
-holiday.hr-HR21.name=Dan antifašističke borbe
-holiday.hr-HR21.date=20160622
-holiday.hr-HR22.name=Dan državnosti
-holiday.hr-HR22.date=20160625
-holiday.hr-HR23.name=Dan pobjede
-holiday.hr-HR23.date=20160805
-holiday.hr-HR24.name=Velika Gospa
-holiday.hr-HR24.date=20160815
-holiday.hr-HR25.name=Dan neovisnosti
-holiday.hr-HR25.date=20161008
-holiday.hr-HR26.name=Dan svih svetih
-holiday.hr-HR26.date=20161101
-holiday.hr-HR27.name=Božić
-holiday.hr-HR27.date=20161225
-holiday.hr-HR28.name=Prvi dan po Božiću
-holiday.hr-HR28.date=20161226
+holiday.hr-HR11.date=20201008
+holiday.hr-HR12.name=Svi sveti
+holiday.hr-HR12.date=20201101
+holiday.hr-HR13.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
+holiday.hr-HR13.date=20201118
+holiday.hr-HR14.name=Božić
+holiday.hr-HR14.date=20201225
+holiday.hr-HR15.name=Sveti Stjepan
+holiday.hr-HR15.date=20201226
+holiday.hr-HR16.name=Nova Godina
+holiday.hr-HR16.date=20210101
+holiday.hr-HR17.name=Bogojavljenje
+holiday.hr-HR17.date=20210106
+holiday.hr-HR18.name=Uskrs
+holiday.hr-HR18.date=20210404
+holiday.hr-HR19.name=Uskrsni ponedjeljak
+holiday.hr-HR19.date=20210405
+holiday.hr-HR20.name=Praznik rada
+holiday.hr-HR20.date=20210501
+holiday.hr-HR21.name=Tijelovo
+holiday.hr-HR21.date=20210603
+holiday.hr-HR22.name=Dan antifašističke borbe
+holiday.hr-HR22.date=20210622
+holiday.hr-HR23.name=Dan državnosti
+holiday.hr-HR23.date=20210625
+holiday.hr-HR24.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
+holiday.hr-HR24.date=20210805
+holiday.hr-HR25.name=Velika Gospa
+holiday.hr-HR25.date=20210815
+holiday.hr-HR26.name=Dan neovisnosti
+holiday.hr-HR26.date=20211008
+holiday.hr-HR27.name=Svi sveti
+holiday.hr-HR27.date=20211101
+holiday.hr-HR28.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
+holiday.hr-HR28.date=20211118
+holiday.hr-HR29.name=Božić
+holiday.hr-HR29.date=20211225
+holiday.hr-HR30.name=Sveti Stjepan
+holiday.hr-HR30.date=20211226
diff --git a/doc/rc/holidays.is-IS.rc b/doc/rc/holidays.is-IS.rc
index a7369826f..a1a94ddb9 100644
--- a/doc/rc/holidays.is-IS.rc
+++ b/doc/rc/holidays.is-IS.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/is-IS/2015.json
-# http://holidata.net/is-IS/2016.json
+# https://holidata.net/is-IS/2020.json
+# https://holidata.net/is-IS/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,62 +28,66 @@
 ###############################################################################
 
 holiday.is-IS1.name=Nýársdagur
-holiday.is-IS1.date=20150101
+holiday.is-IS1.date=20200101
 holiday.is-IS2.name=Skírdagur
-holiday.is-IS2.date=20150402
-holiday.is-IS3.name=Föstudaginn langi
-holiday.is-IS3.date=20150403
+holiday.is-IS2.date=20200409
+holiday.is-IS3.name=Föstudagurinn langi
+holiday.is-IS3.date=20200410
 holiday.is-IS4.name=Páskadagur
-holiday.is-IS4.date=20150405
-holiday.is-IS5.name=Annar í páskum
-holiday.is-IS5.date=20150406
+holiday.is-IS4.date=20200412
+holiday.is-IS5.name=Annar dagur páska
+holiday.is-IS5.date=20200413
 holiday.is-IS6.name=Sumardagurinn fyrsti
-holiday.is-IS6.date=20150423
+holiday.is-IS6.date=20200423
 holiday.is-IS7.name=Verkalýðsdagurinn
-holiday.is-IS7.date=20150501
+holiday.is-IS7.date=20200501
 holiday.is-IS8.name=Uppstigningardagur
-holiday.is-IS8.date=20150514
-holiday.is-IS9.name=Annar í hvítasunnu
-holiday.is-IS9.date=20150525
-holiday.is-IS10.name=Lýðveldisdagurinn
-holiday.is-IS10.date=20150617
-holiday.is-IS11.name=Frídagur verslunarmanna
-holiday.is-IS11.date=20150803
-holiday.is-IS12.name=Jól
-holiday.is-IS12.date=20151224
-holiday.is-IS13.name=Jól
-holiday.is-IS13.date=20151225
-holiday.is-IS14.name=Jól
-holiday.is-IS14.date=20151226
-holiday.is-IS15.name=Gamlárskvöld
-holiday.is-IS15.date=20151231
-holiday.is-IS16.name=Nýársdagur
-holiday.is-IS16.date=20160101
-holiday.is-IS17.name=Skírdagur
-holiday.is-IS17.date=20160324
-holiday.is-IS18.name=Föstudaginn langi
-holiday.is-IS18.date=20160325
-holiday.is-IS19.name=Páskadagur
-holiday.is-IS19.date=20160327
-holiday.is-IS20.name=Annar í páskum
-holiday.is-IS20.date=20160328
-holiday.is-IS21.name=Sumardagurinn fyrsti
-holiday.is-IS21.date=20160421
-holiday.is-IS22.name=Verkalýðsdagurinn
-holiday.is-IS22.date=20160501
-holiday.is-IS23.name=Uppstigningardagur
-holiday.is-IS23.date=20160505
-holiday.is-IS24.name=Annar í hvítasunnu
-holiday.is-IS24.date=20160516
-holiday.is-IS25.name=Lýðveldisdagurinn
-holiday.is-IS25.date=20160617
-holiday.is-IS26.name=Frídagur verslunarmanna
-holiday.is-IS26.date=20160801
-holiday.is-IS27.name=Jól
-holiday.is-IS27.date=20161224
-holiday.is-IS28.name=Jól
-holiday.is-IS28.date=20161225
-holiday.is-IS29.name=Jól
-holiday.is-IS29.date=20161226
-holiday.is-IS30.name=Gamlárskvöld
-holiday.is-IS30.date=20161231
+holiday.is-IS8.date=20200521
+holiday.is-IS9.name=Hvítasunnudagur
+holiday.is-IS9.date=20200531
+holiday.is-IS10.name=Annar dagur hvítasunnu
+holiday.is-IS10.date=20200601
+holiday.is-IS11.name=Þjóðhátíðardagurinn
+holiday.is-IS11.date=20200617
+holiday.is-IS12.name=Frídagur verslunarmanna
+holiday.is-IS12.date=20200803
+holiday.is-IS13.name=Aðfangadagur jóla
+holiday.is-IS13.date=20201224
+holiday.is-IS14.name=Jóladagur
+holiday.is-IS14.date=20201225
+holiday.is-IS15.name=Annar dagur jóla
+holiday.is-IS15.date=20201226
+holiday.is-IS16.name=Gamlársdagur
+holiday.is-IS16.date=20201231
+holiday.is-IS17.name=Nýársdagur
+holiday.is-IS17.date=20210101
+holiday.is-IS18.name=Skírdagur
+holiday.is-IS18.date=20210401
+holiday.is-IS19.name=Föstudagurinn langi
+holiday.is-IS19.date=20210402
+holiday.is-IS20.name=Páskadagur
+holiday.is-IS20.date=20210404
+holiday.is-IS21.name=Annar dagur páska
+holiday.is-IS21.date=20210405
+holiday.is-IS22.name=Sumardagurinn fyrsti
+holiday.is-IS22.date=20210422
+holiday.is-IS23.name=Verkalýðsdagurinn
+holiday.is-IS23.date=20210501
+holiday.is-IS24.name=Uppstigningardagur
+holiday.is-IS24.date=20210513
+holiday.is-IS25.name=Hvítasunnudagur
+holiday.is-IS25.date=20210523
+holiday.is-IS26.name=Annar dagur hvítasunnu
+holiday.is-IS26.date=20210524
+holiday.is-IS27.name=Þjóðhátíðardagurinn
+holiday.is-IS27.date=20210617
+holiday.is-IS28.name=Frídagur verslunarmanna
+holiday.is-IS28.date=20210802
+holiday.is-IS29.name=Aðfangadagur jóla
+holiday.is-IS29.date=20211224
+holiday.is-IS30.name=Jóladagur
+holiday.is-IS30.date=20211225
+holiday.is-IS31.name=Annar dagur jóla
+holiday.is-IS31.date=20211226
+holiday.is-IS32.name=Gamlársdagur
+holiday.is-IS32.date=20211231
diff --git a/doc/rc/holidays.it-IT.rc b/doc/rc/holidays.it-IT.rc
index 750369257..3e9123004 100644
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/it-IT/2015.json
-# http://holidata.net/it-IT/2016.json
+# https://holidata.net/it-IT/2020.json
+# https://holidata.net/it-IT/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20150101
+holiday.it-IT1.date=20200101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20150106
-holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20150217
-holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20150405
+holiday.it-IT2.date=20200106
+holiday.it-IT3.name=Pasqua
+holiday.it-IT3.date=20200412
+holiday.it-IT4.name=Pasquetta
+holiday.it-IT4.date=20200413
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20150425
+holiday.it-IT5.date=20200425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20150501
+holiday.it-IT6.date=20200501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20150602
+holiday.it-IT7.date=20200602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20150815
+holiday.it-IT8.date=20200815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20151101
+holiday.it-IT9.date=20201101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20151208
+holiday.it-IT10.date=20201208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20151225
+holiday.it-IT11.date=20201225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20151226
+holiday.it-IT12.date=20201226
 holiday.it-IT13.name=Capodanno
-holiday.it-IT13.date=20160101
+holiday.it-IT13.date=20210101
 holiday.it-IT14.name=Epifania
-holiday.it-IT14.date=20160106
-holiday.it-IT15.name=Carnevale
-holiday.it-IT15.date=20160209
-holiday.it-IT16.name=Pasqua
-holiday.it-IT16.date=20160327
+holiday.it-IT14.date=20210106
+holiday.it-IT15.name=Pasqua
+holiday.it-IT15.date=20210404
+holiday.it-IT16.name=Pasquetta
+holiday.it-IT16.date=20210405
 holiday.it-IT17.name=Festa della liberazione
-holiday.it-IT17.date=20160425
+holiday.it-IT17.date=20210425
 holiday.it-IT18.name=Festa del lavoro
-holiday.it-IT18.date=20160501
+holiday.it-IT18.date=20210501
 holiday.it-IT19.name=Festa della repubblica
-holiday.it-IT19.date=20160602
+holiday.it-IT19.date=20210602
 holiday.it-IT20.name=Assunzione (ferragosto)
-holiday.it-IT20.date=20160815
+holiday.it-IT20.date=20210815
 holiday.it-IT21.name=Ognissanti
-holiday.it-IT21.date=20161101
+holiday.it-IT21.date=20211101
 holiday.it-IT22.name=Immacolata concezione
-holiday.it-IT22.date=20161208
+holiday.it-IT22.date=20211208
 holiday.it-IT23.name=Natale
-holiday.it-IT23.date=20161225
+holiday.it-IT23.date=20211225
 holiday.it-IT24.name=S.to Stefano
-holiday.it-IT24.date=20161226
+holiday.it-IT24.date=20211226
diff --git a/doc/rc/holidays.jp-JP.rc b/doc/rc/holidays.jp-JP.rc
deleted file mode 100644
index 0857be5d2..000000000
--- a/doc/rc/holidays.jp-JP.rc
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/jp-JP/2015.json
-# http://holidata.net/jp-JP/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.jp-JP1.name=元日
-holiday.jp-JP1.date=20150101
-holiday.jp-JP2.name=成人の日
-holiday.jp-JP2.date=20150112
-holiday.jp-JP3.name=建国記念の日
-holiday.jp-JP3.date=20150211
-holiday.jp-JP4.name=春分の日
-holiday.jp-JP4.date=20150321
-holiday.jp-JP5.name=昭和の日
-holiday.jp-JP5.date=20150429
-holiday.jp-JP6.name=憲法記念日
-holiday.jp-JP6.date=20150503
-holiday.jp-JP7.name=みどりの日
-holiday.jp-JP7.date=20150504
-holiday.jp-JP8.name=こどもの日
-holiday.jp-JP8.date=20150505
-holiday.jp-JP9.name=振替休日
-holiday.jp-JP9.date=20150506
-holiday.jp-JP10.name=海の日
-holiday.jp-JP10.date=20150720
-holiday.jp-JP11.name=敬老の日
-holiday.jp-JP11.date=20150921
-holiday.jp-JP12.name=秋分の日
-holiday.jp-JP12.date=20150923
-holiday.jp-JP13.name=体育の日
-holiday.jp-JP13.date=20151012
-holiday.jp-JP14.name=文化の日
-holiday.jp-JP14.date=20151103
-holiday.jp-JP15.name=勤労感謝の日
-holiday.jp-JP15.date=20151123
-holiday.jp-JP16.name=天皇誕生日
-holiday.jp-JP16.date=20151223
-holiday.jp-JP17.name=元日
-holiday.jp-JP17.date=20160101
-holiday.jp-JP18.name=成人の日
-holiday.jp-JP18.date=20160111
-holiday.jp-JP19.name=建国記念の日
-holiday.jp-JP19.date=20160211
-holiday.jp-JP20.name=春分の日
-holiday.jp-JP20.date=20160321
-holiday.jp-JP21.name=昭和の日
-holiday.jp-JP21.date=20160429
-holiday.jp-JP22.name=憲法記念日
-holiday.jp-JP22.date=20160503
-holiday.jp-JP23.name=みどりの日
-holiday.jp-JP23.date=20160504
-holiday.jp-JP24.name=こどもの日
-holiday.jp-JP24.date=20160505
-holiday.jp-JP25.name=海の日
-holiday.jp-JP25.date=20160718
-holiday.jp-JP26.name=敬老の日
-holiday.jp-JP26.date=20160919
-holiday.jp-JP27.name=秋分の日
-holiday.jp-JP27.date=20160922
-holiday.jp-JP28.name=体育の日
-holiday.jp-JP28.date=20161010
-holiday.jp-JP29.name=文化の日
-holiday.jp-JP29.date=20161103
-holiday.jp-JP30.name=勤労感謝の日
-holiday.jp-JP30.date=20161123
-holiday.jp-JP31.name=天皇誕生日
-holiday.jp-JP31.date=20161223
diff --git a/doc/rc/holidays.lt-LT.rc b/doc/rc/holidays.lt-LT.rc
deleted file mode 100644
index dee3e33b1..000000000
--- a/doc/rc/holidays.lt-LT.rc
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/lt-LT/2015.json
-# http://holidata.net/lt-LT/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.lt-LT1.name=Naujieji metai
-holiday.lt-LT1.date=20150101
-holiday.lt-LT2.name=Lietuvos valstybės atkūrimo diena
-holiday.lt-LT2.date=20150216
-holiday.lt-LT3.name=Lietuvos nepriklausomybės atkūrimo diena
-holiday.lt-LT3.date=20150311
-holiday.lt-LT4.name=Velykos
-holiday.lt-LT4.date=20150405
-holiday.lt-LT5.name=Velykos
-holiday.lt-LT5.date=20150406
-holiday.lt-LT6.name=Tarptautinė darbo diena
-holiday.lt-LT6.date=20150501
-holiday.lt-LT7.name=Joninės, Rasos
-holiday.lt-LT7.date=20150624
-holiday.lt-LT8.name=Valstybės diena
-holiday.lt-LT8.date=20150706
-holiday.lt-LT9.name=Žolinė
-holiday.lt-LT9.date=20150815
-holiday.lt-LT10.name=Visų šventųjų diena
-holiday.lt-LT10.date=20151101
-holiday.lt-LT11.name=Šv. Kalėdos
-holiday.lt-LT11.date=20151224
-holiday.lt-LT12.name=Šv. Kalėdos
-holiday.lt-LT12.date=20151225
-holiday.lt-LT13.name=Šv. Kalėdos
-holiday.lt-LT13.date=20151226
-holiday.lt-LT14.name=Naujieji metai
-holiday.lt-LT14.date=20160101
-holiday.lt-LT15.name=Lietuvos valstybės atkūrimo diena
-holiday.lt-LT15.date=20160216
-holiday.lt-LT16.name=Lietuvos nepriklausomybės atkūrimo diena
-holiday.lt-LT16.date=20160311
-holiday.lt-LT17.name=Velykos
-holiday.lt-LT17.date=20160327
-holiday.lt-LT18.name=Velykos
-holiday.lt-LT18.date=20160328
-holiday.lt-LT19.name=Tarptautinė darbo diena
-holiday.lt-LT19.date=20160501
-holiday.lt-LT20.name=Joninės, Rasos
-holiday.lt-LT20.date=20160624
-holiday.lt-LT21.name=Valstybės diena
-holiday.lt-LT21.date=20160706
-holiday.lt-LT22.name=Žolinė
-holiday.lt-LT22.date=20160815
-holiday.lt-LT23.name=Visų šventųjų diena
-holiday.lt-LT23.date=20161101
-holiday.lt-LT24.name=Šv. Kalėdos
-holiday.lt-LT24.date=20161224
-holiday.lt-LT25.name=Šv. Kalėdos
-holiday.lt-LT25.date=20161225
-holiday.lt-LT26.name=Šv. Kalėdos
-holiday.lt-LT26.date=20161226
diff --git a/doc/rc/holidays.lv-LV.rc b/doc/rc/holidays.lv-LV.rc
deleted file mode 100644
index b8968ae04..000000000
--- a/doc/rc/holidays.lv-LV.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/lv-LV/2015.json
-# http://holidata.net/lv-LV/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.lv-LV1.name=Jaunais Gads
-holiday.lv-LV1.date=20150101
-holiday.lv-LV2.name=Lielā Piektdiena
-holiday.lv-LV2.date=20150403
-holiday.lv-LV3.name=Lieldienas
-holiday.lv-LV3.date=20150405
-holiday.lv-LV4.name=2. Lieldienas
-holiday.lv-LV4.date=20150406
-holiday.lv-LV5.name=Darba svētki
-holiday.lv-LV5.date=20150501
-holiday.lv-LV6.name=Latvijas Republikas Neatkarības atjaunošanas dienu
-holiday.lv-LV6.date=20150505
-holiday.lv-LV7.name=Jāņi
-holiday.lv-LV7.date=20150624
-holiday.lv-LV8.name=Latvijas Republikas proklamēšanas diena
-holiday.lv-LV8.date=20151118
-holiday.lv-LV9.name=Ziemassvētku vakars
-holiday.lv-LV9.date=20151224
-holiday.lv-LV10.name=Ziemassvētki
-holiday.lv-LV10.date=20151225
-holiday.lv-LV11.name=2. Ziemassvētki
-holiday.lv-LV11.date=20151226
-holiday.lv-LV12.name=Vecgada vakars
-holiday.lv-LV12.date=20151231
-holiday.lv-LV13.name=Jaunais Gads
-holiday.lv-LV13.date=20160101
-holiday.lv-LV14.name=Lielā Piektdiena
-holiday.lv-LV14.date=20160325
-holiday.lv-LV15.name=Lieldienas
-holiday.lv-LV15.date=20160327
-holiday.lv-LV16.name=2. Lieldienas
-holiday.lv-LV16.date=20160327
-holiday.lv-LV17.name=Darba svētki
-holiday.lv-LV17.date=20160501
-holiday.lv-LV18.name=Latvijas Republikas Neatkarības atjaunošanas dienu
-holiday.lv-LV18.date=20160505
-holiday.lv-LV19.name=Jāņi
-holiday.lv-LV19.date=20160624
-holiday.lv-LV20.name=Latvijas Republikas proklamēšanas diena
-holiday.lv-LV20.date=20161118
-holiday.lv-LV21.name=Ziemassvētku vakars
-holiday.lv-LV21.date=20161224
-holiday.lv-LV22.name=Ziemassvētki
-holiday.lv-LV22.date=20161225
-holiday.lv-LV23.name=2. Ziemassvētki
-holiday.lv-LV23.date=20161226
-holiday.lv-LV24.name=Vecgada vakars
-holiday.lv-LV24.date=20161231
diff --git a/doc/rc/holidays.nb-NO.rc b/doc/rc/holidays.nb-NO.rc
index 5b38b4bfa..ad07b00eb 100644
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nb-NO/2015.json
-# http://holidata.net/nb-NO/2016.json
+# https://holidata.net/nb-NO/2020.json
+# https://holidata.net/nb-NO/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20150101
+holiday.nb-NO1.date=20200101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20150215
+holiday.nb-NO2.date=20200223
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20150329
+holiday.nb-NO3.date=20200405
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20150402
+holiday.nb-NO4.date=20200409
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20150403
+holiday.nb-NO5.date=20200410
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20150405
+holiday.nb-NO6.date=20200412
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20150406
+holiday.nb-NO7.date=20200413
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20150501
+holiday.nb-NO8.date=20200501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20150508
+holiday.nb-NO9.date=20200508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20150517
+holiday.nb-NO10.date=20200517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20150514
+holiday.nb-NO11.date=20200521
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20150524
+holiday.nb-NO12.date=20200531
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20150525
+holiday.nb-NO13.date=20200601
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20151224
+holiday.nb-NO14.date=20201224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20151225
+holiday.nb-NO15.date=20201225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20151226
+holiday.nb-NO16.date=20201226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20151231
+holiday.nb-NO17.date=20201231
 holiday.nb-NO18.name=Nyttårsdag
-holiday.nb-NO18.date=20160101
+holiday.nb-NO18.date=20210101
 holiday.nb-NO19.name=Fastelavn
-holiday.nb-NO19.date=20160207
+holiday.nb-NO19.date=20210214
 holiday.nb-NO20.name=Palmesøndag
-holiday.nb-NO20.date=20160320
+holiday.nb-NO20.date=20210328
 holiday.nb-NO21.name=Skjærtorsdag
-holiday.nb-NO21.date=20160324
+holiday.nb-NO21.date=20210401
 holiday.nb-NO22.name=Langfredag
-holiday.nb-NO22.date=20160325
+holiday.nb-NO22.date=20210402
 holiday.nb-NO23.name=Påskedag
-holiday.nb-NO23.date=20160327
+holiday.nb-NO23.date=20210404
 holiday.nb-NO24.name=Påskedag
-holiday.nb-NO24.date=20160328
+holiday.nb-NO24.date=20210405
 holiday.nb-NO25.name=Offentlig Høytidsdag
-holiday.nb-NO25.date=20160501
+holiday.nb-NO25.date=20210501
 holiday.nb-NO26.name=Frigjøringsdag 1945
-holiday.nb-NO26.date=20160508
-holiday.nb-NO27.name=Grunnlovsdag
-holiday.nb-NO27.date=20160517
-holiday.nb-NO28.name=Kristi Himmelfartsdag
-holiday.nb-NO28.date=20160505
+holiday.nb-NO26.date=20210508
+holiday.nb-NO27.name=Kristi Himmelfartsdag
+holiday.nb-NO27.date=20210513
+holiday.nb-NO28.name=Grunnlovsdag
+holiday.nb-NO28.date=20210517
 holiday.nb-NO29.name=Pinsedag
-holiday.nb-NO29.date=20160515
+holiday.nb-NO29.date=20210523
 holiday.nb-NO30.name=Pinsedag
-holiday.nb-NO30.date=20160516
+holiday.nb-NO30.date=20210524
 holiday.nb-NO31.name=Julaften
-holiday.nb-NO31.date=20161224
+holiday.nb-NO31.date=20211224
 holiday.nb-NO32.name=Juledag
-holiday.nb-NO32.date=20161225
+holiday.nb-NO32.date=20211225
 holiday.nb-NO33.name=Juledag
-holiday.nb-NO33.date=20161226
+holiday.nb-NO33.date=20211226
 holiday.nb-NO34.name=Nyttårsaften
-holiday.nb-NO34.date=20161231
+holiday.nb-NO34.date=20211231
diff --git a/doc/rc/holidays.nb-SJ.rc b/doc/rc/holidays.nb-SJ.rc
deleted file mode 100644
index cf0a63d39..000000000
--- a/doc/rc/holidays.nb-SJ.rc
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/nb-SJ/2015.json
-# http://holidata.net/nb-SJ/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.nb-SJ1.name=Nyttårsdag
-holiday.nb-SJ1.date=20150101
-holiday.nb-SJ2.name=Fastelavn
-holiday.nb-SJ2.date=20150215
-holiday.nb-SJ3.name=Palmesøndag
-holiday.nb-SJ3.date=20150329
-holiday.nb-SJ4.name=Skjærtorsdag
-holiday.nb-SJ4.date=20150402
-holiday.nb-SJ5.name=Langfredag
-holiday.nb-SJ5.date=20150403
-holiday.nb-SJ6.name=Påskedag
-holiday.nb-SJ6.date=20150405
-holiday.nb-SJ7.name=Påskedag
-holiday.nb-SJ7.date=20150406
-holiday.nb-SJ8.name=Offentlig Høytidsdag
-holiday.nb-SJ8.date=20150501
-holiday.nb-SJ9.name=Frigjøringsdag 1945
-holiday.nb-SJ9.date=20150508
-holiday.nb-SJ10.name=Grunnlovsdag
-holiday.nb-SJ10.date=20150517
-holiday.nb-SJ11.name=Kristi Himmelfartsdag
-holiday.nb-SJ11.date=20150514
-holiday.nb-SJ12.name=Pinsedag
-holiday.nb-SJ12.date=20150524
-holiday.nb-SJ13.name=Pinsedag
-holiday.nb-SJ13.date=20150525
-holiday.nb-SJ14.name=Julaften
-holiday.nb-SJ14.date=20151224
-holiday.nb-SJ15.name=Juledag
-holiday.nb-SJ15.date=20151225
-holiday.nb-SJ16.name=Juledag
-holiday.nb-SJ16.date=20151226
-holiday.nb-SJ17.name=Nyttårsaften
-holiday.nb-SJ17.date=20151231
-holiday.nb-SJ18.name=Nyttårsdag
-holiday.nb-SJ18.date=20160101
-holiday.nb-SJ19.name=Fastelavn
-holiday.nb-SJ19.date=20160207
-holiday.nb-SJ20.name=Palmesøndag
-holiday.nb-SJ20.date=20160320
-holiday.nb-SJ21.name=Skjærtorsdag
-holiday.nb-SJ21.date=20160324
-holiday.nb-SJ22.name=Langfredag
-holiday.nb-SJ22.date=20160325
-holiday.nb-SJ23.name=Påskedag
-holiday.nb-SJ23.date=20160327
-holiday.nb-SJ24.name=Påskedag
-holiday.nb-SJ24.date=20160328
-holiday.nb-SJ25.name=Offentlig Høytidsdag
-holiday.nb-SJ25.date=20160501
-holiday.nb-SJ26.name=Frigjøringsdag 1945
-holiday.nb-SJ26.date=20160508
-holiday.nb-SJ27.name=Grunnlovsdag
-holiday.nb-SJ27.date=20160517
-holiday.nb-SJ28.name=Kristi Himmelfartsdag
-holiday.nb-SJ28.date=20160505
-holiday.nb-SJ29.name=Pinsedag
-holiday.nb-SJ29.date=20160515
-holiday.nb-SJ30.name=Pinsedag
-holiday.nb-SJ30.date=20160516
-holiday.nb-SJ31.name=Julaften
-holiday.nb-SJ31.date=20161224
-holiday.nb-SJ32.name=Juledag
-holiday.nb-SJ32.date=20161225
-holiday.nb-SJ33.name=Juledag
-holiday.nb-SJ33.date=20161226
-holiday.nb-SJ34.name=Nyttårsaften
-holiday.nb-SJ34.date=20161231
diff --git a/doc/rc/holidays.nl-BE.rc b/doc/rc/holidays.nl-BE.rc
index 795d4eaec..a96e086f1 100644
--- a/doc/rc/holidays.nl-BE.rc
+++ b/doc/rc/holidays.nl-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nl-BE/2015.json
-# http://holidata.net/nl-BE/2016.json
+# https://holidata.net/nl-BE/2020.json
+# https://holidata.net/nl-BE/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,50 @@
 ###############################################################################
 
 holiday.nl-BE1.name=Nieuwjaar
-holiday.nl-BE1.date=20150101
+holiday.nl-BE1.date=20200101
 holiday.nl-BE2.name=Pasen
-holiday.nl-BE2.date=20150405
+holiday.nl-BE2.date=20200412
 holiday.nl-BE3.name=Paasmaandag
-holiday.nl-BE3.date=20150406
+holiday.nl-BE3.date=20200413
 holiday.nl-BE4.name=Dag van de arbeid
-holiday.nl-BE4.date=20150501
+holiday.nl-BE4.date=20200501
 holiday.nl-BE5.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE5.date=20150514
+holiday.nl-BE5.date=20200521
 holiday.nl-BE6.name=Pinksteren
-holiday.nl-BE6.date=20150524
+holiday.nl-BE6.date=20200531
 holiday.nl-BE7.name=Pinkstermaandag
-holiday.nl-BE7.date=20150525
+holiday.nl-BE7.date=20200601
 holiday.nl-BE8.name=Nationale feestdag
-holiday.nl-BE8.date=20150721
+holiday.nl-BE8.date=20200721
 holiday.nl-BE9.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE9.date=20150815
+holiday.nl-BE9.date=20200815
 holiday.nl-BE10.name=Allerheiligen
-holiday.nl-BE10.date=20151101
+holiday.nl-BE10.date=20201101
 holiday.nl-BE11.name=Wapenstilstand
-holiday.nl-BE11.date=20151111
+holiday.nl-BE11.date=20201111
 holiday.nl-BE12.name=Kerstmis
-holiday.nl-BE12.date=20151225
+holiday.nl-BE12.date=20201225
 holiday.nl-BE13.name=Nieuwjaar
-holiday.nl-BE13.date=20160101
+holiday.nl-BE13.date=20210101
 holiday.nl-BE14.name=Pasen
-holiday.nl-BE14.date=20160327
+holiday.nl-BE14.date=20210404
 holiday.nl-BE15.name=Paasmaandag
-holiday.nl-BE15.date=20160328
+holiday.nl-BE15.date=20210405
 holiday.nl-BE16.name=Dag van de arbeid
-holiday.nl-BE16.date=20160501
+holiday.nl-BE16.date=20210501
 holiday.nl-BE17.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE17.date=20160505
+holiday.nl-BE17.date=20210513
 holiday.nl-BE18.name=Pinksteren
-holiday.nl-BE18.date=20160515
+holiday.nl-BE18.date=20210523
 holiday.nl-BE19.name=Pinkstermaandag
-holiday.nl-BE19.date=20160516
+holiday.nl-BE19.date=20210524
 holiday.nl-BE20.name=Nationale feestdag
-holiday.nl-BE20.date=20160721
+holiday.nl-BE20.date=20210721
 holiday.nl-BE21.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE21.date=20160815
+holiday.nl-BE21.date=20210815
 holiday.nl-BE22.name=Allerheiligen
-holiday.nl-BE22.date=20161101
+holiday.nl-BE22.date=20211101
 holiday.nl-BE23.name=Wapenstilstand
-holiday.nl-BE23.date=20161111
+holiday.nl-BE23.date=20211111
 holiday.nl-BE24.name=Kerstmis
-holiday.nl-BE24.date=20161225
+holiday.nl-BE24.date=20211225
diff --git a/doc/rc/holidays.nl-NL.rc b/doc/rc/holidays.nl-NL.rc
index 232f6ee37..8c324df79 100644
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nl-NL/2015.json
-# http://holidata.net/nl-NL/2016.json
+# https://holidata.net/nl-NL/2020.json
+# https://holidata.net/nl-NL/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,55 +27,59 @@
 #
 ###############################################################################
 
-holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20150101
+holiday.nl-NL1.name=Nieuwjaarsdag
+holiday.nl-NL1.date=20200101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20150403
-holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20150405
-holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20150406
-holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20150427
+holiday.nl-NL2.date=20200410
+holiday.nl-NL3.name=Eerste Paasdag
+holiday.nl-NL3.date=20200412
+holiday.nl-NL4.name=Tweede Paasdag
+holiday.nl-NL4.date=20200413
+holiday.nl-NL5.name=Koningsdag
+holiday.nl-NL5.date=20200427
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20150504
+holiday.nl-NL6.date=20200504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20150505
+holiday.nl-NL7.date=20200505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20150514
-holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20150524
+holiday.nl-NL8.date=20200521
+holiday.nl-NL9.name=Eerste Pinksterdag
+holiday.nl-NL9.date=20200531
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20150525
+holiday.nl-NL10.date=20200601
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20151205
-holiday.nl-NL12.name=Kerstmis
-holiday.nl-NL12.date=20151225
-holiday.nl-NL13.name=Tweede Kerstdag
-holiday.nl-NL13.date=20151226
-holiday.nl-NL14.name=Nieuwjaar
-holiday.nl-NL14.date=20160101
-holiday.nl-NL15.name=Goede Vrijdag
-holiday.nl-NL15.date=20160325
-holiday.nl-NL16.name=Pasen
-holiday.nl-NL16.date=20160327
-holiday.nl-NL17.name=Tweede Pasdag
-holiday.nl-NL17.date=20160328
-holiday.nl-NL18.name=Koninginnedag
-holiday.nl-NL18.date=20160427
-holiday.nl-NL19.name=Dodenherdenking
-holiday.nl-NL19.date=20160504
-holiday.nl-NL20.name=Bevrijdingsdag
-holiday.nl-NL20.date=20160505
-holiday.nl-NL21.name=Hemelvaartsdag
-holiday.nl-NL21.date=20160505
-holiday.nl-NL22.name=Pinksteren
-holiday.nl-NL22.date=20160515
-holiday.nl-NL23.name=Tweede Pinksterdag
-holiday.nl-NL23.date=20160516
-holiday.nl-NL24.name=Sinterklaas
-holiday.nl-NL24.date=20161205
-holiday.nl-NL25.name=Kerstmis
-holiday.nl-NL25.date=20161225
-holiday.nl-NL26.name=Tweede Kerstdag
-holiday.nl-NL26.date=20161226
+holiday.nl-NL11.date=20201205
+holiday.nl-NL12.name=Koninkrijksdag
+holiday.nl-NL12.date=20201215
+holiday.nl-NL13.name=Eerste Kerstdag
+holiday.nl-NL13.date=20201225
+holiday.nl-NL14.name=Tweede Kerstdag
+holiday.nl-NL14.date=20201226
+holiday.nl-NL15.name=Nieuwjaarsdag
+holiday.nl-NL15.date=20210101
+holiday.nl-NL16.name=Goede Vrijdag
+holiday.nl-NL16.date=20210402
+holiday.nl-NL17.name=Eerste Paasdag
+holiday.nl-NL17.date=20210404
+holiday.nl-NL18.name=Tweede Paasdag
+holiday.nl-NL18.date=20210405
+holiday.nl-NL19.name=Koningsdag
+holiday.nl-NL19.date=20210427
+holiday.nl-NL20.name=Dodenherdenking
+holiday.nl-NL20.date=20210504
+holiday.nl-NL21.name=Bevrijdingsdag
+holiday.nl-NL21.date=20210505
+holiday.nl-NL22.name=Hemelvaartsdag
+holiday.nl-NL22.date=20210513
+holiday.nl-NL23.name=Eerste Pinksterdag
+holiday.nl-NL23.date=20210523
+holiday.nl-NL24.name=Tweede Pinksterdag
+holiday.nl-NL24.date=20210524
+holiday.nl-NL25.name=Sinterklaas
+holiday.nl-NL25.date=20211205
+holiday.nl-NL26.name=Koninkrijksdag
+holiday.nl-NL26.date=20211215
+holiday.nl-NL27.name=Eerste Kerstdag
+holiday.nl-NL27.date=20211225
+holiday.nl-NL28.name=Tweede Kerstdag
+holiday.nl-NL28.date=20211226
diff --git a/doc/rc/holidays.pl-PL.rc b/doc/rc/holidays.pl-PL.rc
index 021ce2109..37099c3ec 100644
--- a/doc/rc/holidays.pl-PL.rc
+++ b/doc/rc/holidays.pl-PL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/pl-PL/2015.json
-# http://holidata.net/pl-PL/2016.json
+# https://holidata.net/pl-PL/2020.json
+# https://holidata.net/pl-PL/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,54 @@
 ###############################################################################
 
 holiday.pl-PL1.name=Nowy Rok
-holiday.pl-PL1.date=20150101
+holiday.pl-PL1.date=20200101
 holiday.pl-PL2.name=Trzech Króli
-holiday.pl-PL2.date=20150106
+holiday.pl-PL2.date=20200106
 holiday.pl-PL3.name=Wielkanoc
-holiday.pl-PL3.date=20150405
+holiday.pl-PL3.date=20200412
 holiday.pl-PL4.name=Poniedziałek Wielkanocny
-holiday.pl-PL4.date=20150406
+holiday.pl-PL4.date=20200413
 holiday.pl-PL5.name=Święto Pracy
-holiday.pl-PL5.date=20150501
+holiday.pl-PL5.date=20200501
 holiday.pl-PL6.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL6.date=20150503
+holiday.pl-PL6.date=20200503
 holiday.pl-PL7.name=Zielone Świątki
-holiday.pl-PL7.date=20150524
+holiday.pl-PL7.date=20200531
 holiday.pl-PL8.name=Boże Ciało
-holiday.pl-PL8.date=20150604
-holiday.pl-PL9.name=Święto Wojska Polskiego
-holiday.pl-PL9.date=20150815
-holiday.pl-PL10.name=Wniebowzięcia NMP
-holiday.pl-PL10.date=20150815
-holiday.pl-PL11.name=Wszystkich Świętych
-holiday.pl-PL11.date=20151101
-holiday.pl-PL12.name=Dzień Niepodległości
-holiday.pl-PL12.date=20151111
-holiday.pl-PL13.name=Boże Narodzenie (pierwszy dzień)
-holiday.pl-PL13.date=20151225
-holiday.pl-PL14.name=Boże Narodzenie (drugi dzień)
-holiday.pl-PL14.date=20151226
-holiday.pl-PL15.name=Nowy Rok
-holiday.pl-PL15.date=20160101
-holiday.pl-PL16.name=Trzech Króli
-holiday.pl-PL16.date=20160106
-holiday.pl-PL17.name=Wielkanoc
-holiday.pl-PL17.date=20160327
-holiday.pl-PL18.name=Poniedziałek Wielkanocny
-holiday.pl-PL18.date=20160328
-holiday.pl-PL19.name=Święto Pracy
-holiday.pl-PL19.date=20160501
-holiday.pl-PL20.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL20.date=20160503
-holiday.pl-PL21.name=Zielone Świątki
-holiday.pl-PL21.date=20160515
-holiday.pl-PL22.name=Boże Ciało
-holiday.pl-PL22.date=20160526
-holiday.pl-PL23.name=Święto Wojska Polskiego
-holiday.pl-PL23.date=20160815
-holiday.pl-PL24.name=Wniebowzięcia NMP
-holiday.pl-PL24.date=20160815
-holiday.pl-PL25.name=Wszystkich Świętych
-holiday.pl-PL25.date=20161101
-holiday.pl-PL26.name=Dzień Niepodległości
-holiday.pl-PL26.date=20161111
-holiday.pl-PL27.name=Boże Narodzenie (pierwszy dzień)
-holiday.pl-PL27.date=20161225
-holiday.pl-PL28.name=Boże Narodzenie (drugi dzień)
-holiday.pl-PL28.date=20161226
+holiday.pl-PL8.date=20200611
+holiday.pl-PL9.name=Wniebowzięcie Najświętszej Maryi Panny
+holiday.pl-PL9.date=20200815
+holiday.pl-PL10.name=Wszystkich Świętych
+holiday.pl-PL10.date=20201101
+holiday.pl-PL11.name=Narodowe Święto Niepodległości
+holiday.pl-PL11.date=20201111
+holiday.pl-PL12.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL12.date=20201225
+holiday.pl-PL13.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL13.date=20201226
+holiday.pl-PL14.name=Nowy Rok
+holiday.pl-PL14.date=20210101
+holiday.pl-PL15.name=Trzech Króli
+holiday.pl-PL15.date=20210106
+holiday.pl-PL16.name=Wielkanoc
+holiday.pl-PL16.date=20210404
+holiday.pl-PL17.name=Poniedziałek Wielkanocny
+holiday.pl-PL17.date=20210405
+holiday.pl-PL18.name=Święto Pracy
+holiday.pl-PL18.date=20210501
+holiday.pl-PL19.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL19.date=20210503
+holiday.pl-PL20.name=Zielone Świątki
+holiday.pl-PL20.date=20210523
+holiday.pl-PL21.name=Boże Ciało
+holiday.pl-PL21.date=20210603
+holiday.pl-PL22.name=Wniebowzięcie Najświętszej Maryi Panny
+holiday.pl-PL22.date=20210815
+holiday.pl-PL23.name=Wszystkich Świętych
+holiday.pl-PL23.date=20211101
+holiday.pl-PL24.name=Narodowe Święto Niepodległości
+holiday.pl-PL24.date=20211111
+holiday.pl-PL25.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL25.date=20211225
+holiday.pl-PL26.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL26.date=20211226
diff --git a/doc/rc/holidays.pt-BR.rc b/doc/rc/holidays.pt-BR.rc
deleted file mode 100644
index 6a9c5af74..000000000
--- a/doc/rc/holidays.pt-BR.rc
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-# International Holiday Data provided by Holidata.net
-# http://holidata.net/pt-BR/2015.json
-# http://holidata.net/pt-BR/2016.json
-#
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# https://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-holiday.pt-BR1.name=Confraternização Universal
-holiday.pt-BR1.date=20150101
-holiday.pt-BR2.name=Carnaval
-holiday.pt-BR2.date=20150216
-holiday.pt-BR3.name=Carnaval
-holiday.pt-BR3.date=20150217
-holiday.pt-BR4.name=Sexta-feira Santa
-holiday.pt-BR4.date=20150403
-holiday.pt-BR5.name=Páscoa
-holiday.pt-BR5.date=20150405
-holiday.pt-BR6.name=Tiradentes
-holiday.pt-BR6.date=20150421
-holiday.pt-BR7.name=Dia do Trabalho
-holiday.pt-BR7.date=20150501
-holiday.pt-BR8.name=Corpus Christi
-holiday.pt-BR8.date=20150604
-holiday.pt-BR9.name=Independência do Brasil
-holiday.pt-BR9.date=20150907
-holiday.pt-BR10.name=Nossa Senhora Aparecida
-holiday.pt-BR10.date=20151012
-holiday.pt-BR11.name=Finados
-holiday.pt-BR11.date=20151102
-holiday.pt-BR12.name=Proclamação da República
-holiday.pt-BR12.date=20151115
-holiday.pt-BR13.name=Natal
-holiday.pt-BR13.date=20151225
-holiday.pt-BR14.name=Confraternização Universal
-holiday.pt-BR14.date=20160101
-holiday.pt-BR15.name=Carnaval
-holiday.pt-BR15.date=20160208
-holiday.pt-BR16.name=Carnaval
-holiday.pt-BR16.date=20160209
-holiday.pt-BR17.name=Sexta-feira Santa
-holiday.pt-BR17.date=20160325
-holiday.pt-BR18.name=Páscoa
-holiday.pt-BR18.date=20160327
-holiday.pt-BR19.name=Tiradentes
-holiday.pt-BR19.date=20160421
-holiday.pt-BR20.name=Dia do Trabalho
-holiday.pt-BR20.date=20160501
-holiday.pt-BR21.name=Corpus Christi
-holiday.pt-BR21.date=20160526
-holiday.pt-BR22.name=Independência do Brasil
-holiday.pt-BR22.date=20160907
-holiday.pt-BR23.name=Nossa Senhora Aparecida
-holiday.pt-BR23.date=20161012
-holiday.pt-BR24.name=Finados
-holiday.pt-BR24.date=20161102
-holiday.pt-BR25.name=Proclamação da República
-holiday.pt-BR25.date=20161115
-holiday.pt-BR26.name=Natal
-holiday.pt-BR26.date=20161225
diff --git a/doc/rc/holidays.pt-PT.rc b/doc/rc/holidays.pt-PT.rc
index 0ed912e4f..da8ce981c 100644
--- a/doc/rc/holidays.pt-PT.rc
+++ b/doc/rc/holidays.pt-PT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/pt-PT/2015.json
-# http://holidata.net/pt-PT/2016.json
+# https://holidata.net/pt-PT/2020.json
+# https://holidata.net/pt-PT/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,58 @@
 ###############################################################################
 
 holiday.pt-PT1.name=Ano Novo
-holiday.pt-PT1.date=20150101
+holiday.pt-PT1.date=20200101
 holiday.pt-PT2.name=Carnaval
-holiday.pt-PT2.date=20150217
+holiday.pt-PT2.date=20200225
 holiday.pt-PT3.name=Sexta-feira Santa
-holiday.pt-PT3.date=20150403
+holiday.pt-PT3.date=20200410
 holiday.pt-PT4.name=Páscoa
-holiday.pt-PT4.date=20150405
+holiday.pt-PT4.date=20200412
 holiday.pt-PT5.name=Dia da Liberdade
-holiday.pt-PT5.date=20150425
+holiday.pt-PT5.date=20200425
 holiday.pt-PT6.name=Dia do Trabalhador
-holiday.pt-PT6.date=20150501
-holiday.pt-PT7.name=Corpo de Deus
-holiday.pt-PT7.date=20150604
-holiday.pt-PT8.name=Dia de Portugal
-holiday.pt-PT8.date=20150610
+holiday.pt-PT6.date=20200501
+holiday.pt-PT7.name=Dia de Portugal
+holiday.pt-PT7.date=20200610
+holiday.pt-PT8.name=Corpo de Deus
+holiday.pt-PT8.date=20200611
 holiday.pt-PT9.name=Assunção de Nossa Senhora
-holiday.pt-PT9.date=20150815
+holiday.pt-PT9.date=20200815
 holiday.pt-PT10.name=Implantação da República
-holiday.pt-PT10.date=20151005
-holiday.pt-PT11.name=Todos os Santos
-holiday.pt-PT11.date=20151101
+holiday.pt-PT10.date=20201005
+holiday.pt-PT11.name=Dia de Todos os Santos
+holiday.pt-PT11.date=20201101
 holiday.pt-PT12.name=Restauração da Independência
-holiday.pt-PT12.date=20151201
+holiday.pt-PT12.date=20201201
 holiday.pt-PT13.name=Imaculada Conceição
-holiday.pt-PT13.date=20151208
+holiday.pt-PT13.date=20201208
 holiday.pt-PT14.name=Natal
-holiday.pt-PT14.date=20151225
+holiday.pt-PT14.date=20201225
 holiday.pt-PT15.name=Ano Novo
-holiday.pt-PT15.date=20160101
+holiday.pt-PT15.date=20210101
 holiday.pt-PT16.name=Carnaval
-holiday.pt-PT16.date=20160209
+holiday.pt-PT16.date=20210216
 holiday.pt-PT17.name=Sexta-feira Santa
-holiday.pt-PT17.date=20160325
+holiday.pt-PT17.date=20210402
 holiday.pt-PT18.name=Páscoa
-holiday.pt-PT18.date=20160327
+holiday.pt-PT18.date=20210404
 holiday.pt-PT19.name=Dia da Liberdade
-holiday.pt-PT19.date=20160425
+holiday.pt-PT19.date=20210425
 holiday.pt-PT20.name=Dia do Trabalhador
-holiday.pt-PT20.date=20160501
+holiday.pt-PT20.date=20210501
 holiday.pt-PT21.name=Corpo de Deus
-holiday.pt-PT21.date=20160526
+holiday.pt-PT21.date=20210603
 holiday.pt-PT22.name=Dia de Portugal
-holiday.pt-PT22.date=20160610
+holiday.pt-PT22.date=20210610
 holiday.pt-PT23.name=Assunção de Nossa Senhora
-holiday.pt-PT23.date=20160815
+holiday.pt-PT23.date=20210815
 holiday.pt-PT24.name=Implantação da República
-holiday.pt-PT24.date=20161005
-holiday.pt-PT25.name=Todos os Santos
-holiday.pt-PT25.date=20161101
+holiday.pt-PT24.date=20211005
+holiday.pt-PT25.name=Dia de Todos os Santos
+holiday.pt-PT25.date=20211101
 holiday.pt-PT26.name=Restauração da Independência
-holiday.pt-PT26.date=20161201
+holiday.pt-PT26.date=20211201
 holiday.pt-PT27.name=Imaculada Conceição
-holiday.pt-PT27.date=20161208
+holiday.pt-PT27.date=20211208
 holiday.pt-PT28.name=Natal
-holiday.pt-PT28.date=20161225
+holiday.pt-PT28.date=20211225
diff --git a/doc/rc/holidays.ru-RU.rc b/doc/rc/holidays.ru-RU.rc
index 1d55ff3bb..df47a00b7 100644
--- a/doc/rc/holidays.ru-RU.rc
+++ b/doc/rc/holidays.ru-RU.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/ru-RU/2015.json
-# http://holidata.net/ru-RU/2016.json
+# https://holidata.net/ru-RU/2020.json
+# https://holidata.net/ru-RU/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,38 @@
 ###############################################################################
 
 holiday.ru-RU1.name=Новый Год
-holiday.ru-RU1.date=20150101
+holiday.ru-RU1.date=20200101
 holiday.ru-RU2.name=Рождество Христово
-holiday.ru-RU2.date=20150107
+holiday.ru-RU2.date=20200107
 holiday.ru-RU3.name=День защитника Отечества
-holiday.ru-RU3.date=20150223
+holiday.ru-RU3.date=20200223
 holiday.ru-RU4.name=Международный женский день
-holiday.ru-RU4.date=20150308
+holiday.ru-RU4.date=20200308
 holiday.ru-RU5.name=Пасха
-holiday.ru-RU5.date=20150412
+holiday.ru-RU5.date=20200419
 holiday.ru-RU6.name=Праздник весны и труда
-holiday.ru-RU6.date=20150501
+holiday.ru-RU6.date=20200501
 holiday.ru-RU7.name=День Победы
-holiday.ru-RU7.date=20150509
+holiday.ru-RU7.date=20200509
 holiday.ru-RU8.name=День России
-holiday.ru-RU8.date=20150612
+holiday.ru-RU8.date=20200612
 holiday.ru-RU9.name=День народного единства
-holiday.ru-RU9.date=20151104
+holiday.ru-RU9.date=20201104
 holiday.ru-RU10.name=Новый Год
-holiday.ru-RU10.date=20160101
+holiday.ru-RU10.date=20210101
 holiday.ru-RU11.name=Рождество Христово
-holiday.ru-RU11.date=20160107
+holiday.ru-RU11.date=20210107
 holiday.ru-RU12.name=День защитника Отечества
-holiday.ru-RU12.date=20160223
+holiday.ru-RU12.date=20210223
 holiday.ru-RU13.name=Международный женский день
-holiday.ru-RU13.date=20160308
-holiday.ru-RU14.name=Пасха
-holiday.ru-RU14.date=20160501
-holiday.ru-RU15.name=Праздник весны и труда
-holiday.ru-RU15.date=20160501
+holiday.ru-RU13.date=20210308
+holiday.ru-RU14.name=Праздник весны и труда
+holiday.ru-RU14.date=20210501
+holiday.ru-RU15.name=Пасха
+holiday.ru-RU15.date=20210502
 holiday.ru-RU16.name=День Победы
-holiday.ru-RU16.date=20160509
+holiday.ru-RU16.date=20210509
 holiday.ru-RU17.name=День России
-holiday.ru-RU17.date=20160612
+holiday.ru-RU17.date=20210612
 holiday.ru-RU18.name=День народного единства
-holiday.ru-RU18.date=20161104
+holiday.ru-RU18.date=20211104
diff --git a/doc/rc/holidays.sv-SE.rc b/doc/rc/holidays.sv-SE.rc
index 25f64cd81..0c5ea8a2a 100644
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/sv-SE/2015.json
-# http://holidata.net/sv-SE/2016.json
+# https://holidata.net/sv-SE/2020.json
+# https://holidata.net/sv-SE/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,66 @@
 ###############################################################################
 
 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20150101
+holiday.sv-SE1.date=20200101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20150106
+holiday.sv-SE2.date=20200106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20150403
+holiday.sv-SE3.date=20200410
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20150405
+holiday.sv-SE4.date=20200412
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20150406
-holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20150430
-holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20150501
-holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20150514
-holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20150524
-holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20150606
-holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20150619
-holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20150620
-holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20151031
-holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20151224
-holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20151225
-holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20151226
-holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20151231
-holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20160101
-holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20160106
-holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20160325
-holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20160327
-holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20160328
-holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20160430
-holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20160501
-holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20160505
-holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20160515
-holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20160606
-holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20160624
-holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20160625
-holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20161105
-holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20161224
-holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20161225
-holiday.sv-SE33.name=Annandag jul
-holiday.sv-SE33.date=20161226
-holiday.sv-SE34.name=Nyårsafton
-holiday.sv-SE34.date=20161231
+holiday.sv-SE5.date=20200413
+holiday.sv-SE6.name=Första maj
+holiday.sv-SE6.date=20200501
+holiday.sv-SE7.name=Kristi himmelsfärdsdag
+holiday.sv-SE7.date=20200521
+holiday.sv-SE8.name=Pingstdagen
+holiday.sv-SE8.date=20200531
+holiday.sv-SE9.name=Nationaldagen
+holiday.sv-SE9.date=20200606
+holiday.sv-SE10.name=Midsommarafton
+holiday.sv-SE10.date=20200619
+holiday.sv-SE11.name=Midsommardagen
+holiday.sv-SE11.date=20200620
+holiday.sv-SE12.name=Alla helgons dag
+holiday.sv-SE12.date=20201031
+holiday.sv-SE13.name=Julafton
+holiday.sv-SE13.date=20201224
+holiday.sv-SE14.name=Juldagen
+holiday.sv-SE14.date=20201225
+holiday.sv-SE15.name=Annandag jul
+holiday.sv-SE15.date=20201226
+holiday.sv-SE16.name=Nyårsafton
+holiday.sv-SE16.date=20201231
+holiday.sv-SE17.name=Nyårsdagen
+holiday.sv-SE17.date=20210101
+holiday.sv-SE18.name=Trettondedag jul
+holiday.sv-SE18.date=20210106
+holiday.sv-SE19.name=Långfredagen
+holiday.sv-SE19.date=20210402
+holiday.sv-SE20.name=Påskdagen
+holiday.sv-SE20.date=20210404
+holiday.sv-SE21.name=Annandag påsk
+holiday.sv-SE21.date=20210405
+holiday.sv-SE22.name=Första maj
+holiday.sv-SE22.date=20210501
+holiday.sv-SE23.name=Kristi himmelsfärdsdag
+holiday.sv-SE23.date=20210513
+holiday.sv-SE24.name=Pingstdagen
+holiday.sv-SE24.date=20210523
+holiday.sv-SE25.name=Nationaldagen
+holiday.sv-SE25.date=20210606
+holiday.sv-SE26.name=Midsommarafton
+holiday.sv-SE26.date=20210625
+holiday.sv-SE27.name=Midsommardagen
+holiday.sv-SE27.date=20210626
+holiday.sv-SE28.name=Alla helgons dag
+holiday.sv-SE28.date=20211106
+holiday.sv-SE29.name=Julafton
+holiday.sv-SE29.date=20211224
+holiday.sv-SE30.name=Juldagen
+holiday.sv-SE30.date=20211225
+holiday.sv-SE31.name=Annandag jul
+holiday.sv-SE31.date=20211226
+holiday.sv-SE32.name=Nyårsafton
+holiday.sv-SE32.date=20211231
diff --git a/doc/rc/holidays.tr-TR.rc b/doc/rc/holidays.tr-TR.rc
index 3285f0fca..1bcb56281 100644
--- a/doc/rc/holidays.tr-TR.rc
+++ b/doc/rc/holidays.tr-TR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/tr-TR/2015.json
-# http://holidata.net/tr-TR/2016.json
+# https://holidata.net/tr-TR/2020.json
+# https://holidata.net/tr-TR/2021.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2020, 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,58 @@
 ###############################################################################
 
 holiday.tr-TR1.name=Yılbaşı
-holiday.tr-TR1.date=20150101
+holiday.tr-TR1.date=20200101
 holiday.tr-TR2.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR2.date=20150423
+holiday.tr-TR2.date=20200423
 holiday.tr-TR3.name=Emek ve Dayanışma Günü
-holiday.tr-TR3.date=20150501
-holiday.tr-TR4.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
-holiday.tr-TR4.date=20150519
-holiday.tr-TR5.name=Zafer Bayramı
-holiday.tr-TR5.date=20150830
-holiday.tr-TR6.name=Cumhuriyet Bayramı
-holiday.tr-TR6.date=20151029
-holiday.tr-TR7.name=Ramazan Bayramı 1
-holiday.tr-TR7.date=20150717
-holiday.tr-TR8.name=Ramazan Bayramı 2
-holiday.tr-TR8.date=20150718
-holiday.tr-TR9.name=Ramazan Bayramı 3
-holiday.tr-TR9.date=20150719
-holiday.tr-TR10.name=Kurban Bayramı 1
-holiday.tr-TR10.date=20150923
-holiday.tr-TR11.name=Kurban Bayramı 2
-holiday.tr-TR11.date=20150924
-holiday.tr-TR12.name=Kurban Bayramı 3
-holiday.tr-TR12.date=20150925
-holiday.tr-TR13.name=Kurban Bayramı 4
-holiday.tr-TR13.date=20150926
-holiday.tr-TR14.name=Yılbaşı
-holiday.tr-TR14.date=20160101
-holiday.tr-TR15.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR15.date=20160423
-holiday.tr-TR16.name=Emek ve Dayanışma Günü
-holiday.tr-TR16.date=20160501
-holiday.tr-TR17.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
-holiday.tr-TR17.date=20160519
-holiday.tr-TR18.name=Zafer Bayramı
-holiday.tr-TR18.date=20160830
-holiday.tr-TR19.name=Cumhuriyet Bayramı
-holiday.tr-TR19.date=20161029
-holiday.tr-TR20.name=Ramazan Bayramı 1
-holiday.tr-TR20.date=20160705
-holiday.tr-TR21.name=Ramazan Bayramı 2
-holiday.tr-TR21.date=20160706
-holiday.tr-TR22.name=Ramazan Bayramı 3
-holiday.tr-TR22.date=20160707
-holiday.tr-TR23.name=Kurban Bayramı 1
-holiday.tr-TR23.date=20160912
-holiday.tr-TR24.name=Kurban Bayramı 2
-holiday.tr-TR24.date=20160913
-holiday.tr-TR25.name=Kurban Bayramı 3
-holiday.tr-TR25.date=20160914
-holiday.tr-TR26.name=Kurban Bayramı 4
-holiday.tr-TR26.date=20160915
+holiday.tr-TR3.date=20200501
+holiday.tr-TR4.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
+holiday.tr-TR4.date=20200519
+holiday.tr-TR5.name=Ramazan Bayramı (1. Gün)
+holiday.tr-TR5.date=20200524
+holiday.tr-TR6.name=Ramazan Bayramı (2. Gün)
+holiday.tr-TR6.date=20200525
+holiday.tr-TR7.name=Ramazan Bayramı (3. Gün)
+holiday.tr-TR7.date=20200526
+holiday.tr-TR8.name=Demokrasi ve Milli Birlik Günü
+holiday.tr-TR8.date=20200715
+holiday.tr-TR9.name=Kurban Bayramı (1. Gün)
+holiday.tr-TR9.date=20200731
+holiday.tr-TR10.name=Kurban Bayramı (2. Gün)
+holiday.tr-TR10.date=20200801
+holiday.tr-TR11.name=Kurban Bayramı (3. Gün)
+holiday.tr-TR11.date=20200802
+holiday.tr-TR12.name=Kurban Bayramı (4. Gün)
+holiday.tr-TR12.date=20200803
+holiday.tr-TR13.name=Zafer Bayramı
+holiday.tr-TR13.date=20200830
+holiday.tr-TR14.name=Cumhuriyet Bayramı
+holiday.tr-TR14.date=20201029
+holiday.tr-TR15.name=Yılbaşı
+holiday.tr-TR15.date=20210101
+holiday.tr-TR16.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR16.date=20210423
+holiday.tr-TR17.name=Emek ve Dayanışma Günü
+holiday.tr-TR17.date=20210501
+holiday.tr-TR18.name=Ramazan Bayramı (1. Gün)
+holiday.tr-TR18.date=20210513
+holiday.tr-TR19.name=Ramazan Bayramı (2. Gün)
+holiday.tr-TR19.date=20210514
+holiday.tr-TR20.name=Ramazan Bayramı (3. Gün)
+holiday.tr-TR20.date=20210515
+holiday.tr-TR21.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
+holiday.tr-TR21.date=20210519
+holiday.tr-TR22.name=Demokrasi ve Milli Birlik Günü
+holiday.tr-TR22.date=20210715
+holiday.tr-TR23.name=Kurban Bayramı (1. Gün)
+holiday.tr-TR23.date=20210720
+holiday.tr-TR24.name=Kurban Bayramı (2. Gün)
+holiday.tr-TR24.date=20210721
+holiday.tr-TR25.name=Kurban Bayramı (3. Gün)
+holiday.tr-TR25.date=20210722
+holiday.tr-TR26.name=Kurban Bayramı (4. Gün)
+holiday.tr-TR26.date=20210723
+holiday.tr-TR27.name=Zafer Bayramı
+holiday.tr-TR27.date=20210830
+holiday.tr-TR28.name=Cumhuriyet Bayramı
+holiday.tr-TR28.date=20211029